Skip to content

Fix receipt empty state not showing for time expense from FAB#85315

Merged
cristipaval merged 7 commits intomainfrom
claude-fixTimeExpenseReceiptFromFAB
Mar 17, 2026
Merged

Fix receipt empty state not showing for time expense from FAB#85315
cristipaval merged 7 commits intomainfrom
claude-fixTimeExpenseReceiptFromFAB

Conversation

@MelvinBot
Copy link
Contributor

Explanation of Change

When creating a time expense from the FAB (+ > Create expense > Time), IOURequestStepHours passes the raw iouType (create) through to the confirmation page. However, shouldShowReceiptEmptyState in IOUUtils.ts only returns true for submit, track, or pay types — not create. This causes the receipt empty state to be hidden on the confirmation page.

This PR resolves the CREATE iouType to SUBMIT before navigating to the confirmation page in IOURequestStepHours.saveTime(), matching the established pattern used by IOURequestStepAmount (which already converts CREATE to either SUBMIT or TRACK before navigating).

Since time expenses always require a workspace (time tracking is a workspace feature), SUBMIT is the correct resolved type.

Fixed Issues

$ #81143
PROPOSAL: #81143 (comment)

Tests

  1. Log in with an account that has a workspace with time tracking enabled
  2. From any screen, tap the FAB (+) > Create expense > Time
  3. Enter a time amount (e.g., 1.5 hours) and tap Next
  4. Verify the confirmation page shows the "add receipt" modal/empty state
  5. Verify that creating the time expense from a workspace chat still shows the receipt empty state as before
  6. Verify that no errors appear in the JS console
  • Verify that no errors appear in the JS console

Offline tests

N/A — This change only affects navigation routing to the confirmation page and does not involve network requests.

QA Steps

  1. Log in with an account that has a workspace with time tracking enabled
  2. From any screen, tap the FAB (+) > Create expense > Time
  3. Enter a time amount and tap Next
  4. Verify the confirmation page shows the "add receipt" empty state
  5. Also verify creating a time expense from a workspace chat still shows the receipt empty state
  • 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 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 used JaimeGPT to get English > Spanish translation. I then posted it 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 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 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.ts 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(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.
  • 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

When creating a time expense from the FAB, the iouType is CREATE.
IOURequestStepHours was passing this raw CREATE type to the
confirmation page, where shouldShowReceiptEmptyState only handles
SUBMIT, TRACK, and PAY types. This caused the receipt empty state
to not appear.

Resolve CREATE to SUBMIT before navigating to confirmation, matching
the established pattern in IOURequestStepAmount.

Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>
Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>
@MelvinBot
Copy link
Contributor Author

Fixed the failing Prettier check: wrapped a long Navigation.navigate() call in IOURequestStepHours.tsx to satisfy prettier formatting rules.

@codecov
Copy link

codecov bot commented Mar 15, 2026

Codecov Report

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

Files with missing lines Coverage Δ
src/libs/IOUUtils.ts 73.15% <100.00%> (+0.57%) ⬆️
src/pages/iou/request/step/IOURequestStepHours.tsx 85.29% <0.00%> (ø)
... and 56 files with indirect coverage changes

@aimane-chnaif
Copy link
Contributor

@MelvinBot mark as ready for review

@MelvinBot MelvinBot marked this pull request as ready for review March 16, 2026 12:38
@MelvinBot MelvinBot requested a review from a team as a code owner March 16, 2026 12:38
@MelvinBot
Copy link
Contributor Author

PR has been marked as ready for review.

@melvin-bot melvin-bot bot requested review from a team, JmillsExpensify and aimane-chnaif and removed request for a team and aimane-chnaif March 16, 2026 12:38
@melvin-bot
Copy link

melvin-bot bot commented Mar 16, 2026

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

@melvin-bot melvin-bot bot requested a review from aimane-chnaif March 16, 2026 12:38
@melvin-bot
Copy link

melvin-bot bot commented Mar 16, 2026

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

@melvin-bot melvin-bot bot removed the request for review from a team March 16, 2026 12:38
@aimane-chnaif
Copy link
Contributor

@MelvinBot add unit test as per #85315 (comment)

@aimane-chnaif
Copy link
Contributor

aimane-chnaif commented Mar 16, 2026

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
    • MacOS: Desktop
  • 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
Android: mWeb Chrome
iOS: HybridApp
ios.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
web.mov


return Navigation.setNavigationActionToMicrotaskQueue(() =>
Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, policyExpenseChat.reportID)),
Navigation.navigate(
Copy link
Contributor

Choose a reason for hiding this comment

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

❌ CONSISTENCY-3 (docs)

The inline expression iouType === CONST.IOU.TYPE.CREATE ? CONST.IOU.TYPE.SUBMIT : iouType duplicates iouType resolution logic that already exists in navigateToConfirmationPage in src/libs/IOUUtils.ts. That utility already handles mapping raw iouType values (like REQUEST -> SUBMIT, SEND -> PAY) when navigating to the confirmation page. Instead of adding another inline resolution here (and in a second place at line 130), consider either:

  1. Using navigateToConfirmationPage directly (it already handles the CREATE -> SUBMIT mapping via its shouldNavigateToSubmit parameter in the default branch), or
  2. Extending navigateToConfirmationPage to handle the CREATE type explicitly in its switch statement, so all iouType resolution for confirmation navigation is centralized.

Note that IOURequestStepParticipants.tsx (line 353) has a similar but broader pattern that also maps TRACK -> SUBMIT: iouType === CONST.IOU.TYPE.CREATE || iouType === CONST.IOU.TYPE.TRACK ? CONST.IOU.TYPE.SUBMIT : iouType. Centralizing this logic would prevent these scattered inline mappings from diverging.


Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

Copy link
Contributor

Choose a reason for hiding this comment

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

@MelvinBot let's address this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Addressed this by adding a CREATE case to the navigateToConfirmationPage switch in IOUUtils.ts, then updating IOURequestStepHours to use navigateToConfirmationPage instead of inline iouType resolution. This centralizes the CREATESUBMIT mapping alongside the existing REQUESTSUBMIT and SENDPAY mappings.

Also updated the relevant unit tests in IOUUtilsTest.ts (updated existing test + added new test for reportIDParam handling) and adjusted IOURequestStepHoursTest.tsx accordingly.

…tepHours

Adds tests to cover the iouType conversion logic that resolves CREATE to
SUBMIT when navigating to the confirmation page, addressing the Codecov
coverage decrease.

Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team as a code owner March 16, 2026 12:46
@MelvinBot
Copy link
Contributor Author

Added unit tests for the CREATESUBMIT iouType resolution to address the Codecov coverage decrease:

  • should resolve CREATE iouType to SUBMIT when navigating to confirmation — verifies that when iouType is CREATE, Navigation.navigate is called with SUBMIT instead
  • should keep SUBMIT iouType unchanged when navigating to confirmation — verifies that non-CREATE types pass through unchanged

All 10 tests pass (8 existing + 2 new).

@melvin-bot melvin-bot bot requested a review from cristipaval March 16, 2026 12:47
@melvin-bot
Copy link

melvin-bot bot commented Mar 16, 2026

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

@melvin-bot melvin-bot bot removed the request for review from a team March 16, 2026 12:47
Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>
@MelvinBot
Copy link
Contributor Author

Fixed the failing Prettier check: applied Prettier formatting to tests/ui/IOURequestStepHoursTest.tsx (collapsed two multi-line expect calls onto single lines per Prettier's formatting rules).

Narrow the iouType parameter type in renderComponent to match
the route param types for STEP_HOURS and STEP_HOURS_EDIT screens,
which exclude REQUEST and SEND iou types.

Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>
@MelvinBot
Copy link
Contributor Author

Fixed the failing TypeScript check: narrowed the iouType parameter type in the test's renderComponent function from IOUType to Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND>, matching the route param types defined for STEP_HOURS and STEP_HOURS_EDIT screens.

MelvinBot and others added 2 commits March 16, 2026 12:57
Address CONSISTENCY-3 review comment by adding a CREATE case to the
navigateToConfirmationPage switch in IOUUtils.ts, then using
navigateToConfirmationPage in IOURequestStepHours instead of inline
iouType resolution.

Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>
…FAB' into claude-fixTimeExpenseReceiptFromFAB

Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>
@MelvinBot
Copy link
Contributor Author

The failing typecheck has been fixed in commit b3ed415. The issue was a TypeScript type mismatch in tests/ui/IOURequestStepHoursTest.tsx — the iouType parameter in renderComponent was typed as IOUType (which includes send), but the route params for STEP_HOURS / STEP_HOURS_EDIT screens exclude request and send types.

The fix narrows the type to Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND>.

All checks are now passing: typecheck, tests (all 8 jobs), ESLint, Prettier, builds, storybook, spellcheck, and CLA.

@MelvinBot
Copy link
Contributor Author

Code Review

Overall: The fix correctly addresses the reported bug — time expenses created from the FAB now resolve CREATESUBMIT before reaching the confirmation page, so shouldShowReceiptEmptyState works as expected. The approach (adding an explicit CREATE case in navigateToConfirmationPage and delegating from IOURequestStepHours) follows established patterns. A few observations:

Code Changes

src/libs/IOUUtils.ts — new CREATE case

The new CREATE case always resolves to SUBMIT. This is safe for all current callers:

  • MoneyRequest.ts:538 previously passed shouldNavigateToSubmit = (iouType === CONST.IOU.TYPE.CREATE) which resolved CREATE → SUBMIT via the default case — same outcome.
  • IOURequestStepAmount handles CREATE → TRACK/SUBMIT resolution inline and doesn't route CREATE through navigateToConfirmationPage, so it's unaffected.

One thing to note: shouldNavigateToSubmit is now effectively dead code for the CREATE path, since CREATE has its own dedicated case that always produces SUBMIT. The expression iouType === CONST.IOU.TYPE.CREATE at MoneyRequest.ts:538 is now redundant (but harmless). This could be cleaned up in a follow-up.

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

The change from direct Navigation.navigate() to navigateToConfirmationPage() is clean and correct. Both call sites (the policyExpenseChat path and the fallthrough path) pass the right arguments.

Tests

The new unit tests (IOUUtilsTest.ts) and UI tests (IOURequestStepHoursTest.tsx) cover the core fix well:

  • CREATE → SUBMIT resolution ✓
  • SUBMIT passthrough (regression guard) ✓
  • reportIDParam precedence when iouType is CREATE ✓

Minor gap: The old test for shouldNavigateToSubmit=true in the default case was replaced with the new CREATE-specific test. There's no longer a test verifying shouldNavigateToSubmit=true works in the default case for a non-CREATE iouType. This is low-risk since the only caller using shouldNavigateToSubmit=true with non-CREATE types is MoneyRequest.ts:360 (test transactions), but worth noting.

Verdict

The changes are correct and well-scoped. No blockers.

@chatgpt-codex-connector
Copy link

Codex Review: Something went wrong. Try again later by commenting “@codex review”.

We were unable to download your code in a timely manner.
ℹ️ 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".

@cristipaval cristipaval merged commit 7ba80d9 into main Mar 17, 2026
37 checks passed
@cristipaval cristipaval deleted the claude-fixTimeExpenseReceiptFromFAB branch March 17, 2026 10:12
@github-actions
Copy link
Contributor

🚧 @cristipaval has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.3.39-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.39-3 🚀

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

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.

4 participants