Add alternate route for map-based mileage expenses by GCyganek · Pull Request #96169 · Expensify/App

GCyganek · 2026-07-15T09:07:02Z

Explanation of Change

Adds alternate route selection for map-based distance expenses. The map now renders both routes returned by the BE and lets the user tap one to pick it; the pick is stored in comment.selectedRouteKey and recovered for saved expenses by distance-matching customUnit.routeDistanceMeters. selectedRouteDistance is sent on create/track/update so the BE uses the chosen route.

Fixed Issues

$ #90658
PROPOSAL: N/A

Tests

1. Create a map distance expense on the alternate route (check both workspace and selfDM expense)

Open the FAB and choose Track distance → Map.
Enter a start and a finish waypoint that have more than one driving route (e.g. two cities connected by both a highway and a secondary road).
Wait for the map to render and verify that two routes are drawn: the selected one in the darker green with a dark distance label, and the alternate one in the lighter green with a light distance label.
Tap the alternate (lighter) route on the map.
Verify that the tapped route becomes the selected one (colors swap) and that the distance/amount shown on the button and on the confirmation screen update to that route's distance.
Tap Next, then submit the expense.
Open the created expense and verify that its distance, merchant string and amount match the alternate route, not the primary one.
Verify that the expense preview map highlights the alternate route as the selected one.

2. Switch the route on an already-created expense

Using the expense created in test 1, open it and click the distance/route field to open the distance edit page.
Verify that the previously chosen alternate route is still shown as the selected one (this is recovered from the saved route distance, so it also holds after a page reload or a fresh login).
Tap the other route on the map and click Save.
Verify that the expense amount, merchant and distance update to the newly selected route, and that a "changed the distance" system message is posted in the expense thread with the correct old/new amounts and the expense currency (not USD) for a non-USD workspace.
Reopen the distance edit page and verify the newly selected route is still marked as selected.
Open the distance edit page again and click Save without changing anything, and verify that no update request is sent and no system message is posted.

3. Manual distance override and waypoint edits

Open an existing map distance expense, go to the Manual tab, type a distance different from both routes and Save.
Reopen the edit page and verify the Manual tab still shows the typed value and the map still shows both routes with the previously selected one highlighted (a manual override must not read as a route switch).
Tap the alternate route on the map, verify the manual input follows the newly selected route's distance, then Save and verify the expense uses the route distance rather than the old typed value.
Reopen the edit page, change one of the waypoints and verify both routes are cleared, refetched and the selection resets to the primary route.
Change a waypoint, then press the back button without saving and verify the discard-changes modal appears. Repeat with only a route tap (no waypoint change) and verify the modal also appears.
Split the expense (Split expense) and verify each split item's distance, amount and merchant are derived from the selected route, and that a manual override on the parent expense is preserved rather than replaced by the route distance when editing an unrelated split field.

Offline tests

Map is not loaded in offline mode so user can't change route in offline mode

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-08-03.at.17.12.16.mov

Screen.Recording.2026-08-03.at.17.11.29.mov

Screen.Recording.2026-08-03.at.17.09.28.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2026-08-03.at.16.51.42.mov

Screen.Recording.2026-08-03.at.17.02.38.mov

Screen.Recording.2026-08-03.at.17.03.19.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-08-03.at.16.24.20.mov

Screen.Recording.2026-08-03.at.16.26.13.mov

Screen.Recording.2026-08-03.at.16.30.42.1.mov

codecov · 2026-07-15T09:11:56Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/CONST/index.ts	`94.81% <ø> (ø)`
src/components/MapView/utils.ts	`37.97% <100.00%> (+7.41%)`	⬆️
src/components/ViolationMessages.tsx	`0.00% <ø> (ø)`
src/libs/DebugUtils.ts	`68.82% <ø> (ø)`
src/libs/ReportUtils.ts	`86.68% <100.00%> (ø)`
src/libs/TransactionUtils/getDistanceInMeters.ts	`100.00% <100.00%> (ø)`
src/libs/TransactionUtils/getSelectedRouteKey.ts	`100.00% <100.00%> (ø)`
src/libs/Violations/ViolationsUtils.ts	`79.67% <ø> (ø)`
src/libs/actions/IOU/Split.ts	`72.46% <ø> (ø)`
src/libs/actions/IOU/SplitExpenseItems.ts	`95.41% <100.00%> (+0.68%)`	⬆️
... and 23 more
... and 17 files with indirect coverage changes

github-actions · 2026-07-15T13:44:12Z

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

GCyganek · 2026-07-29T12:56:37Z

@codex please review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f1aa5fc97f

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

GCyganek · 2026-07-29T14:30:31Z

@codex please review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1d602e2a1c

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-07-29T14:38:26Z

    const {unit} = mileageRate ?? {};
+    const isAlternativeDirectionSelected = transaction?.comment?.selectedRouteKey === 'route1';
+    const handleRouteSelection = (isAlternative: boolean) => {
+        setSelectedRoute(transaction?.transactionID ?? CONST.IOU.OPTIMISTIC_TRANSACTION_ID, isAlternative ? 'route1' : 'route0', transactionState);


Persist alternate route edits on save

When this handler runs in the edit flow for an existing map-distance expense, it only merges selectedRouteKey locally. The save path in IOURequestStepDistance still returns early when waypoint addresses and manual quantity are unchanged, so tapping the alternate route and pressing Save sends no updateMoneyRequestDistance/selected-route data to the backend; the report can keep the old route/amount after sync even though the editor appeared to save the alternate selection. Include the selected route change in edit change detection and the update payload.

Useful? React with 👍 / 👎.

yeah I'm aware, will fix this

github-actions · 2026-07-29T14:46:17Z

🚧 JmillsExpensify has triggered a test Expensify/App build. You can view the workflow run here.

JmillsExpensify · 2026-07-29T15:10:10Z

Very cool! It works super well. Both of these routs should have been flagged, as I constantly get the same on Google Maps.

GCyganek · 2026-07-30T13:20:06Z

@codex please review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1eed358e66

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

GCyganek · 2026-07-31T14:25:41Z

@codex please review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 63d2059aa7

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ebc582da2f

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

melvin-bot · 2026-08-03T15:07:49Z

@dmkt9 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 76b40d042b

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-08-03T15:16:55Z

            linkedTrackedExpenseReportAction,
            linkedTrackedExpenseReportID,
            customUnitRateID,
+            selectedRouteDistance,


Preserve route choice when moving tracked expenses

When the selected-route distance is only carried in the retry/default TrackExpense payload here, tracked-distance moves still lose it: the CATEGORIZE, SHARE, and SUBMIT branches below rebuild transactionParams without selectedRouteDistance, and moveTrackedExpenseToPolicy/shareTrackedExpense only spread those params into the API request. For a tracked map expense created on route1, later submitting/categorizing/sharing it to a workspace can therefore send only the waypoints and let the backend fall back to route0, changing the moved expense's distance/amount. Include this field in those action-specific transactionParams as well.

Useful? React with 👍 / 👎.

shawnborton · 2026-08-03T15:19:03Z

Let us know when this is ready for some builds.

GCyganek · 2026-08-03T15:31:35Z

@shawnborton feel free to build and test

github-actions · 2026-08-03T15:38:21Z

🚧 shawnborton has triggered a test Expensify/App build. You can view the workflow run here.

JmillsExpensify · 2026-08-03T15:44:04Z

Removed Tom since this is my assigned initiative.

github-actions · 2026-08-03T15:46:09Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #96169.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-949f6233a3e-063294d-9216baa9999aad3fe5c67483f4aaafb8fc5be802/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-949f623-063294d-b15e513ed89588e1c674e76cebb67272ae6ce00b/index.html

Web 🕸️
https://96169.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

shawnborton · 2026-08-03T15:49:54Z

Hmm the app immediately crashes when I try to test the iOS build. Any ideas?

JmillsExpensify

Still looks great!

JmillsExpensify · 2026-08-03T15:53:38Z

Interesting. I didn't see that in the last test.

shawnborton · 2026-08-03T15:57:07Z

Visually this looks good, but the behavior of clicking on the miles badge and having it convert to KM feels weird. I feel like when you first click the alternate route, it should just select the alt route. Maybe clicking it a second time can convert the distance?

Also, we should use a pointer cursor here instead of a drag cursor when you go to hover over the alt line.

I also wonder if we need a hover state for the line but we can tackle that as a follow up if we want to.

CleanShot.2026-08-03.at.11.55.47.mp4

JmillsExpensify · 2026-08-03T18:49:53Z

Visually this looks good, but the behavior of clicking on the miles badge and having it convert to KM feels weird. I feel like when you first click the alternate route, it should just select the alt route. Maybe clicking it a second time can convert the distance?

Ah interesting. I didn't run into this. I like this suggestion. Honestly I'd prefer to remove it for the v1, though I can see how it's useful at this stage because you haven't selected the workspace yet, so we don't really know which unit to use.

Init add alternate route for map-based mileage expenses

bd123ec

melvin-bot Bot assigned GCyganek Jul 15, 2026

GCyganek added 5 commits July 15, 2026 11:23

Fix lint and ts

4bef03f

Code cleanup, adjust styles to Figma

d02b07d

Fix directions layers order when switching between directions

0223d92

Revert changes in Direction.tsx

72942c4

Add missing geojson types

8319296

GCyganek added 2 commits July 29, 2026 13:09

Merge branch 'main' into @GCyganek/alternate-routes

8676bcc

Use selectedRouteDistance prop, add tests

f1aa5fc

chatgpt-codex-connector Bot reviewed Jul 29, 2026

View reviewed changes

Comment thread src/libs/TransactionUtils/index.ts Outdated

Comment thread src/components/DistanceRequest/DistanceRequestFooter.tsx Outdated

Comment thread src/libs/actions/Transaction.ts

Comment thread src/components/MapView/MapViewImpl.web.tsx Outdated

GCyganek added 4 commits July 29, 2026 15:15

Fix getSelectedRouteDistance

99ed0b9

Fix transactionState

9ed553f

Clear selectedRouteKey when invalidating routes

ed1f20d

Add web alternate routes components

1d602e2

chatgpt-codex-connector Bot reviewed Jul 29, 2026

View reviewed changes

This comment has been minimized.

Sign in to view

Fix expense updates, add tests

1eed358

chatgpt-codex-connector Bot reviewed Jul 30, 2026

View reviewed changes

Comment thread src/libs/TransactionUtils/index.ts Outdated

GCyganek added 2 commits July 31, 2026 12:10

Always send selectedRouteDistance

63d2059

Fix problems with map expense updates

6a31934

Include legacy distance requests when resolving route choice

2866450

chatgpt-codex-connector Bot reviewed Jul 31, 2026

View reviewed changes

Comment thread src/libs/ReportUtils.ts

Comment thread src/components/MapView/DistanceSymbol.tsx Outdated

chatgpt-codex-connector Bot reviewed Aug 3, 2026

View reviewed changes

Comment thread src/components/MapView/MapViewImpl.web.tsx

GCyganek added 4 commits August 3, 2026 16:39

Merge branch 'main' into @GCyganek/alternate-routes

39450b8

Merge branch 'main' into @GCyganek/alternate-routes

ffa6548

Fix getCurrencySymbol

bff3375

Fix tests

76b40d0

GCyganek marked this pull request as ready for review August 3, 2026 15:07

GCyganek requested review from a team as code owners August 3, 2026 15:07

melvin-bot Bot requested a review from dmkt9 August 3, 2026 15:07

melvin-bot Bot requested review from trjExpensify and removed request for a team August 3, 2026 15:07

github-actions Bot reviewed Aug 3, 2026

View reviewed changes

Comment thread src/components/MapView/MapViewTypes.ts

github-actions Bot reviewed Aug 3, 2026

View reviewed changes

Comment thread src/components/MapView/MapViewTypes.ts

chatgpt-codex-connector Bot reviewed Aug 3, 2026

View reviewed changes

Fix comment styles

949f623

JmillsExpensify requested review from JmillsExpensify and removed request for trjExpensify August 3, 2026 15:43

JmillsExpensify approved these changes Aug 3, 2026

View reviewed changes

Uh oh!

Conversation

GCyganek commented Jul 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Jul 15, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

github-actions Bot commented Jul 15, 2026

Uh oh!

GCyganek commented Jul 29, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

GCyganek commented Jul 29, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jul 29, 2026

Choose a reason for hiding this comment

Uh oh!

GCyganek Jul 30, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Jul 29, 2026

Uh oh!

This comment has been minimized.

JmillsExpensify commented Jul 29, 2026

Uh oh!

GCyganek commented Jul 30, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

GCyganek commented Jul 31, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

melvin-bot Bot commented Aug 3, 2026

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Aug 3, 2026

Choose a reason for hiding this comment

Uh oh!

shawnborton commented Aug 3, 2026

Uh oh!

GCyganek commented Aug 3, 2026

Uh oh!

GCyganek commented Jul 15, 2026 •

edited

Loading

codecov Bot commented Jul 15, 2026 •

edited by github-actions Bot

Loading