Skip to content

Display correct unit for commuter exclusions #94457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Beamanator merged 2 commits into from
Jun 24, 2026
+3 −1
Merged

Display correct unit for commuter exclusions #94457

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea26f0b
fix unit display
Gonals Jun 24, 2026
bece355
better fix
Gonals Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/pages/workspace/distanceRates/PolicyCommuterExclusionsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ function PolicyCommuterExclusionsPage({route}: PolicyCommuterExclusionsPageProps
return;
}

if (existingMethod === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.FIXED_DISTANCE && existingCommuterExclusions?.fixedDistance === numeric) {
const isSameDistance = existingMethod === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.FIXED_DISTANCE && existingCommuterExclusions?.fixedDistance === numeric;
const isSameUnit = existingCommuterExclusions?.fixedDistanceUnit === workspaceUnit;
if (isSameDistance && isSameUnit) {
Comment on lines +99 to +101

@fedirjh fedirjh Jun 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Image

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.

@Gonals Gonals Jun 24, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@fedirjh fedirjh Jun 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

goBackToSettings();
return;
}
Expand Down
Loading