Display correct unit for commuter exclusions by Gonals · Pull Request #94457 · Expensify/App

Gonals · 2026-06-24T12:22:19Z

Explanation of Change

Fixed Issues

$ #94267
PROPOSAL:

Tests

Go to workspace settings > Distance rates.
Click Settings.
Click Exclude commutes.
Click Exclude a fixed distance per claim.
Enter any mile.
Click Save.
Click Unit.
Change it to Kilometers.
Click Exclude commutes.
Click Save.
Confirm it changed to KM

Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

melvin-bot · 2026-06-24T12:22:30Z

@sobitneupane 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]

codecov · 2026-06-24T12:26:41Z

Codecov Report

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

Files with missing lines	Coverage Δ
...ace/distanceRates/PolicyCommuterExclusionsPage.tsx	`0.00% <0.00%> (ø)`
... and 188 files with indirect coverage changes

Gonals · 2026-06-24T12:48:00Z

Assigning @fedirjh as part of this project

fedirjh · 2026-06-24T13:16:01Z

+        const isSameDistance = existingMethod === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.FIXED_DISTANCE && existingCommuterExclusions?.fixedDistance === numeric;
+        const isSameUnit = existingCommuterExclusions?.fixedDistanceUnit === workspaceUnit;
+        if (isSameDistance && isSameUnit) {


@Gonals I think this will not fix the bug: Unit is Km but exclude commuter mention Mi

The problem is within this line which uses policy.commuterExclusions.fixedDistanceUnit not the defaultUnit

App/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx

Line 124 in bece355

unit: policy.commuterExclusions.fixedDistanceUnit ?? defaultUnit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES,

It seems we need to update SetPolicyDistanceRatesUnit command on the backend side to update the commuter rate unit saved on the policy object, which is not the case right now.

Hmmm. I was thinking we could leave it with the unit it was setup. That's why we save the unit. Even if the default unit has changed, we can still calculate the exclusion with the saved unit later

I see, that makes sense. I would expect it to change automatically. We can definitely leave it as it is for the time being.

fedirjh · 2026-06-24T15:23:10Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

iOS: mWeb Safari

CleanShot.2026-06-24.at.16.22.26.mp4

MacOS: Chrome / Safari

CleanShot.2026-06-24.at.16.16.22.mp4

OSBotify · 2026-06-24T17:51:49Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-06-24T17:58:31Z

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

github-actions · 2026-06-24T18:04:07Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-ff46d187bd2-da6729a-b21b7af3a3f8556b522b87a320a855cd24d9447d/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-ff46d18-da6729a-b43efa459b76181509fddf6fdefcad732d391165/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-24T19:40:39Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.4.19-1 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-24T19:42:23Z

🤖 No help site changes required.

This PR is a bug fix for the commuter exclusions feature on workspace Distance rates (PolicyCommuterExclusionsPage.tsx). It corrects a regression where the "Exclude commutes" field kept showing the old unit after the rate's unit was changed — the save logic now also compares the unit, not just the distance value.

Because this restores the intended behavior rather than changing or adding any user-facing functionality — and the commuter exclusions feature is not currently documented under docs/articles — no help site updates are needed. I did not open a docs PR.

What I checked

The diff only adds a unit comparison (isSameUnit) to the early-return guard in the save handler — no new UI, settings, or flows.
Searched App/docs/articles/new-expensify/ for "commut" → no matches; commuter exclusions are not documented today.
Set-distance-rates.md (New Expensify) describes creating/managing rates but does not cover commuter exclusions or unit-specific behavior, so there's nothing here that needs correcting.

OSBotify · 2026-06-25T21:31:10Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.19-5 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Gonals added 2 commits June 24, 2026 14:10

fix unit display

ea26f0b

better fix

bece355

Gonals requested a review from fedirjh June 24, 2026 12:22

Gonals self-assigned this Jun 24, 2026

Gonals marked this pull request as ready for review June 24, 2026 12:22

Gonals requested review from a team as code owners June 24, 2026 12:22

melvin-bot Bot requested review from sobitneupane and trjExpensify and removed request for a team June 24, 2026 12:22

melvin-bot Bot removed the request for review from a team June 24, 2026 12:22

Gonals removed the request for review from sobitneupane June 24, 2026 12:47

fedirjh suggested changes Jun 24, 2026

View reviewed changes

fedirjh approved these changes Jun 24, 2026

View reviewed changes

Beamanator approved these changes Jun 24, 2026

View reviewed changes

Beamanator merged commit ff46d18 into main Jun 24, 2026
42 of 45 checks passed

Beamanator deleted the alberto-distanceFixes branch June 24, 2026 17:44

OSBotify mentioned this pull request Jun 24, 2026

Deploy Checklist: New Expensify 2026-06-24 #94490

Closed

69 tasks done

melvin-bot Bot mentioned this pull request Jun 25, 2026

[Due for payment 2026-07-02] Distance - After changing unit, Exclude commutes field shows the old unit #94267

Closed

4 of 7 tasks

KJ21-ENG mentioned this pull request Jul 14, 2026

[Due for payment 2026-10-23] [$250] Rate-Exclude Commute unit remains mi after switching to kilometres until setting is re-saved #96135

Open

2 of 7 tasks

Conversation

Gonals commented Jun 24, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jun 24, 2026

Uh oh!

codecov Bot commented Jun 24, 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!

Gonals commented Jun 24, 2026

Uh oh!

fedirjh Jun 24, 2026

Choose a reason for hiding this comment

Uh oh!

Gonals Jun 24, 2026

Choose a reason for hiding this comment

Uh oh!

fedirjh Jun 24, 2026

Choose a reason for hiding this comment

Uh oh!

fedirjh commented Jun 24, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Jun 24, 2026

Uh oh!

github-actions Bot commented Jun 24, 2026

Uh oh!

github-actions Bot commented Jun 24, 2026

Uh oh!

OSBotify commented Jun 24, 2026

Uh oh!

MelvinBot commented Jun 24, 2026

Uh oh!

OSBotify commented Jun 25, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov Bot commented Jun 24, 2026 •

edited by github-actions Bot

Loading