[CP Staging] Do not show HOLD educational modal in money requests from DMs by cristipaval · Pull Request #75150 · Expensify/App

cristipaval · 2025-11-14T12:30:25Z

The copy on the educational modals for hold and reject is specific to expenses from workspace chats. This PR disables the educational modals for money requests from DMs

Explanation of Change

Adds a check, and if the parent chat report of the money requests is a DM, doesn't display the modal.

Fixed Issues

$ #75083
PROPOSAL:

Tests

Test that QA tests from this PR still pass.
Test that HOLD educational does not show for money requests from 1:1 DM chats.
Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests.

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

MacOS: Desktop

melvin-bot · 2025-11-14T12:30:33Z

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

codecov · 2025-11-14T12:41:48Z

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 Δ
src/components/MoneyReportHeader.tsx	`0.17% <0.00%> (-0.01%)`	⬇️
src/components/MoneyRequestHeader.tsx	`0.84% <0.00%> (-0.01%)`	⬇️
... and 14 files with indirect coverage changes

mananjadhav · 2025-11-14T12:51:04Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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

android-hide-hold-modal-iou.mov

Android: mWeb Chrome

mweb-chrome-hide-hold-modal-iou.mov

iOS: HybridApp

iOS: mWeb Safari

mweb-safari-hide-hold-modal-iou.mov

MacOS: Chrome / Safari

web-hide-hold-modal-iou.mov

MacOS: Desktop

desktop-hide-hold-modal-iou.mov

melvin-bot · 2025-11-14T13:24:54Z

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

…-DMs [CP Staging] Do not show HOLD educational modal in money requests from DMs (cherry picked from commit a3dc7a4) (cherry-picked to staging by lakchote)

OSBotify · 2025-11-14T15:03:17Z

✋ 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 · 2025-11-14T15:30:54Z

🚀 Cherry-picked to staging by https://github.com/lakchote in version: 9.2.58-3 🚀

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

IuliiaHerets · 2025-11-14T18:02:56Z

@cristipaval Windows 11/ Chrome in v9.2.58-3

Submitter View: pass

74505-1.mp4

Approver View: Hold
Fail: The content copy does not match the issue description.

74505-2.mp4

Approver View: Reject
Fail: The content copy in the modal does not match the issue description.

74505-3.mp4

Test that HOLD educational does not show for money requests from 1:1 DM chats - pass

75150.1.mp4

mananjadhav · 2025-11-14T18:08:48Z

@IuliiaHerets I'll take care of the copy as a follow up.

OSBotify · 2025-11-14T18:27:14Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.2.58-3 🚀

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

OSBotify · 2025-11-14T18:47:50Z

🚀 Cherry-picked to staging by https://github.com/lakchote in version: 9.2.59-0 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	success ✅

OSBotify · 2025-11-19T15:30:27Z

🚀 Deployed to production by https://github.com/grgia in version: 9.2.59-5 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	failure ❌

eVoloshchak · 2025-12-29T10:11:05Z

src/components/MoneyRequestHeader.tsx


    const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(parentReport, policy, transactionViolations);
    const isReportSubmitter = isCurrentUserSubmitter(chatIOUReport);
+    const isParentReportDM = isDM(parentReport);


👋 Hey, coming from #75520
This has caused an issue with educational modal(s) appearing twice (HOLD modal on the first hold, HOLD&REJECT on the next one)
We should have used chatIOUReport instead of parentReport (same as in MoneyReportHeader)

DO not show HOLD educational modal in money requests from DMs

225412d

cristipaval self-assigned this Nov 14, 2025

cristipaval requested review from a team as code owners November 14, 2025 12:30

melvin-bot bot requested review from trjExpensify and truph01 and removed request for a team November 14, 2025 12:30

cristipaval changed the title ~~Do not show HOLD educational modal in money requests from DMs~~ [CP Staging] Do not show HOLD educational modal in money requests from DMs Nov 14, 2025

mananjadhav approved these changes Nov 14, 2025

View reviewed changes

melvin-bot bot requested a review from Beamanator November 14, 2025 13:24

lakchote approved these changes Nov 14, 2025

View reviewed changes

Beamanator approved these changes Nov 14, 2025

View reviewed changes

lakchote merged commit a3dc7a4 into main Nov 14, 2025
34 of 35 checks passed

lakchote deleted the cristi_no-holdEducational-in-DMs branch November 14, 2025 14:37

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Nov 14, 2025

OSBotify mentioned this pull request Nov 14, 2025

Deploy Checklist: New Expensify 2025-11-13 #75063

Closed

52 tasks

mitarachim mentioned this pull request Nov 19, 2025

[Due for Payment 12/26] [$250] Expense - Hold educational modal appears twice #75520

Closed

8 tasks

eVoloshchak reviewed Dec 29, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Do not show HOLD educational modal in money requests from DMs#75150

[CP Staging] Do not show HOLD educational modal in money requests from DMs#75150
lakchote merged 1 commit intomainfrom
cristi_no-holdEducational-in-DMs

cristipaval commented Nov 14, 2025 •

edited

Loading

Uh oh!

melvin-bot bot commented Nov 14, 2025

Uh oh!

codecov bot commented Nov 14, 2025 •

edited by github-actions bot

Loading

Uh oh!

mananjadhav commented Nov 14, 2025 •

edited

Loading

Uh oh!

melvin-bot bot commented Nov 14, 2025

Uh oh!

Uh oh!

OSBotify commented Nov 14, 2025

Uh oh!

OSBotify commented Nov 14, 2025

Uh oh!

IuliiaHerets commented Nov 14, 2025

Uh oh!

mananjadhav commented Nov 14, 2025 •

edited

Loading

Uh oh!

OSBotify commented Nov 14, 2025

Uh oh!

OSBotify commented Nov 14, 2025

Uh oh!

OSBotify commented Nov 19, 2025

Uh oh!

eVoloshchak Dec 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

cristipaval commented Nov 14, 2025 • 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!

melvin-bot bot commented Nov 14, 2025

Uh oh!

codecov bot commented Nov 14, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

mananjadhav commented Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Nov 14, 2025

Uh oh!

Uh oh!

OSBotify commented Nov 14, 2025

Uh oh!

OSBotify commented Nov 14, 2025

Uh oh!

IuliiaHerets commented Nov 14, 2025

Uh oh!

mananjadhav commented Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

OSBotify commented Nov 14, 2025

Uh oh!

OSBotify commented Nov 14, 2025

Uh oh!

OSBotify commented Nov 19, 2025

Uh oh!

eVoloshchak Dec 29, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

cristipaval commented Nov 14, 2025 •

edited

Loading

codecov bot commented Nov 14, 2025 •

edited by github-actions bot

Loading

mananjadhav commented Nov 14, 2025 •

edited

Loading

mananjadhav commented Nov 14, 2025 •

edited

Loading