Skip to content

Feat - [Unreported] Add distance rate to the distance expenses tracked in selfDM#84136

Open
FitseTLT wants to merge 10 commits intoExpensify:mainfrom
FitseTLT:revert-84084-resolve-conflict-of-revert-74967
Open

Feat - [Unreported] Add distance rate to the distance expenses tracked in selfDM#84136
FitseTLT wants to merge 10 commits intoExpensify:mainfrom
FitseTLT:revert-84084-resolve-conflict-of-revert-74967

Conversation

@FitseTLT
Copy link
Contributor

@FitseTLT FitseTLT commented Mar 4, 2026

Explanation of Change

Fixed Issues

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

PROPOSAL:

Tests

I) User with no group workspace
Creation flow

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

Edit flow

  1. Sign in as a user with a group workspace
  2. Create a distance request in a workspace chat
  3. Unreport the distance request (Report > remove from report) to make it move to selfDM
  4. Delete the group workspaces
  5. Go to the distance request in the selfDM
  6. Click on the Rate field
  7. Verify that you see the Upgrade path
  8. Press on the upgrade button and confirm creation of a new workspace
  9. Verify that you are navigated to new rate creation page
  10. Input rate and save
  11. Verify that you are navigated to the rate selection page which also includes the new rate created above
  12. 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

  1. Sign in as a user with a group workspace set as the default one
  2. Go to selfDM and create a distance request
  3. In the confirmation page, Verify that the expense is set to the default rate of the default workspace
  4. Click on the Rate field
  5. Verify that you can pick one of the default workspace rates
  6. Confirm and create the distance request
  7. Now open the distance request from the selfDM
  8. Click on the rate field to edit it
  9. 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

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

Edit flow

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

Precondition:

Workspace distance unit must be different from personal distance unit.

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

Precondition:

Enable distance rates.
Change distance unit to Kilometers.

  1. Go to staging.new.expensify.com
  2. Go to self DM.
  3. Click + > Track distance > Manual.
  4. Enter amount > Next.
  5. Click Create expense.
  6. Open the expense.
  7. Click Distance field.
  8. 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.

  1. Go to staging.new.expensify.com
  2. Go to self DM.
  3. Create a manual distance expense with the default distance rate (0,725 / mile).
  4. Click Submit it to someone.
  5. Select workspace chat.
  6. On confirm page, click Rate.
  7. Select another rate (1.00 / mile).
  8. Click Create expense.
  9. 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.

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

Precondition:

Workspace has at least two distance rates.

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

Precondition:

Disable Submissions in Workflows settings.

  1. Go to staging.new.expensify.com
  2. Open FAB > Track distance > Manual.
  3. Enter amount > Next.
  4. On confirm page, click To field.
  5. Select self DM again.
  6. 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

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (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 shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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(themeColors.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

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""
@FitseTLT 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 FitseTLT marked this pull request as ready for review March 5, 2026 20:09
@FitseTLT FitseTLT requested review from a team as code owners March 5, 2026 20:09
@melvin-bot melvin-bot bot requested review from parasharrajat and trjExpensify and removed request for a team March 5, 2026 20:09
@melvin-bot
Copy link

melvin-bot bot commented Mar 5, 2026

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

Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

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

💡 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".

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

Choose a reason for hiding this comment

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

P1 Badge 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
Copy link

codecov bot commented Mar 5, 2026

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

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 84.41% <100.00%> (+0.20%) ⬆️
src/libs/SearchUIUtils.ts 69.18% <ø> (ø)
src/libs/TransactionPreviewUtils.ts 83.14% <100.00%> (-0.38%) ⬇️
... and 18 more
... and 10 files with indirect coverage changes

@trjExpensify
Copy link
Contributor

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

@parasharrajat
Copy link
Member

Yes in testing

trjExpensify
trjExpensify previously approved these changes Mar 6, 2026
Copy link
Contributor

@trjExpensify trjExpensify left a comment

Choose a reason for hiding this comment

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

Core PR for a WN project. 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants