Feat - [Unreported] Add distance rate to the distance expenses tracked in selfDM by FitseTLT · Pull Request #84136 · Expensify/App

FitseTLT · 2026-03-04T13:04:27Z

Explanation of Change

Fixed Issues

$ #72230
$ #84010
$ #84013
$ #84006
$ #83964
$ #83955
$ #83990

PROPOSAL:

Tests

I) User with no group workspace
Creation flow

Sign in as a user with no group workspace
Go to selfDM and create a distance request
In the confirmation page, click on the Rate field
Verify that you see the upgrade flow
Press on the upgrade button and confirm creation of a new workspace
Verify that you are navigated to new rate creation page
Input rate and save
Verify that the new rate is set to the expense on the confirmation page
Create the track expense and verfiy that the rate is correctly applied to the expense.

Edit flow

Sign in as a user with a group workspace
Create a distance request in a workspace chat
Unreport the distance request (Report > remove from report) to make it move to selfDM
Delete the group workspaces
Go to the distance request in the selfDM
Click on the Rate field
Verify that you see the Upgrade path
Press on the upgrade button and confirm creation of a new workspace
Verify that you are navigated to new rate creation page
Input rate and save
Verify that you are navigated to the rate selection page which also includes the new rate created above
Select a rate and verfiy that the rate is correctly set on the expense

II) User with a group workspace set as the default workspace

Sign in as a user with a group workspace set as the default one
Go to selfDM and create a distance request
In the confirmation page, Verify that the expense is set to the default rate of the default workspace
Click on the Rate field
Verify that you can pick one of the default workspace rates
Confirm and create the distance request
Now open the distance request from the selfDM
Click on the rate field to edit it
Verify that you can pick one of the rates that the default workspace has

III) User with multiple group workspaces that have the personal policy set as the default one

NOTE: To have such a user, you have to go to OldDot and make the personal policy the default workspace from there

Creation flow

Sign in as a user with multiple group workspaces that have the personal policy set as the default one
Go to selfDM and create a distance request
In the confirmation page, verify that you see the default p2p rate set
Click on the Rate field
Verify that you first have to choose one of the group workspaces
Verify that you can now pick one of the chosen workspace rates

Edit flow

Sign in as a user with multiple group workspaces that have the personal policy set as the default one
Create a distance request in a workspace chat
Unreport the distance request to make it move to selfDM
Go to the distance request in the selfDM
Click on the Rate field
Verify that you first have to choose one of the group workspaces
Verify that you can now pick one of the chosen workspace rates

Precondition:

Workspace distance unit must be different from personal distance unit.

Go to staging.new.expensify.com
Go to self DM.
Create a manual distance expense.
Click Submit it to someone.
Select a user (not workspace).
On confirm page, verify that the distance unit and rate value are both correctly displayed based on the p2p rate.
Click Create expense.
Open the expense.
Verify that the distance and rate have the correct value

Precondition:

Enable distance rates.
Change distance unit to Kilometers.

Go to staging.new.expensify.com
Go to self DM.
Click + > Track distance > Manual.
Enter amount > Next.
Click Create expense.
Open the expense.
Click Distance field.
Verify that distance unit in the flow is kilometer (from the changes in precondition).

Precondition:

Enable Taxes and Distance rates.
Add two tax rates - 5% and 10 %.
Add a new distance rates - 1.00 / mile.
Enable Track tax in Distance rates settings.
Assign 5% tax rate to 0.725 / mile (default rate) with any tax reclaimable amount.
Assign 10% tax rate to 1.00 / mile with any tax reclaimable amount.

Go to staging.new.expensify.com
Go to self DM.
Create a manual distance expense with the default distance rate (0,725 / mile).
Click Submit it to someone.
Select workspace chat.
On confirm page, click Rate.
Select another rate (1.00 / mile).
Click Create expense.
Verify that tax no longer valid error will not show and the expense can be created without issue.

Precondition:

Enable Taxes and Distance rates.
Add two tax rates - 5% and 10 %.
Add two distance rates - 1.00 / mile and 2.00 / mile.
Enable Track tax in Distance rates settings.
Assign 5% tax rate to 1.00 / mile with any tax reclaimable amount.
Assign 10% tax rate to 2.00 / mile with any tax reclaimable amount.

Go to staging.new.expensify.com
Go to self DM.
Create a manual distance expense with 1.00 / mile rate.
Open the expense.
Go offline.
Click Rate.
Select 2.00 / mile rate.
Verify Tax and Tax amount field are updated to 10% tax rate.

Precondition:

Workspace has at least two distance rates.

Go to staging.new.expensify.com
Go to self DM.
Create a manual distance expense.
Open the expense.
Go offline.
Click Rate and select another rate.
Go back to self DM.
Click Submit it to someone.
Select workspace chat.
On confirm page, go online.
Verify To field on confirm page will not change after returning online.

Precondition:

Disable Submissions in Workflows settings.

Go to staging.new.expensify.com
Open FAB > Track distance > Manual.
Enter amount > Next.
On confirm page, click To field.
Select self DM again.
Verify Distance and Rate field will not change after reselecting self DM.

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Same as above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

2025-12-06.00-56-10.mp4

Android: mWeb Chrome

2025-12-03.17-53-59.mp4

iOS: Native

2025-12-03.19-40-55.mp4

iOS: mWeb Safari

2025-12-03.17-52-46.mp4

MacOS: Chrome / Safari

2025-12-03.17-52-02.mp4

2026-03-05.22-39-48.mp4

2026-03-05.22-31-40.mp4

…FitseTLT/feat-apply-policyForMovingExpenses-for-rate-field-for-track-distance-expenses""

melvin-bot · 2026-03-05T20:09:17Z

@parasharrajat 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: ad2443ed89

ℹ️ 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-03-05T20:29:23Z

src/libs/actions/IOU/index.ts

    const hasPendingWaypoints = 'waypoints' in transactionChanges;
    const hasModifiedDistanceRate = 'customUnitRateID' in transactionChanges;
-    if (transaction && updatedTransaction && (hasPendingWaypoints || hasModifiedDistanceRate)) {
+    if (transaction && updatedTransaction && hasPendingWaypoints) {


Clear draft when persisting distance-rate changes

By dropping hasModifiedDistanceRate from this cleanup condition, successful track-expense rate edits no longer remove TRANSACTION_DRAFT entries. That leaves stale draft customUnitRateID/distance-unit data around, and later submit/share/categorize flows can read those drafts (via shouldUseTransactionDraft) instead of the persisted transaction, causing users to move or submit expenses with the wrong rate data.

Useful? React with 👍 / 👎.

codecov · 2026-03-05T20:35:42Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/MoneyRequestConfirmationList.tsx	`61.70% <100.00%> (ø)`
...stReportView/MoneyRequestReportTransactionItem.tsx	`0.00% <ø> (ø)`
...stReportView/MoneyRequestReportTransactionList.tsx	`1.14% <ø> (ø)`
...thSections/Search/TransactionGroupListExpanded.tsx	`65.38% <ø> (ø)`
...ionListWithSections/Search/TransactionListItem.tsx	`0.00% <ø> (ø)`
src/components/TransactionItemRow/index.tsx	`86.40% <ø> (+1.36%)`	⬆️
src/hooks/usePolicyForTransaction.ts	`100.00% <100.00%> (ø)`
src/libs/DistanceRequestUtils.ts	`86.36% <100.00%> (+0.17%)`	⬆️
src/libs/SearchUIUtils.ts	`69.89% <ø> (+2.19%)`	⬆️
src/libs/TransactionPreviewUtils.ts	`83.14% <100.00%> (+26.00%)`	⬆️
... and 18 more
... and 216 files with indirect coverage changes

trjExpensify · 2026-03-06T11:40:26Z

@parasharrajat can you review today?
@FitseTLT you've picked up a conflict.

parasharrajat · 2026-03-06T12:10:17Z

Yes in testing

trjExpensify

Core PR for a WN project. 👍

parasharrajat · 2026-03-06T17:37:00Z

[$250] [Unreported] Add distance rate to the distance expenses tracked in selfDM #72230
[Due for payment 2026-03-13] [$250] Distance - Old unit persists when creating distance expense after changing distance unit #84010
[Due for payment 2026-03-13] Distance is not converted but with different unit when submitted from self DM to IOU expense #84013
[Due for payment 2026-03-13] [$250] Distance - "Tax no longer valid" is shown on Tax field after changing distance rate #84006
[Due for payment 2026-03-13] [$250] Distance - Tax and Tax amount do not update when rate is changed offline #83964
[Due for payment 2026-03-13] [$250] Distance - To field changes from workspace to self DM after changing rate and submitting it #83955
[Due for payment 2026-03-13] [$250] Distance- Distance & Rate field change after reselecting self DM when submissions are disabled #83990

trjExpensify · 2026-03-09T14:31:57Z

@parasharrajat update please?

parasharrajat · 2026-03-10T11:03:33Z

Screenshots

10.03.2026_18.09.17_REC.mp4

10.03.2026_16.34.04_REC.mp4

10.03.2026_17.20.57_REC.mp4

10.03.2026_17.24.34_REC.mp4

10.03.2026_17.27.36_REC.mp4

parasharrajat · 2026-03-10T11:35:43Z

Ignore the above bug. I had 2 non-default workspaces, so in that case, it makes sense that the unit is based on P2p

parasharrajat · 2026-03-10T11:48:33Z

How should we handle this case? @cristipaval @FitseTLT

Here, the tracked expense has a km unit when it was created. Then we are submitting that to a workspace with miles.

10.03.2026_17.16.36_REC.mp4

The same thing happens when editing the same tracked expense.

10.03.2026_17.18.57_REC.mp4

parasharrajat · 2026-03-10T12:01:59Z

Tested all reported bugs and they are looking good.

FitseTLT · 2026-03-10T14:40:16Z

Yeah, nice catch @parasharrajat. What should be the unit @cristipaval in this case, km or mi? After it is submitted, I see that the BE chooses the mi unit.

cristipaval · 2026-03-10T20:56:24Z

Hmm.. this is a good one. It works consistently with the other fields: we preserve the values set on the tracked expense fields and display the options from the default workspace when editing, or from the applicable workspace when submitting.

@trjExpensify, what do you think from a product perspective? Does this make sense?

trjExpensify · 2026-03-10T21:26:34Z

After it is submitted, I see that the BE chooses the mi unit.

What does this mean? The backend change the unit silently after creation? If so, why wouldn't we do that for them to confirm on the confirmation page after they picked the workspace in this case? 🤔

cristipaval · 2026-03-11T10:59:06Z

@trjExpensify thanks for looking into it. Yes, from the user perspective I think it's best to convert in the confirm page 👍

parasharrajat · 2026-03-11T11:39:09Z

So while we are submitting to someone, we change the unit based on target workspace. Is that correct? @cristipaval

cc: @FitseTLT

FitseTLT · 2026-03-11T13:08:21Z

Here is how I understand the confusion. A track expense has distance(let say 4mi), rate, amount. The rate was the default rate of policyForMovingExpense with unit mi.

Scenario 1: now we want to submit it to a different workspace with unit km. When we navigate to confirmation page the distance is in mi (track unit) but the confirm page enforces you to select a rate from the policy so when you select everything will be converted to km. We are good to go.
Scenario 2: let say we changed the unit of the policyForMovingExpense to km. When we submit it to policyForMovingExpense on confirm page the unit will be in previous mi unit. And if you open the distance rate page the selected rate is in the previous unit(the track expense transaction unit). But the problem is if you submit it when it is created the BE will set it from 4 mi to 4km so that the amount remains constant between the tracked and submitted one. Look at the vid.

2026-03-11.16-05-27.mp4

It is a bit confusing scenario I need guidance on the expected behavior it is not only a matter of unit. What do we make consistent the distance or amount? cc @trjExpensify @cristipaval

trjExpensify · 2026-03-11T18:35:57Z

If this rate is not valid for the workspace you selected, isn't it better to show the rate invalid for this workspace error on the confirmation page after you chose the workspace to prompt you to choose a rate that is actually valid instead?

FitseTLT · 2026-03-11T19:43:56Z

If this rate is not valid for the workspace you selected, isn't it better to show the rate invalid for this workspace error on the confirmation page after you chose the workspace to prompt you to choose a rate that is actually valid instead?

The problem is the rate is valid as the transaction rate/customUnitRateID already exists in the policy but when we change a unit of a workspace the rates with the same value (numerical value) will have their distance unit changed(this behavior also applies for currency change) So now we will have a different rates on the transaction vs on the workspace.

trjExpensify · 2026-03-12T01:33:06Z

I'm not following you. On Classic, there's an error that says "Unit no longer valid" so we do know somehow when the unit of a distance rate on an expense is invalid on a given workspace.

FitseTLT · 2026-03-12T13:36:54Z

I'm not following you. On Classic, there's an error that says "Unit no longer valid" so we do know somehow when the unit of a distance rate on an expense is invalid on a given workspace.

Ofcourse we can know @trjExpensify I want to get a direction into what to implement. Note that rate basically includes unit, currency and numerical value. So let's say a track expense was created with an old value (interms of any of three info I mentioned) when we submit it we should show rate no longer valid if the rate is changed. cc @cristipaval Pls tell me the expected behavior and let's finish this thing.

cristipaval · 2026-03-12T15:41:08Z

@FitseTLT, I chatted with @trjExpensify, and we want the following logic when the user lands on the confirmation page:

Look at the rate stored for the transaction (customUnitID and customUnitRateID)

1.1 If the transaction rate is valid for the target workspace ✅
- Do nothing
1.2 The transaction rate is not valid ❌
- Show a violation on the rate field
- The user clicks on the rate to fix the violation
- The App displays the rate selection page with only the valid rates from the target workspace
- The user picks a valid rate, and the violation is cleared
Look at the distance stored on the transaction (distance and distanceUnit)

2.1 The distanceUnit is the same as the rate unit ✅
- Do nothing
2.2 The distanceUnit is different than the rate unit ❌
- Show a violation on the distance field
- The user clicks on the distance to fix the violation
- The App displays the distance input page with the valid unit of the rate
- The user clicks the Save button, and the violation is cleared

cc @parasharrajat

FitseTLT · 2026-03-12T16:30:49Z

@FitseTLT, I chatted with @trjExpensify, and we want the following logic when the user lands on the confirmation page:

Look at the rate stored for the transaction (customUnitID and customUnitRateID)
1.1 If the transaction rate is valid for the target workspace ✅

Do nothing

1.2 The transaction rate is not valid ❌

Show a violation on the rate field

The user clicks on the rate to fix the violation

The App displays the rate selection page with only the valid rates from the target workspace

The user picks a valid rate, and the violation is cleared

@cristipaval @trjExpensify If you are judging rate equality via customUnitRateID then the current behavior already aligns with the above. I am asking about how it behaves when a rate's numeric value or unit or currency(wsp) changes after creating the track expense.

Look at the distance stored on the transaction (distance and distanceUnit)
2.1 The distanceUnit is the same as the rate unit ✅

Do nothing

2.2 The distanceUnit is different than the rate unit ❌

Show a violation on the distance field

The user clicks on the distance to fix the violation

The App displays the distance input page with the valid unit of the rate

The user clicks the Save button, and the violation is cleared

cc @parasharrajat

This also doesn't look logical behavior to me. If the track was 2mi then the unit changed to km, current behavior is shows in mi in confirm page but when you open the distance it displays it converting it to 3.22km. If having different unit is not allowed/violation then we know the value should be converted into the new unit(and fortunately we can do that in FE) automatically why do we need the users involvement? I mean at least the rate out of policy case we don't know what the user wants to select but here it doesn't make sense.

trjExpensify · 2026-03-12T17:27:59Z

2.2 The distanceUnit is different than the rate unit ❌

Show a violation on the distance field
The user clicks on the distance to fix the violation
The App displays the distance input page with the valid unit of the rate
The user clicks the Save button, and the violation is cleared

Ah, I think I arrived at a different conclusion on this one. I think the error should be shown on the rate field, as the distance rate in use (say 0.45p / mile) is invalid compared to the updated rate of the workspace (say 0.45p / km). So basically the same experience as 1.2

FitseTLT · 2026-03-12T19:32:06Z

2.2 The distanceUnit is different than the rate unit ❌
Show a violation on the distance field
The user clicks on the distance to fix the violation
The App displays the distance input page with the valid unit of the rate
The user clicks the Save button, and the violation is cleared

Ah, I think I arrived at a different conclusion on this one. I think the error should be shown on the rate field, as the distance rate in use (say 0.45p / mile) is invalid compared to the updated rate of the workspace (say 0.45p / km). So basically the same experience as 1.2

Hmmmm. This rate out of policy case will be a bit odd compared to the existing cases. Because on the rate selection page the current transaction rate (which is identified by customUnitRateID) will appear as selected as the rate already exists in the workspace only the unit is changed. And @cristipaval changing the selection logic (to be based also on the unit etc..) will be an unfavorable specialized workaround solution (Let me know your opinion from implementation perspective) So why don't we just auto update the rate to the new workspace value/unit when a track expense is submitted?

Note. BTW this problem already exist on main. If you change the unit of a rate then already created transactions will have an old rate unit and it will only change to the new unit if you reselect the rate. The new issue linked to this pr is that we are moving a track expense into a workspace space.

FitseTLT · 2026-03-16T14:37:16Z

@cristipaval on the ^

parasharrajat · 2026-03-19T14:51:01Z

Bump @cristipaval on this.

cristipaval · 2026-03-24T08:57:31Z

@FitseTLT @parasharrajat, what I understand is that right now, everything is covered, except for the following scenario:

I have the default workspace with 2 distance rates: Default rate $0.67/mile, and Executive rate $1.1/mile
I create a tracked distance expense for a 10-mile distance and the Executive rate

I go to Workspace Settings -> Distance rates -> Settings and change the Unit to kilometers.
- This updates the unit on all rates.
I go to the selfDM and start submitting the tracked distance created at step 2 to the default workspace

What we are discussing here is what to show on the confirmation page, correct?
The screenshot below is what the current PR displays

I think @trjExpensify was saying here that we could detect whether the amount was calculated with the expense rate using the old unit and show a violation in the rate field, as in Classic.

Then, when the user clicks on the Rate field to fix the violation, show the page with the updated workspace rates, and no rate selected by default. So the user can only pick a rate with the updated unit. Once the user picks the rate, we convert the distance to the new unit and update the amount accordingly. @trjExpensify, do I get this right?

Revert "[CP Staging] Revert "Merge pull request Expensify#74967 from …

0e8a196

…FitseTLT/feat-apply-policyForMovingExpenses-for-rate-field-for-track-distance-expenses""

melvin-bot bot assigned FitseTLT Mar 4, 2026

FitseTLT added 7 commits March 4, 2026 17:05

fix rate selection bug when policyForMovingExpenses submission is off

605d51e

fix participant resetting bug when BE response on rate update arrive

2cfdaaf

fix tax updating bug on rate change

ca2507a

fix distance manual page distance unit bug

271ce41

fix unit bug for p2p custom unit rate

05796b0

Merge branch 'main' into pr/FitseTLT/84136

ec9486c

set taxValue of transaction on rate change

ad2443e

FitseTLT changed the title ~~Revert "[CP Staging] Revert "Merge pull request #74967 from FitseTLT/feat-apply-policyForMovingExpenses-for-rate-field-for-track-distance-expenses""~~ Feat - [Unreported] Add distance rate to the distance expenses tracked in selfDM Mar 5, 2026

FitseTLT marked this pull request as ready for review March 5, 2026 20:09

FitseTLT requested review from a team as code owners March 5, 2026 20:09

melvin-bot bot requested review from parasharrajat and trjExpensify and removed request for a team March 5, 2026 20:09

Merge branch 'main' into pr/FitseTLT/84136

f15021e

FitseTLT mentioned this pull request Mar 5, 2026

[$250] [Unreported] Add distance rate to the distance expenses tracked in selfDM #72230

Open

chatgpt-codex-connector bot reviewed Mar 5, 2026

View reviewed changes

trjExpensify previously approved these changes Mar 6, 2026

View reviewed changes

Merge branch 'main' into pr/FitseTLT/84136

42092f6

FitseTLT dismissed trjExpensify’s stale review via 42092f6 March 6, 2026 15:04

This comment was marked as outdated.

Sign in to view

Merge branch 'main' into pr/FitseTLT/84136

86a3f86

Merge branch 'main' into pr/FitseTLT/84136

79092f6

cristipaval mentioned this pull request Mar 16, 2026

[HOLD] [$250] Reports - "Rate not valid for this workspace" appears twice after moving expense offline #79613

Open

7 tasks

cristipaval self-requested a review March 25, 2026 07:48

Conversation

FitseTLT commented Mar 4, 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!

melvin-bot bot commented Mar 5, 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 Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Mar 5, 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!

trjExpensify commented Mar 6, 2026

Uh oh!

parasharrajat commented Mar 6, 2026

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

parasharrajat commented Mar 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

trjExpensify commented Mar 9, 2026

Uh oh!

parasharrajat commented Mar 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Screenshots

Uh oh!

This comment was marked as outdated.

parasharrajat commented Mar 10, 2026

Uh oh!

parasharrajat commented Mar 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

parasharrajat commented Mar 10, 2026

Uh oh!

FitseTLT commented Mar 10, 2026

Uh oh!

cristipaval commented Mar 10, 2026

Uh oh!

trjExpensify commented Mar 10, 2026

Uh oh!

cristipaval commented Mar 11, 2026

Uh oh!

parasharrajat commented Mar 11, 2026

Uh oh!

FitseTLT commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

trjExpensify commented Mar 11, 2026

Uh oh!

FitseTLT commented Mar 11, 2026

Uh oh!

trjExpensify commented Mar 12, 2026

Uh oh!

FitseTLT commented Mar 12, 2026

Uh oh!

cristipaval commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FitseTLT commented Mar 12, 2026

Uh oh!

trjExpensify commented Mar 12, 2026

Uh oh!

FitseTLT commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FitseTLT commented Mar 16, 2026

FitseTLT commented Mar 4, 2026 •

edited

Loading

codecov bot commented Mar 5, 2026 •

edited by github-actions bot

Loading

parasharrajat commented Mar 6, 2026 •

edited

Loading

parasharrajat commented Mar 10, 2026 •

edited

Loading

parasharrajat commented Mar 10, 2026 •

edited

Loading

FitseTLT commented Mar 11, 2026 •

edited

Loading

cristipaval commented Mar 12, 2026 •

edited

Loading

FitseTLT commented Mar 12, 2026 •

edited

Loading

cristipaval commented Mar 24, 2026 •

edited

Loading