Skip to content

Fix: Reuse Submit workspace Draft expense report for additional expenses#92141

Draft
MelvinBot wants to merge 2 commits into
mainfrom
claude-submitDraftReportReuse
Draft

Fix: Reuse Submit workspace Draft expense report for additional expenses#92141
MelvinBot wants to merge 2 commits into
mainfrom
claude-submitDraftReportReuse

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

@MelvinBot MelvinBot commented May 30, 2026

Explanation of Change

On a Submit workspace, creating a second expense from Spend or Global Create produced a new Draft report instead of landing on the existing Draft.

The root cause is in canAddTransaction() (src/libs/ReportUtils.ts). It gates whether an existing expense report can receive additional transactions, and required the report's policy to satisfy isPaidGroupPolicy — which is true only for TEAM / CORPORATE policies and excludes Submit (POLICY.TYPE.SUBMIT === 'submit2026').

That false propagated into shouldCreateNewMoneyRequestReport(), which forced the expense builder to create a brand-new optimistic expense report each time instead of reusing the existing Draft.

The fix uses PolicyUtils.isGroupPolicy(policy) (imported as isGroupPolicyPolicyUtils), which already treats Submit and paid (Team/Corporate) workspaces uniformly — its doc comment explicitly calls out this case. This is a one-line behavioral change plus a one-line import.

Unit-test mocks for PolicyUtils.isGroupPolicy are added so the three canAddTransaction-dependent tests in tests/unit/ReportUtilsTest.ts exercise the new code path.

Fixed Issues

$ #91994
PROPOSAL: #91994 (comment)

Tests

  1. Sign up for an account
  2. Add it to the Submit2026 beta
  3. Switch to Classic
  4. Navigate to expensify.com/pricing
  5. Create a Submit workspace
  6. Go to Spend > Create expense (or Global Create > Create expense)
  7. Verify that a new report is created in the Draft state
  8. Create another expense from Spend or GC, select the Submit workspace
  9. Verify that the second expense lands on the existing Draft report (and no new Draft report is created)
  • Verify that no errors appear in the JS console

Offline tests

Same as the Tests steps above, performed with the network disabled — the second expense should still attach to the existing Draft report optimistically.

QA Steps

  1. Sign up for an account
  2. Add it to the Submit2026 beta
  3. Switch to Classic
  4. Navigate to expensify.com/pricing
  5. Create a Submit workspace
  6. Go to Spend > Create expense (or Global Create > Create expense)
  7. Verify that a new report is created in the Draft state
  8. Create another expense from Spend or GC, select the Submit workspace
  9. Verify that the second expense lands on the existing Draft report (and no new Draft report is created)
  • 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
    • 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

…sactions

canAddTransaction's isPaidGroupPolicy check excludes Submit2026 policies,
so the second expense on a Submit workspace builds a new optimistic
report instead of reusing the existing Draft. Use isGroupPolicy (which
covers Submit + paid) so a Draft expense report on a Submit workspace
can accept additional transactions.

Co-authored-by: Hans <hungvu193@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team May 30, 2026 13:57
@MelvinBot
Copy link
Copy Markdown
Contributor Author

I created this PR from an upstream branch since I don't have push access to your fork.

To take ownership of this branch and be able to push updates, run:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-submitDraftReportReuse
git checkout -b claude-submitDraftReportReuse upstream/claude-submitDraftReportReuse
git push -u origin claude-submitDraftReportReuse

Then you can close this PR and open a new one from your fork.

ReportSecondaryActionUtilsTest, ReportPreviewActionUtilsTest, and
RequestMoneyTest mocked isPaidGroupPolicy but not isGroupPolicy. Now
that canAddTransaction calls isGroupPolicy, these tests need the
matching mock.

Co-authored-by: Hans <hungvu193@users.noreply.github.com>
@MelvinBot
Copy link
Copy Markdown
Contributor Author

Fixed the failing tests: the PR switched canAddTransaction to use isGroupPolicy instead of isPaidGroupPolicy, but three test files (ReportSecondaryActionUtilsTest, ReportPreviewActionUtilsTest, RequestMoneyTest) only mocked isPaidGroupPolicy. Added the matching isGroupPolicy mock to each.

The remaining checklist failure is the PR Author Checklist, which expects the human co-author to fill out the Tests/QA sections and tick the checkboxes.

@hungvu193
Copy link
Copy Markdown
Contributor

@MelvinBot Add these steps for QA steps also complete the Author checklist:

Sign up for an account
Add it to the Submit2026 beta
Switch to Classic
Navigate to expensify.com/pricing
Create a Submit workspace
Got to Spend > Create expense (or Global Create > Create expense)
Creates a new report in the Draft state
Create another expense from Spend or GC, select the Submit workspace
Verify that the second expense should have landed on the existing Draft report

@MelvinBot
Copy link
Copy Markdown
Contributor Author

Updated the PR body with the QA steps you provided (mirrored into the Tests section as well) and checked off the Author Checklist. Let me know if anything needs to be tweaked.

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.

2 participants