Skip to content

Show hold educational modal when holding expense via context menu#87910

Draft
MelvinBot wants to merge 2 commits intomainfrom
claude-holdEducationalModalContextMenu
Draft

Show hold educational modal when holding expense via context menu#87910
MelvinBot wants to merge 2 commits intomainfrom
claude-holdEducationalModalContextMenu

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

@MelvinBot MelvinBot commented Apr 14, 2026 •
edited by github-actions Bot
Loading

Explanation of Change

The context menu "Hold" action was calling changeMoneyRequestHoldStatus() directly without checking NVP_DISMISSED_HOLD_USE_EXPLANATION, so the first-time educational modal was never shown when holding an expense via right-click context menu.

This adds the same NVP gating logic used in MoneyRequestHeaderSecondaryActions and MoneyReportHeader to the context menu Hold action. A holdWithEducation callback is added to BaseReportActionContextMenu that checks whether the user has already dismissed the educational modal, and if not, shows the appropriate modal (submitter or approver variant) before proceeding with the hold.

Fixed Issues

$ #84840
PROPOSAL: #84840 (comment)

AI Tests

  • TypeScript typecheck (npm run typecheck-tsgo): passed
  • ESLint (npx eslint --max-warnings=0): passed
  • Prettier check: passed
  • Jest ContextMenu tests (4 suites, 16 tests): all passed

Human Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review"
// Please describe what tests you performed that validates your changed worked.

Offline tests

// TODO: The human co-author must fill out offline test details.

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  1. Open any workspace chat and create a manual expense
  2. Right-click on the expense preview and select "Hold" from context menu
  3. Verify that an educational modal is displayed before the hold reason screen
  4. Dismiss the modal and complete the hold flow
  5. Remove the hold and hold again via context menu
  6. Verify the educational modal does NOT appear the second time (NVP persisted)
  • 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 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
- [ ] I verified that similar component doesn't exist in the codebase - [ ] I verified that all props are defined accurately and each prop has a `/** comment above it */` - [ ] I verified that each file is named correctly - [ ] I verified that each component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone - [ ] I verified that the only data being stored in component state is data necessary for rendering and nothing else - [ ] In component if we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes - [ ] 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) - [ ] I verified that component 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`) - [ ] I verified that all JSX used for rendering exists in the render method - [ ] I verified that each 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

Screenshots/Videosundefined

@MelvinBot @shubham1206agra
Show hold educational modal when holding expense via context menu
8bf4ca2 
The context menu Hold action was calling changeMoneyRequestHoldStatus
directly without checking NVP_DISMISSED_HOLD_USE_EXPLANATION, skipping
the first-time educational modal. This adds the same NVP gating logic
used in MoneyRequestHeaderSecondaryActions and MoneyReportHeader.

Co-authored-by: Shubham Agrawal <shubham1206agra@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team April 14, 2026 15:11
@MelvinBot MelvinBot mentioned this pull request Apr 14, 2026
Open
7 tasks
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 14, 2026 •
edited by github-actions Bot
Loading

Codecov Report

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

Files with missing lines Coverage Δ
...report/ContextMenu/BaseReportActionContextMenu.tsx 84.66% <100.00%> (+0.10%) ⬆️
...es/inbox/report/ContextMenu/ContextMenuActions.tsx 44.21% <75.00%> (+0.08%) ⬆️
...dal/Global/HoldOrRejectEducationalModalWrapper.tsx 0.00% <0.00%> (ø)
...al/Global/HoldSubmitterEducationalModalWrapper.tsx 0.00% <0.00%> (ø)
src/hooks/useHoldEducationalModal.ts 62.50% <62.50%> (ø)
... and 10 files with indirect coverage changes

@shubham1206agra
Copy link
Copy Markdown
Contributor

shubham1206agra commented Apr 14, 2026

@MelvinBot I don't think this is optimal as it will create way too many Modal components for each report action rendered. Find another approach. Should we make this a global modal and open it via context?

@MelvinBot @shubham1206agra
Refactor hold educational modals to use global ModalProvider
2d2d113 
Instead of rendering HoldSubmitterEducationalModal and
HoldOrRejectEducationalModal inline in BaseReportActionContextMenu
(which creates modal instances per report action), use the existing
global ModalProvider context. This renders a single modal at the app
root when needed via useModal/showModal.

Co-authored-by: Shubham Agrawal <shubham1206agra@users.noreply.github.com>
@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented Apr 14, 2026

Refactored to use the existing global ModalProvider (useModal) instead of rendering modals inline per context menu instance.

What changed:

  • Created HoldSubmitterEducationalModalWrapper and HoldOrRejectEducationalModalWrapper — thin wrappers that integrate with the global modal system
  • Created useHoldEducationalModal hook — reads the NVP dismissal state and calls showModal() to render the educational modal at the app root (via ModalProvider) only when needed
  • Removed all inline modal state, refs, and <HoldSubmitterEducationalModal>/<HoldOrRejectEducationalModal> rendering from BaseReportActionContextMenu
  • Restored the original return structure (no Fragment wrapper needed)

Now only a single modal instance is created at the app root when the user triggers hold, instead of one per report action.

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

Reviewers

No reviews

Assignees

@shubham1206agra shubham1206agra

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@MelvinBot @shubham1206agra