Fix: Error when creating per diem expense after selecting report from different workspace #79939

nyomanjyotisa · 2026-01-20T01:23:42Z

Explanation of Change

Clear subrates, and update customUnitID if policy changed for per diem transactions

Fixed Issues

$ #78985
PROPOSAL: #78985 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Precondition:

Create two workspaces - A and B.
Import per diem rates to both workspaces (can use the same per diem rates).

Go to workspace chat A.
Create two empty reports.
Go to workspace chat B.
Create an empty report.
Open FAB -> Create expense -> Per diem.
Select Workspace A.
Select any data and proceed to confirm page.
On confirm page, click Report field.
Select report from Workspace B.
Verify that the Subrate field is cleared after selecting report from another workspace.
Select a new subrate and quantity -> Save
Click Create expense.
Verify that the Per diem expense is created successfully.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android-Native.mp4

Android: mWeb Chrome

Android-mWeb.Chrome.mp4

iOS: Native

iOS-Native.mp4

iOS: mWeb Safari

iOS-mWeb.Safari.mp4

MacOS: Chrome / Safari

MacOS-Chrome.mp4

… different workspace

codecov · 2026-01-20T01:33:01Z

Codecov Report

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

Files with missing lines	Coverage Δ
...rc/pages/iou/request/step/IOURequestStepReport.tsx	`0.00% <0.00%> (ø)`
... and 5 files with indirect coverage changes

melvin-bot · 2026-01-20T14:32:01Z

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

github-actions · 2026-01-20T14:35:19Z

src/pages/iou/request/step/IOURequestStepReport.tsx

            true,
        );

+        // Clear subrates, and update customUnitID if policy changed for per diem transactions


❌ CONSISTENCY-5 (docs)

Potential State Inconsistency: If the new policy doesn't have per diem rates enabled (i.e., newCustomUnitID is undefined), the code will clear customUnitRateID and subrates but won't update the customUnitID. This leaves the transaction with a customUnitID from the old policy but no corresponding rate ID or subrates, creating an inconsistent state.

Suggested Fix:
Add validation to ensure the new policy supports per diem before allowing the change:

// Clear subrates, and update customUnitID if policy changed for per diem transactions if (policyChanged && isPerDiemTransaction) { if (!newCustomUnitID) { Log.error('[IOURequestStepReport] New policy does not support per diem rates'); // Consider showing an error to the user or preventing the policy change return; } setCustomUnitID(transaction.transactionID, newCustomUnitID); setCustomUnitRateID(transaction.transactionID, undefined); clearSubrates(transaction.transactionID); }

abzokhattab · 2026-01-23T00:52:14Z

src/pages/iou/request/step/IOURequestStepReport.tsx

        );

+        // Clear subrates, and update customUnitID if policy changed for per diem transactions
+        if (policyChanged && isPerDiemTransaction) {


@nyomanjyotisa lets change it to

Suggested change

if (policyChanged && isPerDiemTransaction) {

if (policyChanged && isPerDiemTransaction) {

setCustomUnitID(transaction.transactionID, newCustomUnitID ?? CONST.CUSTOM_UNITS.FAKE_P2P_ID);

setCustomUnitRateID(transaction.transactionID, undefined);

clearSubrates(transaction.transactionID);

}

as getPerDiemCustomUnit(newPolicy) can return undefined when the policy hasn’t loaded yet (or per-diem units aren’t available), so we should still move the transaction off the old policy’s customUnitID. Using CONST.CUSTOM_UNITS.FAKE_P2P_ID as a placeholder matches existing per-diem flows (e.g. IOURequestStepPerDiemWorkspace.tsx and IOURequestStepDestination.tsx ) and avoids leaving an invalid customUnitID + stale subrates/rate after a policy change.

Sure, I've updated the PR

… different workspace

abzokhattab · 2026-01-23T15:34:00Z

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 there are no new alerts related to the canBeMissing param for useOnyx
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 shown in the product is localized by adding it to src/languages/* files and using the translation method
- 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 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)
- 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 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)
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.ts or at the top of the file that uses the constant) are defined as such
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.
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.
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

Android: HybridApp

Screen.Recording.2026-01-23.at.01.29.48.mov

Android: mWeb Chrome

Screen.Recording.2026-01-23.at.01.30.50.mov

iOS: HybridApp

Screen.Recording.2026-01-23.at.01.28.41.mov

iOS: mWeb Safari

Screen.Recording.2026-01-23.at.01.37.04.mov

MacOS: Chrome / Safari

Screen.Recording.2026-01-23.at.01.26.09.mov

abzokhattab

LGTM

OSBotify · 2026-01-23T19:46:18Z

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

OSBotify · 2026-01-23T22:34:52Z

🚀 Deployed to staging by https://github.com/tylerkaraszewski in version: 9.3.8-0 🚀

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

nlemma · 2026-01-24T09:19:17Z

@nyomanjyotisa this PR is failing with #80415

nyomanjyotisa · 2026-01-24T13:48:55Z

@nlemma In this PR, when selectedPolicyID is set to a workspace policy, useOutstandingReports only returns reports from that workspace, so reports from workspace B are not included

App/src/pages/iou/request/step/IOURequestEditReportCommon.tsx

Line 110 in f251b86

    
           const outstandingReports = useOutstandingReports(selectedReportID, selectedPolicyID, resolvedReportOwnerAccountID, isEditing);

Is this expected when both workspace enabled per diem feature? cc @aimane-chnaif @bernhardoj

abzokhattab · 2026-01-24T13:58:52Z

@nlemma the current PR has not been deployed to production yet.

so its not caused by the current change

aimane-chnaif · 2026-01-24T20:29:27Z

yes it's expected

Fix: Error when creating per diem expense after selecting report from…

7ceafd9

… different workspace

melvin-bot bot assigned nyomanjyotisa Jan 20, 2026

Merge branch 'main' into issue-78985

e4cf9cc

nyomanjyotisa marked this pull request as ready for review January 20, 2026 14:31

nyomanjyotisa requested review from a team as code owners January 20, 2026 14:31

melvin-bot bot requested review from abzokhattab and heyjennahay and removed request for a team January 20, 2026 14:31

github-actions bot reviewed Jan 20, 2026

View reviewed changes

abzokhattab reviewed Jan 23, 2026

View reviewed changes

nyomanjyotisa added 2 commits January 23, 2026 22:49

Fix: Error when creating per diem expense after selecting report from…

ffa48bc

… different workspace

Merge branch 'main' into issue-78985

93a9a93

abzokhattab approved these changes Jan 23, 2026

View reviewed changes

melvin-bot bot requested a review from tylerkaraszewski January 23, 2026 15:34

tylerkaraszewski approved these changes Jan 23, 2026

View reviewed changes

tylerkaraszewski merged commit 31bd051 into Expensify:main Jan 23, 2026
29 of 30 checks passed

OSBotify mentioned this pull request Jan 23, 2026

Deploy Checklist: New Expensify 2026-01-23 #80389

Open

39 tasks

mitarachim mentioned this pull request Jan 24, 2026

[$250] Per diem-Destination field on confirm page is blank when at least two workspaces have per diem #80406

Open

7 tasks

nlemma mentioned this pull request Jan 24, 2026

Report from the other workspace doesn't appear in the report field #80415

Open

7 tasks

-        if (policyChanged && isPerDiemTransaction) {
+        if (policyChanged && isPerDiemTransaction) {
+            setCustomUnitID(transaction.transactionID, newCustomUnitID ?? CONST.CUSTOM_UNITS.FAKE_P2P_ID);
+            setCustomUnitRateID(transaction.transactionID, undefined);
+            clearSubrates(transaction.transactionID);
+        }

Fix: Error when creating per diem expense after selecting report from different workspace #79939

Fix: Error when creating per diem expense after selecting report from different workspace #79939

Uh oh!

Conversation

nyomanjyotisa commented Jan 20, 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!

codecov bot commented Jan 20, 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!

melvin-bot bot commented Jan 20, 2026

Uh oh!

github-actions bot Jan 20, 2026

Choose a reason for hiding this comment

❌ CONSISTENCY-5 (docs)

Uh oh!

abzokhattab Jan 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nyomanjyotisa Jan 23, 2026

Choose a reason for hiding this comment

Uh oh!

abzokhattab commented Jan 23, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

abzokhattab left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jan 23, 2026

Uh oh!

OSBotify commented Jan 23, 2026

Uh oh!

nlemma commented Jan 24, 2026

Uh oh!

nyomanjyotisa commented Jan 24, 2026

Uh oh!

abzokhattab commented Jan 24, 2026

Uh oh!

aimane-chnaif commented Jan 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

nyomanjyotisa commented Jan 20, 2026 •

edited

Loading

codecov bot commented Jan 20, 2026 •

edited by github-actions bot

Loading

abzokhattab Jan 23, 2026 •

edited

Loading