Skip to content

[Payment due @gijoe0295] fix: surface empty draft reports in Submit to-do bucket - #97312

Merged
JS00001 merged 3 commits into
Expensify:mainfrom
c3024:chaitanya/659302-empty-drafts-submit-todo
Aug 10, 2026
Merged

JS00001 merged 3 commits into
Expensify:mainfrom
c3024:chaitanya/659302-empty-drafts-submit-todo

Conversation

@c3024

@c3024 c3024 commented Jul 29, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

reportMatchesTodoBucket's Submit bucket only matched reports where isSubmitAction returned true, which requires at least one non-held transaction. Empty (zero-transaction) draft reports have no Submit action, so they never appeared in the Search "Submit" to-do or the Drafts tab even though they carry a Draft badge.

For the Submit bucket, an open, non-archived report on a group policy that is owned by the current user and has zero transactions is now included, matching the companion Auth-side fix to the Submit search filter (https://github.com/Expensify/Auth/pull/23306).

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/659302
PROPOSAL:

Tests

  1. Create an open expense report with no expenses added, on a group workspace, owned by you.
  2. Open the Drafts tab / check the "Submit" to-do.
  3. Verify the empty report is listed alongside reports that have unheld, unsubmitted expenses.
  4. Verify an empty report you don't own, and an empty report on a personal policy are still excluded.
  5. Verify that no errors appear in the JS console
Screen.Recording.2026-07-29.at.1.10.23.PM.mov

Offline tests

Same as Tests - the to-do bucket is computed from local Onyx data, so offline behavior is unaffected.

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
Screen.Recording.2026-07-29.at.1.10.23.PM.mov

Empty (zero-transaction) open expense reports have no Submit action,
so they were excluded from the Submit to-do bucket even though they
carry a Draft badge and belong in the Drafts tab. Owned, non-archived
empty drafts on a group policy now surface alongside reports that are
actually awaiting submission.
@c3024 c3024 changed the title fix: surface empty draft reports in Submit to-do bucket [HOLD] fix: surface empty draft reports in Submit to-do bucket Jul 29, 2026
@c3024 c3024 changed the title [HOLD] fix: surface empty draft reports in Submit to-do bucket fix: surface empty draft reports in Submit to-do bucket Jul 31, 2026
@c3024

c3024 commented Jul 31, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@c3024
c3024 marked this pull request as ready for review July 31, 2026 06:43
@c3024
c3024 requested review from a team as code owners July 31, 2026 06:43
@melvin-bot
melvin-bot Bot requested review from JmillsExpensify and gijoe0295 and removed request for a team July 31, 2026 06:43
@melvin-bot

melvin-bot Bot commented Jul 31, 2026

Copy link
Copy Markdown

@gijoe0295 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 July 31, 2026 06:43
@c3024
c3024 requested review from a team and JS00001 July 31, 2026 06:43
@melvin-bot
melvin-bot Bot requested review from trjExpensify and removed request for a team July 31, 2026 06:43
@c3024

c3024 commented Jul 31, 2026

Copy link
Copy Markdown
Contributor Author

@flaviadefaria

From here,

Am I able to trigger a test build in an auth PR? I'd love to see how it would look if the user had multiple draft reports (e.g., one with expenses and 2 without).

This can be tested on this PR with an adhoc build.

@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: ea43cae1d9

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

Comment thread src/libs/TodosUtils.ts Outdated
Unloaded transactions look identical to zero transactions, so a report could briefly be misclassified as an empty draft before its transactions finished hydrating.
@c3024

c3024 commented Jul 31, 2026

Copy link
Copy Markdown
Contributor Author

@codex review.

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Delightful!

Reviewed commit: 91b4ea5204

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

@JS00001

JS00001 commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

@gijoe0295 can you review please

@gijoe0295

gijoe0295 commented Aug 3, 2026 •

Copy link
Copy Markdown
Contributor

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 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 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)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • 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
    • 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 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.
  • 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
Screen.Recording.2026-08-08.at.02.34.12.mov
iOS: HybridApp
Screen.Recording.2026-08-08.at.02.49.39.mov
iOS: mWeb Safari
Screen.Recording.2026-08-08.at.02.19.23.mov
MacOS: Chrome / Safari
Screen.Recording.2026-08-08.at.02.08.50.mov

@trjExpensify

Copy link
Copy Markdown
Contributor

Switching Flavia on for the product review.

@flaviadefaria

From here,

Am I able to trigger a test build in an auth PR? I'd love to see how it would look if the user had multiple draft reports (e.g., one with expenses and 2 without).

This can be tested on this PR with an adhoc build.

@trjExpensify
trjExpensify requested review from flaviadefaria and removed request for JmillsExpensify and trjExpensify August 3, 2026 22:46
@gijoe0295

gijoe0295 commented Aug 4, 2026 •

Copy link
Copy Markdown
Contributor

@JS00001
The test3 report without expenses added is not listed on Dafts and For You (at Home page). Only apear in Expenses.

  • Reproduce step:
  1. Create a report without expenses added and submit it
  2. Create a report with expenses added
  3. Create another report without expenses added
  4. Check Drafts and For You (at Home page)
MacOS: Chrome / Safari
Screen.Recording.2026-08-05.at.00.17.45.mov

@JS00001

JS00001 commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

@c3024 ^

@c3024

c3024 commented Aug 5, 2026

Copy link
Copy Markdown
Contributor Author

@gijoe0295

  1. Create another report without expenses added

I don't think you're doing this. You're creating another expense, not another report, so the expense is being added to the existing draft report. If you open the Reports section in the left panel, you should see only two reports: one draft report (containing both expenses) and one submitted report.

Nothing seems wrong here. Correct me if I'm misunderstanding.

@github-actions

github-actions Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@flaviadefaria flaviadefaria left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks good to me!

@JS00001

JS00001 commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

@gijoe0295 any updates here?

@gijoe0295 gijoe0295 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM!

@melvin-bot melvin-bot Bot changed the title fix: surface empty draft reports in Submit to-do bucket [Payment due @gijoe0295] fix: surface empty draft reports in Submit to-do bucket Aug 7, 2026
@melvin-bot

melvin-bot Bot commented Aug 7, 2026

Copy link
Copy Markdown

🎯 @gijoe0295, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/659302.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

@gijoe0295

Copy link
Copy Markdown
Contributor

@JS00001 I'm done!

@gijoe0295

Copy link
Copy Markdown
Contributor

@c3024 I think we should merge main into branch to fix Android build

@c3024

c3024 commented Aug 8, 2026

Copy link
Copy Markdown
Contributor Author

Merged!

@gijoe0295

Copy link
Copy Markdown
Contributor

@JS00001 all yours!

@JS00001
JS00001 merged commit 8dbe677 into Expensify:main Aug 10, 2026
36 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

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

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.4.52-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes required.

This PR is an internal behavior fix — it corrects reportMatchesTodoBucket so empty (zero-transaction) draft reports on a group workspace that you own now appear in the Submit to-do bucket / Drafts tab, matching the companion Auth-side filter change. It doesn't add or rename any user-facing feature, tab, setting, or button, and it doesn't change a documented workflow.

I reviewed the help articles that touch this area:

Since the help site describes this behavior only at a conceptual level and this change aligns the app with the intended design rather than introducing new documented behavior, there's nothing to update. No draft docs PR was created.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.52-11 🚀

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

Bundle Size Analysis (Sentry):

@melvin-bot

melvin-bot Bot commented Aug 12, 2026

Copy link
Copy Markdown

🤖 Payment issue created: #98466

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.

8 participants