Fix per diem date/time fields empty when newManualExpenseFlow beta enabled by MelvinBot · Pull Request #91922 · Expensify/App

MelvinBot · 2026-05-28T05:12:25Z

Explanation of Change

When the newManualExpenseFlow beta is enabled, MoneyRequestInitializer was being skipped for all expense flows (including Per Diem) because the guard used the global isNewManualExpenseFlowEnabled flag. However, the initializer only needs to be skipped when the confirmation screen is actually embedded on IOURequestStartPage (the Manual tab). This change uses the shouldHideHeader prop — which is true only when embedded — so that standalone flows like Per Diem still get proper initialization, fixing the empty date/time fields.

Fixed Issues

$ #90663
PROPOSAL: #90663 (comment)

Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review"
// Please describe what tests you performed that validates your changed worked.

Verify that no errors appear in the JS console

Offline tests

// TODO: The human co-author must fill out

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Precondition:
Run Onyx.merge('betas', ['newManualExpenseFlow']); in console.
Workspace has per diem rates.

Go to staging.new.expensify.com
Go to workspace chat.
Click + > Create expense.
If the initial tab is not Manual, go to Manual and close the RHP.
Click + > Create expense > Per diem.
Select a destination.
Click Start time.
Enter time and save it.
Verify that Date and time should be auto populated.

Verify that no errors appear in the JS console

PR Author Checklist

AI Tests

Test	Result
`npm run typecheck-tsgo`	Passed (pre-existing errors in unrelated files only)
`npm run lint-changed`	Passed
`npm run prettier`	Passed (no changes)
`npm test -- IOURequestStepConfirmation`	Passed (13/13 tests)

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

…abled Use shouldHideHeader prop instead of isNewManualExpenseFlowEnabled to guard MoneyRequestInitializer, so it only skips initialization when the confirmation screen is actually embedded (Manual tab), not for all flows (Per Diem, etc.) Co-authored-by: thelullabyy <thelullabyy@users.noreply.github.com>

thelullabyy · 2026-05-29T05:42:58Z

@MelvinBot The PR looks good. Please tick all the checkbox in PR desc and add this test to QA test part. Then open PR for review

Precondition:
Run Onyx.merge('betas', ['newManualExpenseFlow']); in console.
Workspace has per diem rates.

1. Go to staging.new.expensify.com
2. Go to workspace chat.
3. Click + > Create expense.
4. If the initial tab is not Manual, go to Manual and close the RHP.
5. Click + > Create expense > Per diem.
6. Select a destination.
7. Click Start time.
8. Enter time and save it.
9. Verify that Date and time should be auto populated.

MelvinBot · 2026-05-29T05:44:57Z

Done! Updated the PR description to tick all checkboxes and added your QA steps to the QA section.

thelullabyy · 2026-05-30T08:51:00Z

@MelvinBot your fix proposal does not touch the actual failure path. When you switch from the Manual tab to the Per diem tab, initMoneyRequest runs an Onyx.set that correctly creates the per-diem transaction with comment.customUnit.attributes.dates (today's start/end).

But the per-diem destination tab mounts at the same moment and its useEffect fires setCustomUnitID / setMoneyRequestCategory (Onyx.merge) while the draft is still the manual transaction. Those merges get queued against the stale "manual" value and, when Onyx flushes them, they clobber the per-diem Onyx.set — reverting iouRequestType back to manual and wiping the dates.

Below are additional fix in order to resolve the issue. Please apply

diff --git a/src/pages/iou/request/step/IOURequestStepDestination.tsx b/src/pages/iou/request/step/IOURequestStepDestination.tsx
index c4d768779a6..cc43302955d 100644
--- a/src/pages/iou/request/step/IOURequestStepDestination.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDestination.tsx
@@ -178,13 +178,24 @@ function IOURequestStepDestination({
         // When the rates are not available for the policy, the transaction does not have valid customUnitID and moneyRequestCategory
         // So, we set these in the transaction when the rates are fetched in fetchPerDiemRates
         const perDiemUnit = getPerDiemCustomUnit(policy);
-        if (!perDiemUnit || transaction?.comment?.customUnit?.customUnitID === perDiemUnit.customUnitID || !!transaction?.category) {
+        // Wait until the draft transaction has actually become a per diem request before writing per diem defaults.
+        // On the start page, switching tabs to per diem re-initializes the draft transaction via initMoneyRequest's
+        // Onyx.set. If this effect merges customUnitID/category while the draft is still the previous (e.g. manual)
+        // transaction, those merges are queued against the stale value and clobber the per diem Onyx.set, wiping
+        // comment.customUnit.attributes.dates (the start/end date-time). Gating on the per diem request type lets the
+        // effect re-run after the transaction settles so the merges land on top of the per diem draft instead.
+        if (
+            transaction?.iouRequestType !== CONST.IOU.REQUEST_TYPE.PER_DIEM ||
+            !perDiemUnit ||
+            transaction?.comment?.customUnit?.customUnitID === perDiemUnit.customUnitID ||
+            !!transaction?.category
+        ) {
             return;
         }
         setCustomUnitID(transactionID, perDiemUnit?.customUnitID ?? CONST.CUSTOM_UNITS.FAKE_P2P_ID);
         setMoneyRequestCategory(transactionID, perDiemUnit?.defaultCategory ?? '', undefined);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [transactionID, policy?.customUnits]);
+    }, [transactionID, policy?.customUnits, transaction?.iouRequestType]);
 
     const keyboardVerticalOffset = openedFromStartPage ? variables.contentHeaderHeight + top + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding : 0;

Prevents customUnitID/category merges from clobbering the per diem Onyx.set when switching tabs from Manual to Per diem on the start page. Co-authored-by: thelullabyy <thelullabyy@users.noreply.github.com>

MelvinBot · 2026-05-30T08:55:12Z

Applied the patch in 2d37129. The effect now gates on transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.PER_DIEM and includes it in the dependency array, so the setCustomUnitID/setMoneyRequestCategory merges only fire after the per diem Onyx.set from initMoneyRequest has settled.

AI Tests:

Test	Result
`npx prettier --write`	Passed (no changes needed)
`npm run lint-changed`	Passed (only a pre-existing seatbelt-allowed warning)
`npm run typecheck-tsgo`	Pre-existing errors in unrelated files (`MapView/utils.ts`, `useClearSelectedDomainMembersOnMoveComplete.ts`, `ConvertGpsPointsTo2DArray.ts`, `TryNewDotUtilsTest.ts`); no new errors from this change
`npm test -- IOURequestStepConfirmation`	Passed (13/13)

thelullabyy · 2026-05-30T08:58:58Z

@MelvinBot Mark this ready for review

codecov · 2026-05-30T09:00:43Z

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 Δ
...es/iou/request/step/IOURequestStepConfirmation.tsx	`65.61% <ø> (-0.52%)`	⬇️
...ges/iou/request/step/IOURequestStepDestination.tsx	`2.40% <0.00%> (-0.03%)`	⬇️
... and 252 files with indirect coverage changes

thelullabyy · 2026-05-30T09:03:30Z

@MelvinBot Open this PR for review

melvin-bot · 2026-05-30T09:05:09Z

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

thelullabyy · 2026-05-30T09:05:37Z

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 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-05-30.at.16.07.19.mov

Android: mWeb Chrome

Screen.Recording.2026-05-30.at.16.08.47.mov

iOS: HybridApp

Screen.Recording.2026-05-30.at.16.04.36.mov

iOS: mWeb Safari

ios-web.mov

MacOS: Chrome / Safari

web.mov

thelullabyy

LGTM

MelvinBot assigned thelullabyy May 28, 2026

MelvinBot requested a review from a team May 28, 2026 05:12

MelvinBot mentioned this pull request May 28, 2026

[$250] Per diem - Date and time field are empty, unable to select time #90663

Open

7 tasks

yusufdeveloper2903 mentioned this pull request May 29, 2026

[$250] Per Diem expense does not appear in Expenses or Reports after creation in New Expensify #92097

Open

7 tasks

Fix: Gate per diem defaults effect on transaction iouRequestType

2d37129

Prevents customUnitID/category merges from clobbering the per diem Onyx.set when switching tabs from Manual to Per diem on the start page. Co-authored-by: thelullabyy <thelullabyy@users.noreply.github.com>

MelvinBot marked this pull request as ready for review May 30, 2026 09:05

MelvinBot requested a review from a team as a code owner May 30, 2026 09:05

melvin-bot Bot requested review from JmillsExpensify and thelullabyy May 30, 2026 09:05

melvin-bot Bot removed request for a team May 30, 2026 09:05

thelullabyy approved these changes May 30, 2026

View reviewed changes

melvin-bot Bot requested a review from puneetlath May 30, 2026 09:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix per diem date/time fields empty when newManualExpenseFlow beta enabled#91922

Fix per diem date/time fields empty when newManualExpenseFlow beta enabled#91922
MelvinBot wants to merge 2 commits into
mainfrom
claude-fixPerDiemMoneyRequestInitializer

MelvinBot commented May 28, 2026 •

edited

Loading

Uh oh!

thelullabyy commented May 29, 2026 •

edited

Loading

Uh oh!

MelvinBot commented May 29, 2026

Uh oh!

thelullabyy commented May 30, 2026

Uh oh!

MelvinBot commented May 30, 2026

Uh oh!

thelullabyy commented May 30, 2026

Uh oh!

codecov Bot commented May 30, 2026 •

edited by github-actions Bot

Loading

Uh oh!

thelullabyy commented May 30, 2026

Uh oh!

melvin-bot Bot commented May 30, 2026

Uh oh!

thelullabyy commented May 30, 2026 •

edited

Loading

Uh oh!

thelullabyy left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

MelvinBot commented May 28, 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

AI Tests

Screenshots/Videos

Uh oh!

thelullabyy commented May 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MelvinBot commented May 29, 2026

Uh oh!

thelullabyy commented May 30, 2026

Uh oh!

MelvinBot commented May 30, 2026

Uh oh!

thelullabyy commented May 30, 2026

Uh oh!

codecov Bot commented May 30, 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!

thelullabyy commented May 30, 2026

Uh oh!

melvin-bot Bot commented May 30, 2026

Uh oh!

thelullabyy commented May 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

thelullabyy left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

MelvinBot commented May 28, 2026 •

edited

Loading

thelullabyy commented May 29, 2026 •

edited

Loading

codecov Bot commented May 30, 2026 •

edited by github-actions Bot

Loading

thelullabyy commented May 30, 2026 •

edited

Loading