From 387b1cec575a033be0ee80e86ef720e8333763d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kali=C5=84ski?= Date: Wed, 11 Feb 2026 23:24:35 +0100 Subject: [PATCH 1/5] Refactored odometer page to use handleMoneyRequestStepDistanceNavigation --- src/libs/actions/IOU/MoneyRequest.ts | 8 + .../step/IOURequestStepDistanceOdometer.tsx | 201 ++++-------------- 2 files changed, 53 insertions(+), 156 deletions(-) diff --git a/src/libs/actions/IOU/MoneyRequest.ts b/src/libs/actions/IOU/MoneyRequest.ts index 4c9528d1e147..0971f36f32e1 100644 --- a/src/libs/actions/IOU/MoneyRequest.ts +++ b/src/libs/actions/IOU/MoneyRequest.ts @@ -139,6 +139,8 @@ type MoneyRequestStepDistanceNavigationParams = { selfDMReport: OnyxEntry; gpsCoordinates?: string; gpsDistance?: number; + odometerStart?: number; + odometerEnd?: number; betas: OnyxEntry; }; @@ -522,6 +524,8 @@ function handleMoneyRequestStepDistanceNavigation({ gpsCoordinates, gpsDistance, policyForMovingExpenses, + odometerStart, + odometerEnd, betas, }: MoneyRequestStepDistanceNavigationParams) { const isManualDistance = manualDistance !== undefined; @@ -587,6 +591,8 @@ function handleMoneyRequestStepDistanceNavigation({ customUnitRateID, attendees: transaction?.comment?.attendees, gpsCoordinates, + odometerStart, + odometerEnd, }, isASAPSubmitBetaEnabled, currentUserAccountIDParam: currentUserAccountID, @@ -621,6 +627,8 @@ function handleMoneyRequestStepDistanceNavigation({ splitShares: transaction?.splitShares, attendees: transaction?.comment?.attendees, gpsCoordinates, + odometerStart, + odometerEnd, }, backToReport, isASAPSubmitBetaEnabled, diff --git a/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx b/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx index a5f391052256..b8d2200e3974 100644 --- a/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx @@ -17,38 +17,28 @@ import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import usePersonalPolicy from '@hooks/usePersonalPolicy'; import usePolicy from '@hooks/usePolicy'; +import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; +import useSelfDMReport from '@hooks/useSelfDMReport'; import useStyleUtils from '@hooks/useStyleUtils'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; -import { - createDistanceRequest, - getMoneyRequestParticipantsFromReport, - setCustomUnitRateID, - setMoneyRequestDistance, - setMoneyRequestMerchant, - setMoneyRequestOdometerReading, - setMoneyRequestParticipantsFromReport, - setMoneyRequestPendingFields, - trackExpense, - updateMoneyRequestDistance, -} from '@libs/actions/IOU'; -import {setTransactionReport} from '@libs/actions/Transaction'; +import {setMoneyRequestDistance, setMoneyRequestOdometerReading, updateMoneyRequestDistance} from '@libs/actions/IOU'; +import {handleMoneyRequestStepDistanceNavigation} from '@libs/actions/IOU/MoneyRequest'; import DistanceRequestUtils from '@libs/DistanceRequestUtils'; import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; -import {navigateToParticipantPage, shouldUseTransactionDraft} from '@libs/IOUUtils'; +import {shouldUseTransactionDraft} from '@libs/IOUUtils'; import Navigation from '@libs/Navigation/Navigation'; import {roundToTwoDecimalPlaces} from '@libs/NumberUtils'; -import {getParticipantsOption, getReportOption} from '@libs/OptionsListUtils'; -import {getPolicyExpenseChat, isArchivedReport, isPolicyExpenseChat as isPolicyExpenseChatUtils} from '@libs/ReportUtils'; +import {isArchivedReport, isPolicyExpenseChat as isPolicyExpenseChatUtils} from '@libs/ReportUtils'; import shouldUseDefaultExpensePolicyUtil from '@libs/shouldUseDefaultExpensePolicy'; +import {getRateID} from '@libs/TransactionUtils'; import variables from '@styles/variables'; import CONST from '@src/CONST'; import type {OdometerImageType} from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import SCREENS from '@src/SCREENS'; -import type {ReportAttributesDerivedValue} from '@src/types/onyx/DerivedValues'; import type Transaction from '@src/types/onyx/Transaction'; import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; import DiscardChangesConfirmation from './DiscardChangesConfirmation'; @@ -116,6 +106,8 @@ function IOURequestStepDistanceOdometer({ const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`, {canBeMissing: true}); const personalPolicy = usePersonalPolicy(); const defaultExpensePolicy = useDefaultExpensePolicy(); + const selfDMReport = useSelfDMReport(); + const {policyForMovingExpenses} = usePolicyForMovingExpenses(); const [selectedTab, selectedTabResult] = useOnyx(`${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.DISTANCE_REQUEST_TYPE}`, {canBeMissing: true}); const isLoadingSelectedTab = isLoadingOnyxValue(selectedTabResult); @@ -129,6 +121,7 @@ function IOURequestStepDistanceOdometer({ const [shouldEnableDiscardConfirmation, setShouldEnableDiscardConfirmation] = useState(!isEditingConfirmation && !isEditing); const shouldUseDefaultExpensePolicy = useMemo(() => shouldUseDefaultExpensePolicyUtil(iouType, defaultExpensePolicy), [iouType, defaultExpensePolicy]); + const customUnitRateID = getRateID(transaction); const unit = DistanceRequestUtils.getRate({transaction, policy: shouldUseDefaultExpensePolicy ? defaultExpensePolicy : policy}).unit; @@ -320,20 +313,6 @@ function IOURequestStepDistanceOdometer({ [action, iouType, transactionID], ); - // Navigate to confirmation page helper - following Manual tab pattern - const navigateToConfirmationPage = () => { - if (!transactionID || !reportID) { - return; - } - switch (iouType) { - case CONST.IOU.TYPE.REQUEST: - Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, CONST.IOU.TYPE.SUBMIT, transactionID, reportID, backToReport)); - break; - default: - Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID, backToReport)); - } - }; - const navigateBack = () => { if (isEditingConfirmation) { Navigation.goBack(confirmationRoute); @@ -396,133 +375,43 @@ function IOURequestStepDistanceOdometer({ return; } - // If a reportID exists in the report object, use it to set participants and navigate to confirmation - // Following Manual tab pattern - if (report?.reportID && !isArchived && iouType !== CONST.IOU.TYPE.CREATE) { - const selectedParticipants = getMoneyRequestParticipantsFromReport(report, currentUserPersonalDetails.accountID); - const derivedReports = (reportAttributesDerived as ReportAttributesDerivedValue | undefined)?.reports; - const participants = selectedParticipants.map((participant) => { - const participantAccountID = participant?.accountID ?? CONST.DEFAULT_NUMBER_ID; - return participantAccountID - ? getParticipantsOption(participant, personalDetails) - : getReportOption(participant, reportNameValuePairs?.private_isArchived, policy, currentUserPersonalDetails.accountID, personalDetails, derivedReports); - }); - - if (shouldSkipConfirmation) { - setShouldEnableDiscardConfirmation(false); - setMoneyRequestPendingFields(transactionID, {waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}); - setMoneyRequestMerchant(transactionID, translate('iou.fieldPending'), false); - - const participant = participants.at(0); - const customUnitRateID = DistanceRequestUtils.getCustomUnitRateID({ - reportID: report.reportID, - isPolicyExpenseChat: !!participant?.isPolicyExpenseChat, - policy, - lastSelectedDistanceRates, - }); - - if (iouType === CONST.IOU.TYPE.TRACK && participant) { - trackExpense({ - report, - isDraftPolicy: false, - participantParams: { - payeeEmail: currentUserEmailParam, - payeeAccountID: currentUserAccountIDParam, - participant, - }, - policyParams: { - policy, - }, - transactionParams: { - amount: 0, - distance: calculatedDistance, - currency: transaction?.currency ?? 'USD', - created: transaction?.created ?? '', - merchant: translate('iou.fieldPending'), - receipt: {}, - billable: false, - customUnitRateID, - attendees: transaction?.comment?.attendees, - odometerStart: start, - odometerEnd: end, - }, - isASAPSubmitBetaEnabled: false, - currentUserAccountIDParam, - currentUserEmailParam, - introSelected, - activePolicyID, - quickAction, - recentWaypoints, - betas, - }); - return; - } - - createDistanceRequest({ - report, - participants, - currentUserLogin: currentUserEmailParam, - currentUserAccountID: currentUserAccountIDParam, - iouType, - existingTransaction: transaction, - transactionParams: { - amount: 0, - distance: calculatedDistance, - comment: '', - created: transaction?.created ?? '', - currency: transaction?.currency ?? 'USD', - merchant: translate('iou.fieldPending'), - billable: !!policy?.defaultBillable, - customUnitRateID, - splitShares: transaction?.splitShares, - attendees: transaction?.comment?.attendees, - odometerStart: start, - odometerEnd: end, - }, - backToReport, - isASAPSubmitBetaEnabled: false, - transactionViolations, - quickAction, - policyRecentlyUsedCurrencies: policyRecentlyUsedCurrencies ?? [], - recentWaypoints, - betas, - }); - return; - } - - setMoneyRequestParticipantsFromReport(transactionID, report, currentUserPersonalDetails.accountID).then(() => { - navigateToConfirmationPage(); - }); - return; + if (shouldSkipConfirmation) { + setShouldEnableDiscardConfirmation(false); } - // If there was no reportID, then that means the user started this flow from the global menu - // and an optimistic reportID was generated. In that case, the next step is to select the participants for this expense. - if (shouldUseDefaultExpensePolicy) { - const activePolicyExpenseChat = getPolicyExpenseChat(currentUserAccountIDParam, defaultExpensePolicy?.id); - const shouldAutoReport = !!defaultExpensePolicy?.autoReporting || !!personalPolicy?.autoReporting; - const transactionReportID = shouldAutoReport ? activePolicyExpenseChat?.reportID : CONST.REPORT.UNREPORTED_REPORT_ID; - const rateID = DistanceRequestUtils.getCustomUnitRateID({ - reportID: transactionReportID, - isPolicyExpenseChat: true, - policy: defaultExpensePolicy, - lastSelectedDistanceRates, - }); - setTransactionReport(transactionID, {reportID: transactionReportID}, true); - setCustomUnitRateID(transactionID, rateID); - setMoneyRequestParticipantsFromReport(transactionID, activePolicyExpenseChat, currentUserPersonalDetails.accountID).then(() => { - Navigation.navigate( - ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute( - CONST.IOU.ACTION.CREATE, - iouType === CONST.IOU.TYPE.CREATE ? CONST.IOU.TYPE.SUBMIT : iouType, - transactionID, - activePolicyExpenseChat?.reportID, - ), - ); - }); - } else if (transactionID && reportID) { - navigateToParticipantPage(iouType, transactionID, reportID); - } + handleMoneyRequestStepDistanceNavigation({ + iouType, + report, + policy, + transaction, + reportID, + transactionID, + reportAttributesDerived, + personalDetails, + customUnitRateID, + manualDistance: calculatedDistance, + currentUserLogin: currentUserEmailParam, + currentUserAccountID: currentUserAccountIDParam, + backToReport, + shouldSkipConfirmation, + defaultExpensePolicy, + isArchivedExpenseReport: isArchived, + isAutoReporting: !!personalPolicy?.autoReporting, + isASAPSubmitBetaEnabled: false, + transactionViolations, + lastSelectedDistanceRates, + translate, + quickAction, + policyRecentlyUsedCurrencies, + introSelected, + activePolicyID, + privateIsArchived: reportNameValuePairs?.private_isArchived, + selfDMReport, + policyForMovingExpenses, + odometerStart: start, + odometerEnd: end, + betas, + }); }; // Handle form submission with validation From ae21b614578002cfea4ec7843e516452ea7c87cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kali=C5=84ski?= Date: Thu, 12 Feb 2026 17:44:05 +0100 Subject: [PATCH 2/5] Added odometerDistance to handleMoneyRequestStepDistanceNavigation --- src/libs/actions/IOU/MoneyRequest.ts | 7 +++++-- .../iou/request/step/IOURequestStepDistanceOdometer.tsx | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libs/actions/IOU/MoneyRequest.ts b/src/libs/actions/IOU/MoneyRequest.ts index 0971f36f32e1..7ea6ecae2115 100644 --- a/src/libs/actions/IOU/MoneyRequest.ts +++ b/src/libs/actions/IOU/MoneyRequest.ts @@ -141,6 +141,7 @@ type MoneyRequestStepDistanceNavigationParams = { gpsDistance?: number; odometerStart?: number; odometerEnd?: number; + odometerDistance?: number; betas: OnyxEntry; }; @@ -526,13 +527,15 @@ function handleMoneyRequestStepDistanceNavigation({ policyForMovingExpenses, odometerStart, odometerEnd, + odometerDistance, betas, }: MoneyRequestStepDistanceNavigationParams) { const isManualDistance = manualDistance !== undefined; + const isOdometerDistance = odometerDistance !== undefined; const isGPSDistance = gpsDistance !== undefined && gpsCoordinates !== undefined; const recentWaypoints = getRecentWaypoints(); - if (transaction?.splitShares && !isManualDistance) { + if (transaction?.splitShares && !isManualDistance && !isOdometerDistance) { resetSplitShares(transaction); } if (backTo) { @@ -564,7 +567,7 @@ function handleMoneyRequestStepDistanceNavigation({ transactionReportID: transaction?.reportID, }); - const validWaypoints = !isManualDistance ? getValidWaypoints(waypoints, true, isGPSDistance) : undefined; + const validWaypoints = (!isManualDistance && !isOdometerDistance) ? getValidWaypoints(waypoints, true, isGPSDistance) : undefined; if (isCreatingTrackExpense && participant) { trackExpense({ diff --git a/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx b/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx index ffad989f6248..d1afb0b70e5a 100644 --- a/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx @@ -400,7 +400,6 @@ function IOURequestStepDistanceOdometer({ reportAttributesDerived, personalDetails, customUnitRateID, - manualDistance: calculatedDistance, currentUserLogin: currentUserEmailParam, currentUserAccountID: currentUserAccountIDParam, backToReport, @@ -421,6 +420,7 @@ function IOURequestStepDistanceOdometer({ policyForMovingExpenses, odometerStart: start, odometerEnd: end, + odometerDistance: calculatedDistance, betas, }); }; From 098115eda03197c379c5f09f2ed3b0268eafdb2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kali=C5=84ski?= Date: Thu, 12 Feb 2026 18:02:00 +0100 Subject: [PATCH 3/5] Prettier run --- src/libs/actions/IOU/MoneyRequest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/IOU/MoneyRequest.ts b/src/libs/actions/IOU/MoneyRequest.ts index 7ea6ecae2115..2fde460273bf 100644 --- a/src/libs/actions/IOU/MoneyRequest.ts +++ b/src/libs/actions/IOU/MoneyRequest.ts @@ -567,7 +567,7 @@ function handleMoneyRequestStepDistanceNavigation({ transactionReportID: transaction?.reportID, }); - const validWaypoints = (!isManualDistance && !isOdometerDistance) ? getValidWaypoints(waypoints, true, isGPSDistance) : undefined; + const validWaypoints = !isManualDistance && !isOdometerDistance ? getValidWaypoints(waypoints, true, isGPSDistance) : undefined; if (isCreatingTrackExpense && participant) { trackExpense({ From 07380bd57da86978681d9ddd6287911a2dc291da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kali=C5=84ski?= Date: Thu, 12 Feb 2026 18:40:38 +0100 Subject: [PATCH 4/5] Fix merge conflict --- .../step/IOURequestStepDistanceOdometer.tsx | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx b/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx index 147e7d1ae176..a8873468dd57 100644 --- a/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx @@ -390,7 +390,6 @@ function IOURequestStepDistanceOdometer({ setShouldEnableDiscardConfirmation(false); } -<<<<<<< HEAD handleMoneyRequestStepDistanceNavigation({ iouType, report, @@ -424,35 +423,6 @@ function IOURequestStepDistanceOdometer({ odometerDistance: calculatedDistance, betas, }); -======= - // If there was no reportID, then that means the user started this flow from the global menu - // and an optimistic reportID was generated. In that case, the next step is to select the participants for this expense. - if (shouldUseDefaultExpensePolicy) { - const activePolicyExpenseChat = getPolicyExpenseChat(currentUserAccountIDParam, defaultExpensePolicy?.id); - const shouldAutoReport = !!defaultExpensePolicy?.autoReporting || !!personalPolicy?.autoReporting; - const transactionReportID = shouldAutoReport ? activePolicyExpenseChat?.reportID : CONST.REPORT.UNREPORTED_REPORT_ID; - const rateID = DistanceRequestUtils.getCustomUnitRateID({ - reportID: transactionReportID, - isPolicyExpenseChat: true, - policy: defaultExpensePolicy, - lastSelectedDistanceRates, - }); - setTransactionReport(transactionID, {reportID: transactionReportID}, true); - setCustomUnitRateID(transactionID, rateID, transaction, policy); - setMoneyRequestParticipantsFromReport(transactionID, activePolicyExpenseChat, currentUserPersonalDetails.accountID).then(() => { - Navigation.navigate( - ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute( - CONST.IOU.ACTION.CREATE, - iouType === CONST.IOU.TYPE.CREATE ? CONST.IOU.TYPE.SUBMIT : iouType, - transactionID, - activePolicyExpenseChat?.reportID, - ), - ); - }); - } else if (transactionID && reportID) { - navigateToParticipantPage(iouType, transactionID, reportID); - } ->>>>>>> main }; // Handle form submission with validation From 86f89cc9e5e345d88ea90af6d4fff948666ae4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kali=C5=84ski?= Date: Thu, 12 Feb 2026 19:01:28 +0100 Subject: [PATCH 5/5] Passed odometerDistance to expense creation in handleMoneyRequestStepDistanceNavigation --- src/libs/actions/IOU/MoneyRequest.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/IOU/MoneyRequest.ts b/src/libs/actions/IOU/MoneyRequest.ts index 0eb47ecf32ba..5827d203dd9a 100644 --- a/src/libs/actions/IOU/MoneyRequest.ts +++ b/src/libs/actions/IOU/MoneyRequest.ts @@ -583,7 +583,7 @@ function handleMoneyRequestStepDistanceNavigation({ }, transactionParams: { amount: 0, - distance: manualDistance ?? gpsDistance, + distance: manualDistance ?? gpsDistance ?? odometerDistance, currency: transaction?.currency ?? 'USD', created: transaction?.created ?? '', merchant: translate('iou.fieldPending'), @@ -618,7 +618,7 @@ function handleMoneyRequestStepDistanceNavigation({ existingTransaction: transaction, transactionParams: { amount: 0, - distance: manualDistance ?? gpsDistance, + distance: manualDistance ?? gpsDistance ?? odometerDistance, comment: '', created: transaction?.created ?? '', currency: transaction?.currency ?? 'USD',