Skip to content

Fix - Expense Report- "Rate not valid for this workspace" error msg not appears - #99683

Draft
FitseTLT wants to merge 2 commits into
Expensify:mainfrom
FitseTLT:fix-lack-of-custom-unit-rate-violation-on-moving-track-expense
Draft

Fix - Expense Report- "Rate not valid for this workspace" error msg not appears#99683
FitseTLT wants to merge 2 commits into
Expensify:mainfrom
FitseTLT:fix-lack-of-custom-unit-rate-violation-on-moving-track-expense

Conversation

@FitseTLT

Copy link
Copy Markdown
Contributor

Explanation of Change

When a tracked distance expense is moved to a workspace, changeTransactionsReport replaced the P2P rate with the workspace default and then computed violations against the swapped transaction, so CUSTOM_UNIT_OUT_OF_POLICY was never raised. The swap also recalculated the amount, silently changing a figure the user had entered. Both halves came from #88286, which additionally added && customRate.enabled !== false in ViolationsUtils and sent the substituted rate to the backend as a new API param.

This reverts all four parts of #88286 so a moved expense keeps its rate and the user is told it is invalid, with two deliberate differences from a plain revert. The disabled-rate check is restored as a pending-deletion check instead, because deletePolicyDistanceRates leaves a rate as enabled: false with a pending DELETE and seeds the violation itself — a rate that is merely disabled still calculates and must not flag. And getViolationsOnyxData is now told where the transaction is landing, since a move never rewrites the transaction's own participants; without that the P2P guard read the stale side of the move and cleared the violation instead of raising it optimistically.

Fixed Issues

$ #96319
PROPOSAL: #96319 (comment)

Tests

  1. Sign in with an account that has no workspace.
  2. Go to Self DM and create a distance expense (FAB → Create expense → Distance), entering the distance manually.
  3. Open the created expense and note the Rate, Distance and Amount shown.
  4. Tap the Report field.
  5. Tap Upgrade and complete the upgrade flow.
  6. Tap Create Report.
  7. Verify the expense moves to a new expense report on the new workspace.
  8. Verify the RBR error "Rate not valid for this workspace" is shown on the expense.
  9. Verify the Rate, Distance and Amount are unchanged from step 3 — the rate must not be silently swapped for the workspace default, and the amount must not be recalculated.
  10. Tap the Rate field and pick a valid workspace rate.
  11. Verify the violation clears and the amount updates to match the rate you picked.
  12. Move the expense back out of the report (Report field → remove from report).
  13. Verify no "Rate not valid for this workspace" violation is shown on the expense in Self DM.
  14. Repeat steps 2–8 with the device offline (disable the network before step 4) and verify the violation appears immediately, while still offline, and remains after reconnecting.
  15. As an admin of a workspace with more than one distance rate, create a distance expense on that workspace using a non-default rate.
  16. Go to Workspace → Distance rates, select that rate and disable it.
  17. Verify the existing expense does not get a "Rate not valid for this workspace" violation.
  18. Re-enable the rate, then delete it instead.
  19. Verify the existing expense does get the "Rate not valid for this workspace" violation.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

  • 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
  • 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 followed proper code patterns (see Reviewing the code)
    • 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 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)
  • 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 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 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.
  • 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@FitseTLT
FitseTLT marked this pull request as ready for review August 27, 2026 16:40
@FitseTLT
FitseTLT requested review from a team as code owners August 27, 2026 16:40
@melvin-bot
melvin-bot Bot requested review from heyjennahay and mkhutornyi and removed request for a team August 27, 2026 16:40
@melvin-bot

melvin-bot Bot commented Aug 27, 2026

Copy link
Copy Markdown

@mkhutornyi 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 chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

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: f072a74a8c

ℹ️ 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".

policyCategories: policyCategories ?? {},
hasDependentTags: policyHasDependentTags,
isInvoiceTransaction: false,
isTransactionOnPolicyExpenseChat: !isUnreported && isExpenseReport(newReport),

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Preserve the destination context after moving the expense

When a P2P-rate distance expense is moved to a workspace while offline, this flag makes the violation appear only during the move itself; the optimistic transaction still retains its old participants. A subsequent edit or receipt change invokes getViolationsOnyxData from UpdateMoneyRequest or Receipt without this override, so the fallback reads the stale non-policy participants and removes CUSTOM_UNIT_OUT_OF_POLICY even though the expense remains on the workspace report. Persist or derive the policy-report context for every recomputation so unrelated offline edits cannot clear the new error. CLAUDE.mdL82-L87

Useful? React with 👍 / 👎.

@FitseTLT

Copy link
Copy Markdown
Contributor Author

@mkhutornyi still draft because I reproduced the original bug on the revert. It is a bit tricky to reproduce it happens when the network response is slow(as u can see in the vid the loading stayed long) and u need to quickly set the rate

2026-08-27.19-31-13.mp4

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.

1 participant