Skip to content

Fix bulk expense reimbursable and billable field visibility - #106894

Merged
mountiny merged 1 commit into
mainfrom
claude-bulkExpensePolicyToggles
Nov 14, 2026
Merged

mountiny merged 1 commit into
mainfrom
claude-bulkExpensePolicyToggles

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Nov 13, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Use the same policy helpers as individual expense editing so bulk Reimbursable and Billable rows do not disappear when workspace lock flags are omitted. Locked cash expenses that remain correctable individually also remain eligible in bulk.

Preserve the existing company-card force restrictions, Do Not Force behavior, unreported-expense handling, report exclusions, permission checks, and all-selected-expenses eligibility. Reported cash expenses still require a resolved policy.

Add nine UI regression cases covering missing flags, locked matching and differing values, mixed selections, reimbursable defaults in both directions, omitted values, and missing policies. Existing card regression tests are unchanged.

AI Tests

  • Passed: four focused Jest suites, 942 tests, including all 25 bulk-edit UI tests.
  • Passed: full lint (second attempt), changed-file lint, TypeScript, spelling, Storybook smoke tests, direct React Compiler check, and the commit hook's Oxfmt check on both changed files.
  • Staged code review returned no violations.
  • Incomplete: full Jest runs exceeded 300-second and 600-second limits without reporting failing tests. A complete suite pass is not claimed.
  • Changed-file React Compiler mode could not resolve its empty base-branch reference; the direct component check passed instead.
  • The matrix's Prettier command is unavailable in this revision; Oxfmt ran successfully in the commit hook.
  • Interactive web verification was blocked by an unavailable browser session. No manual product verdict or screenshot is claimed.
Contributor branch access

This draft uses an upstream branch because Melvin cannot push to the requester's fork. To copy it to your fork:

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

You can then close this draft and open a PR from your fork if preferred.

Fixed Issues

$ #106741
PROPOSAL: #106741 (comment)

Tests

Web, wide layout

Setup: A Collect workspace with two cash expenses on one open report. Both expenses should be reimbursable and not billable.

  1. Go to Workspace > Rules > Cash expense default and select "Always non-reimbursable".
  2. Open one expense and verify that the Reimbursable toggle is shown.
  3. Go back to the report, select both expenses, and click Edit multiple. Verify that the Reimbursable row is shown.
  4. Turn off Reimbursable for each expense individually. Select both expenses and click Edit multiple. Verify that the Reimbursable row is hidden.
  5. Turn Reimbursable back on for only one expense. Select both expenses and click Edit multiple. Verify that the Reimbursable row is hidden.
  6. Change the Cash expense default to "Reimbursable by default". Select both expenses and click Edit multiple. Verify that the Reimbursable row is shown.
  7. Go to Workspace > Rules and turn on billable tracking. Select both expenses and click Edit multiple. Verify that the Billable row is shown. Turn off billable tracking and verify that the Billable row is hidden.
  8. Verify that no errors appear in the JS console.

Offline tests

Repeat the same steps, but turn off the network after step 1.

QA Steps

Same as the Tests section.

PR Author Checklist

Checklist review: the conditional copy, new-pattern, assets, Markdown, and Storybook items are checked as not applicable to this diff. The testing steps above are documented instructions, not a claim that manual testing passed; execution-dependent and otherwise unverified items remain unchecked.

  • 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 verified any copy / text that was added to the app 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 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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

Co-authored-by: Krishna <Krishna2323@users.noreply.github.com>
@MelvinBot
MelvinBot requested a review from a team November 13, 2026 19:08
@melvin-bot melvin-bot Bot added Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web labels Nov 13, 2026
@MelvinBot

MelvinBot commented Nov 13, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Android test steps verification results: ⚠️ partial

Inspection completed on standalone Android NewDot. Reports showed “No reports yet”; the required regression fixtures were unavailable, and available setup tools could not create them.

Reports empty state showing the required report fixture is unavailable

Step Status
1. Open an Outstanding cash-expense report with violationsReports displayed “No reports yet”.
Reports empty state showing the required report fixture is unavailable
⚠️
2. Select multiple expenses with violationsRequired report and expense fixtures unavailable.
⚠️
3. Choose Edit multipleNo expenses available for the required selection.
⚠️
4. Compare Reimbursable availability in individual and bulk editingCorrectable violation fixtures unavailable.
⚠️
5. Missing workspace lock flags show Reimbursable and BillableRequired workspace and expense configuration unavailable.
⚠️
6. Differing expense values under locked defaults show eligible rowsLocked-default mismatch fixtures unavailable.
⚠️
7. Expenses matching locked defaults hide respective rowsLocked-default matching fixtures unavailable.
⚠️
8. Mixed eligible/ineligible selections hide respective rowsMixed-eligibility expense fixtures unavailable.
⚠️
9. Company-card force restrictions and Do Not Force remain unchangedCompany-card and force-setting fixtures unavailable.
⚠️
10. No JavaScript console errorsLog read-back was unavailable; absence of errors could not be verified.
⚠️

view run · view recording

@MelvinBot

MelvinBot commented Nov 13, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Web test steps verification results: ⚠️ partial

Blocked on dev NewDot web: the account shows “No expenses yet” and “No reports yet.” No fixture-creation tool is available, so the requested regression cases could not be exercised.

Reports view showing No reports yet

Step Status
1. Open an Outstanding cash-expense report with violations.Reports shows “No reports yet.” No qualifying report is available.
Reports view showing No reports yet
⚠️
2. Select multiple expenses with violations.Expenses shows “No expenses yet.”
⚠️
3. Choose Edit multiple.No expenses are available for multi-selection.
⚠️
4. Verify Reimbursable appears when individually correctable; compare individual editing.Required expense fixtures unavailable.
⚠️
5. Missing workspace lock flags show Reimbursable and Billable.Required workspace and expense configuration unavailable.
⚠️
6. Locked defaults with differing expense values show eligible rows.Locked-default mismatch fixtures unavailable.
⚠️
7. Expenses matching locked defaults hide respective rows.Matching-default expense fixtures unavailable.
⚠️
8. Mixed eligible/ineligible selections hide respective rows.Mixed-selection fixtures unavailable.
⚠️
9. Company-card force restrictions and Do Not Force behavior remain unchanged.Company-card expenses and force-setting fixtures unavailable.
⚠️
10. No JS console errors.Browser console read-back was unavailable; absence of errors could not be verified.
⚠️

view run · no recording available

@Krishna2323 Krishna2323 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.

@MelvinBot please update the PR description:

Tests (web, wide layout)

Setup: A Collect workspace with two cash expenses on one open report. Both expenses should be reimbursable and not billable.

  1. Go to Workspace > Rules > Cash expense default and select "Always non-reimbursable".
  2. Open one expense and verify that the Reimbursable toggle is shown.
  3. Go back to the report, select both expenses, and click Edit multiple. Verify that the Reimbursable row is shown.
  4. Turn off Reimbursable for each expense individually. Select both expenses and click Edit multiple. Verify that the Reimbursable row is hidden.
  5. Turn Reimbursable back on for only one expense. Select both expenses and click Edit multiple. Verify that the Reimbursable row is hidden.
  6. Change the Cash expense default to "Reimbursable by default". Select both expenses and click Edit multiple. Verify that the Reimbursable row is shown.
  7. Go to Workspace > Rules and turn on billable tracking. Select both expenses and click Edit multiple. Verify that the Billable row is shown. Turn off billable tracking and verify that the Billable row is hidden.
  8. Verify that no errors appear in the JS console.

Offline tests: Repeat the same steps, but turn off the network after step 1.

QA Steps: Same as the Tests section.

Then, review the PR Author Checklist and check only the items you can verify from the diff:

  • Linked issue
  • Tests, Offline tests, and QA steps
  • Unit tests added
  • No new copy, pattern, assets, Markdown, or Storybook impact

Leave any items unchecked if you can't verify them.

Once everything is updated, mark the PR as ready for review.

@MelvinBot
MelvinBot marked this pull request as ready for review November 13, 2026 23:13
@MelvinBot
MelvinBot requested a review from a team as a code owner November 13, 2026 23:13
@melvin-bot
melvin-bot Bot requested review from Krishna2323 and removed request for a team November 13, 2026 23:13
@melvin-bot

melvin-bot Bot commented Nov 13, 2026

Copy link
Copy Markdown

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

Updated the PR description with your exact Tests, Offline tests, and QA steps. Checked only diff-verifiable checklist items, leaving unverified testing items unchecked.

Confirmed the PR is now ready for review.


view run

@melvin-bot
melvin-bot Bot requested review from twisterdotcom and removed request for a team November 13, 2026 23:13
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 13, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-13T23:16:31.088246Z 45b75ac Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@Krishna2323

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 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 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 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.
  • 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_hybrid.mp4
Android: mWeb Chrome
android_mWeb.mp4
iOS: HybridApp
ios_hybrid.mp4
iOS: mWeb Safari
ios_mWeb.mp4
MacOS: Chrome / Safari
web_chrome.mp4

@Krishna2323 Krishna2323 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 requested a review from lakchote November 13, 2026 23:41

@mountiny mountiny 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.

Thank you! gonna move this ahead

@mountiny
mountiny merged commit 4b4146f into main Nov 14, 2026
55 of 59 checks passed
@mountiny
mountiny deleted the claude-bulkExpensePolicyToggles branch November 14, 2026 00:58
@github-actions

Copy link
Copy Markdown
Contributor

🚧 mountiny 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.

@github-actions

Copy link
Copy Markdown
Contributor

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.5.40-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site update needed — this PR fixes bulk expense editing to follow existing editing rules, without adding a new workflow or making existing help guidance incorrect.


view run

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants