Add billing restriction guard to duplicate expense handlers by MelvinBot · Pull Request #88363 · Expensify/App

MelvinBot · 2026-04-20T22:14:05Z

Explanation of Change

The duplicate expense flow never checks whether the target workspace has expired billing. When a user duplicates an expense, the target workspace is selected via useDefaultExpensePolicy → isPolicyAccessible, which only verifies the policy exists and the user has a role — it does not check billing/expiration status.

This adds the same shouldRestrictUserBillableActions guard that already exists in the Add Expense handler to all duplicate expense entry points:

useExpenseActions.ts: DUPLICATE_EXPENSE and DUPLICATE_REPORT handlers
MoneyRequestHeaderSecondaryActions.tsx: Transaction-level DUPLICATE handler
useSearchBulkActions.ts: Bulk DUPLICATE handler (both deleted-transactions and normal contexts)

When the target policy has restricted billable actions, the user is now navigated to ROUTES.RESTRICTED_ACTION instead of proceeding with the duplication — consistent with the existing Add Expense behavior.

Fixed Issues

$ #84368
PROPOSAL: #84368 (comment)

Tests

Preconditions:

User has an Expired Workspace and is a member of another Workspace

Open the Workspace user as a member
Click on an already existing expense
Click on the More button
Select Duplicate expense
Verify that you're prompted to add a payment card

Verify that no errors appear in the JS console

Offline tests

// TODO: The human co-author must fill out the offline tests before marking this PR as "ready for review"

QA Steps

Preconditions:

User has an Expired Workspace and is a member of another Workspace

Open the Workspace user as a member
Click on an already existing expense
Click on the More button
Select Duplicate expense
Verify that you're prompted to add a payment card

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

…lers The duplicate expense flow never checks whether the target workspace has expired billing. This allows users to bypass the billing restriction by duplicating expenses into expired workspaces. Add the same shouldRestrictUserBillableActions guard that exists in the Add Expense handler to all duplicate expense entry points: - useExpenseActions: DUPLICATE_EXPENSE and DUPLICATE_REPORT handlers - MoneyRequestHeaderSecondaryActions: transaction-level DUPLICATE handler - useSearchBulkActions: bulk DUPLICATE handler (both contexts) Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>

codecov · 2026-04-20T22:24:25Z

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 Δ
.../components/MoneyRequestHeaderSecondaryActions.tsx	`0.57% <0.00%> (-0.02%)`	⬇️
src/hooks/useExpenseActions.ts	`0.00% <0.00%> (ø)`
src/hooks/useSearchBulkActions.ts	`46.93% <12.50%> (-0.44%)`	⬇️
... and 11 files with indirect coverage changes

eVoloshchak · 2026-04-23T19:15:51Z

@MelvinBot, bug:
The context menu is not closed when ROUTES.RESTRICTED_ACTION page is opened, which results in them overlapping

Screen.Recording.2026-04-23.at.21.13.29.mov

eVoloshchak · 2026-04-26T18:31:49Z

@MelvinBot, fix the bug with the context not being closed when ROUTES.RESTRICTED_ACTION page is opened, which results in them overlapping

The duplicate action handlers have shouldCloseModalOnSelect set to false, so the dropdown menu stays open when the billing restriction guard triggers navigation to ROUTES.RESTRICTED_ACTION, causing them to overlap. Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>

MelvinBot · 2026-04-26T18:36:50Z

Fixed the context menu overlap bug. The duplicate action handlers have shouldCloseModalOnSelect: false, so the dropdown stays open when the billing restriction guard navigates to ROUTES.RESTRICTED_ACTION.

Added explicit menu close calls before navigation in all three affected handlers:

MoneyRequestHeaderSecondaryActions.tsx — dropdownMenuRef.current?.setIsMenuVisible(false)
useExpenseActions.ts DUPLICATE_EXPENSE — onDuplicateReset?.()
useExpenseActions.ts DUPLICATE_REPORT — onDuplicateReset?.()

The search bulk action handlers (useSearchBulkActions.ts) already have shouldCloseModalOnSelect: true so they aren't affected.

The call sites were passing a Policy object as a 5th argument, but the current main branch signature expects only 4 arguments (with policyID string as the first). Removed the redundant 5th argument from all call sites to match the expected function signature. Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>

MelvinBot · 2026-04-26T18:46:12Z

Fixed the failing typecheck: the shouldRestrictUserBillableActions call sites were passing a Policy object as a 5th argument, but the current main branch signature only accepts 4 arguments (policyID string, ownerBillingGracePeriodEnd, userBillingGracePeriodEnds, amountOwed). Removed the redundant 5th argument from all 6 call sites across the 3 changed files.

eVoloshchak · 2026-04-27T06:23:16Z

@MelvinBot, This branch has conflicts that must be resolved, pull the latest main

MelvinBot · 2026-04-27T06:53:45Z

⏱️ Ran out of time before I could finish. This usually means the task was too complex or I got stuck exploring. Please try again with a more specific request or post in #melvinbot-ai.

Run details

eVoloshchak · 2026-04-29T16:43:15Z

@MelvinBot, This branch has conflicts that must be resolved, pull the latest main

Resolve conflicts in useExpenseActions.ts and useSearchBulkActions.ts by adopting main's updated shouldRestrictUserBillableActions signature. Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>

MelvinBot · 2026-04-29T16:49:08Z

Merged latest main and resolved conflicts in useExpenseActions.ts and useSearchBulkActions.ts — adopted main's updated shouldRestrictUserBillableActions signature (now accepts policy object instead of just ID).

eVoloshchak · 2026-04-29T20:46:13Z

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-04-29.at.22.45.10.mov

Android: mWeb Chrome

Screen.Recording.2026-04-29.at.22.42.53.mov

iOS: HybridApp

Screen.Recording.2026-04-29.at.22.32.47.mov

iOS: mWeb Safari

Screen.Recording.2026-04-29.at.22.37.05.mov

MacOS: Chrome / Safari

Screen.Recording.2026-04-29.at.22.28.37.mov

eVoloshchak · 2026-04-29T20:50:34Z

Preconditions:

User has an Expired Workspace and is a member of another Workspace

Tests:

Open the Workspace user as a member
Click on an already existing expense
Click on the More button
Select Duplicate expense
Verify that you're prompted to add a payment card

@MelvinBot, add the above tests to the checklist

MelvinBot · 2026-04-29T20:52:12Z

Updated the Tests and QA Steps sections in the PR description with the provided test steps.

eVoloshchak · 2026-04-29T20:53:05Z

@MelvinBot, this is ready for review

MelvinBot · 2026-04-29T20:54:27Z

I wasn't able to mark this PR as ready for review due to a permissions issue. eVoloshchak, please mark it as ready for review manually from the GitHub UI.

melvin-bot · 2026-04-29T20:55:17Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #84368 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

eVoloshchak · 2026-04-29T20:56:00Z

@MelvinBot, how do I mark this as ready for review from console?

MelvinBot · 2026-04-29T20:57:18Z

Run gh pr ready 88363 from your terminal to mark it as ready for review.

arosiclair · 2026-05-01T14:59:22Z

@eVoloshchak conflicts

eVoloshchak · 2026-05-03T13:37:22Z

@MelvinBot, This branch has conflicts that must be resolved, pull the latest main

Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>

MelvinBot · 2026-05-03T13:45:29Z

Merged latest main and resolved the conflict in src/hooks/useSearchBulkActions.ts (duplicate dep array entry for shouldShowBusinessBankAccountOptions was removed on main; kept the PR's new defaultExpensePolicy dep).

MelvinBot · 2026-05-03T13:46:19Z

⚠️ MelvinBot CI Fix Loop Detected

MelvinBot has made 5 consecutive commits trying to fix CI failures. Automatic CI fix dispatches are now paused for this PR.

Next steps: A human should review the recent commits and resolve the conflicting CI errors manually.

MelvinBot assigned eVoloshchak Apr 20, 2026

MelvinBot requested a review from a team April 20, 2026 22:14

MelvinBot mentioned this pull request Apr 20, 2026

[$250] Expense - Duplicate expense created in the Expired Workspace #84368

Open

7 tasks

Merge main into claude-duplicateExpenseRestrictBillableActions

48a4b81

Resolve conflicts in useExpenseActions.ts and useSearchBulkActions.ts by adopting main's updated shouldRestrictUserBillableActions signature. Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>

eVoloshchak approved these changes Apr 29, 2026

View reviewed changes

melvin-bot Bot requested a review from arosiclair April 29, 2026 20:55

arosiclair previously approved these changes May 1, 2026

View reviewed changes

Merge main into claude-duplicateExpenseRestrictBillableActions

9642492

Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>

MelvinBot dismissed arosiclair’s stale review via 9642492 May 3, 2026 13:45

Conversation

MelvinBot commented Apr 20, 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

Screenshots/Videos

Uh oh!

codecov Bot commented Apr 20, 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!

eVoloshchak commented Apr 23, 2026

Uh oh!

eVoloshchak commented Apr 26, 2026

Uh oh!

MelvinBot commented Apr 26, 2026

Uh oh!

MelvinBot commented Apr 26, 2026

Uh oh!

eVoloshchak commented Apr 27, 2026

Uh oh!

MelvinBot commented Apr 27, 2026

Uh oh!

eVoloshchak commented Apr 29, 2026

Uh oh!

MelvinBot commented Apr 29, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eVoloshchak commented Apr 29, 2026

Uh oh!

MelvinBot commented Apr 29, 2026

Uh oh!

eVoloshchak commented Apr 29, 2026

Uh oh!

MelvinBot commented Apr 29, 2026

Uh oh!

melvin-bot Bot commented Apr 29, 2026

Uh oh!

eVoloshchak commented Apr 29, 2026

Uh oh!

MelvinBot commented Apr 29, 2026

Uh oh!

arosiclair commented May 1, 2026

Uh oh!

eVoloshchak commented May 3, 2026

Uh oh!

MelvinBot commented May 3, 2026

Uh oh!

MelvinBot commented May 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

MelvinBot commented Apr 20, 2026 •

edited

Loading

codecov Bot commented Apr 20, 2026 •

edited by github-actions Bot

Loading

eVoloshchak commented Apr 29, 2026 •

edited

Loading