Skip to content

[Payment due @situchan] Hide ACH if report is non reimbursable#87552

Open
s77rt wants to merge 9 commits intoExpensify:mainfrom
s77rt:hide-ach-if-only-non-reimbursable
Open

[Payment due @situchan] Hide ACH if report is non reimbursable#87552
s77rt wants to merge 9 commits intoExpensify:mainfrom
s77rt:hide-ach-if-only-non-reimbursable

Conversation

@s77rt
Copy link
Copy Markdown
Member

@s77rt s77rt commented Apr 10, 2026

Explanation of Change

Hide ACH if report is non reimbursable. The only option that should be shown for such a case is to mark the report as paid (given that policy has payments enabled).

This PR reverts some changes from #83329 mainly the part where users where allowed to choose ACH option then they get a modal when they try to pay with ACH. Now the ACH option is no longer an option.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/622532
PROPOSAL:

Tests

  • Have a policy with payments enabled
  1. Create a report
  2. Add only non-reimbursable expenses
  3. Verify (as admin) that you see the option to mark the report as paid
Screen.Recording.2026-04-10.at.2.34.58.AM.mov
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

  • 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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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

@s77rt s77rt marked this pull request as ready for review April 10, 2026 01:45
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 10, 2026

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

@s77rt s77rt requested review from a team as code owners April 10, 2026 01:45
@melvin-bot melvin-bot bot requested a review from linhvovan29546 April 10, 2026 01:45
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 10, 2026

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

@melvin-bot melvin-bot bot requested review from trjExpensify and removed request for a team April 10, 2026 01:45
@s77rt s77rt requested review from situchan and removed request for linhvovan29546 April 10, 2026 01:45
@codecov
Copy link
Copy Markdown

codecov bot commented Apr 10, 2026

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 Δ
...c/components/Modal/Global/HoldMenuModalWrapper.tsx 0.00% <ø> (ø)
...equestReportView/MoneyRequestReportActionsList.tsx 59.45% <ø> (ø)
src/components/ProcessMoneyReportHoldMenu.tsx 0.00% <ø> (ø)
...ReportPreview/MoneyRequestReportPreviewContent.tsx 63.34% <ø> (-0.15%) ⬇️
...RequestReportPreview/ReportPreviewActionButton.tsx 100.00% <ø> (ø)
src/components/Search/SearchBulkActionsButton.tsx 2.85% <ø> (+0.29%) ⬆️
src/hooks/useHoldMenuSubmit.ts 0.00% <ø> (ø)
src/hooks/useSearchBulkActions.ts 41.28% <ø> (+0.35%) ⬆️
src/hooks/useSelectionModeReportActions.ts 82.10% <100.00%> (ø)
src/libs/MoneyRequestReportUtils.ts 77.94% <ø> (ø)
... and 6 more
... and 68 files with indirect coverage changes

@situchan
Copy link
Copy Markdown
Contributor

Ah the decision was changed so quickly 😅

@situchan
Copy link
Copy Markdown
Contributor

situchan commented Apr 10, 2026

Can we show "Mark as paid" directly instead of 2 steps - "Pay $x.xx" > "Mark $x.xx as paid"?

Screen.Recording.2026-04-10.at.8.48.12.AM.mov

Repro step:

  1. Create 2+ non-reimbursable expenses in one report
  2. Go to expense report page (super wide RHP)
  3. Select all expenses
  4. Open "x selected" menu

@situchan
Copy link
Copy Markdown
Contributor

situchan commented Apr 10, 2026

Above suggestion is product change so maybe out of scope.

@situchan
Copy link
Copy Markdown
Contributor

situchan commented Apr 10, 2026

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.mp4
Android: mWeb Chrome
iOS: HybridApp
ios.mov
iOS: mWeb Safari
Screen.Recording.2026-04-11.at.2.12.03.AM.mov
MacOS: Chrome / Safari
web.mov

@situchan
Copy link
Copy Markdown
Contributor

situchan commented Apr 10, 2026

Let's just fix $0.00 from "Pay $0.00", "Mark $0.00 as paid" since it's confusing

@trjExpensify
Copy link
Copy Markdown
Contributor

I agree with #87552 (comment) btw, "Pay $0.00" is weird.

@trjExpensify
Copy link
Copy Markdown
Contributor

@joekaufmanexpensify do you want to do the product review on this?

@joekaufmanexpensify
Copy link
Copy Markdown
Contributor

Sure

@joekaufmanexpensify joekaufmanexpensify removed the request for review from trjExpensify April 10, 2026 12:11
@joekaufmanexpensify joekaufmanexpensify self-requested a review April 10, 2026 12:11
@s77rt s77rt requested a review from situchan April 10, 2026 18:58
@github-actions
Copy link
Copy Markdown
Contributor

🚧 @joekaufmanexpensify has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions
Copy link
Copy Markdown
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #87552.

Android 🤖 iOS 🍎
⏩ SKIPPED ⏩ ⏩ SKIPPED ⏩
The build for Android was skipped The build for iOS was skipped
Web 🕸️
https://87552.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@joekaufmanexpensify
Copy link
Copy Markdown
Contributor

I am also good with Mark as paid here, the $0 is confusing.

@joekaufmanexpensify
Copy link
Copy Markdown
Contributor

One thing I noticed. We aren't showing these as reports that have to be paid in the Pay queue, which is good. However, we are still pinning their chats in the inbox. I feel like we shouldn't do that. I expect many won't ever pay these. WDYT? If we agree, could we address that easily here too @s77rt ?

2026-04-10_16-00-17.mp4

@situchan
Copy link
Copy Markdown
Contributor

Can we create separate issue and PR for that? LHN badge/pinned issue has different root cause and out of scope for this PR which already became large enough.

@melvin-bot melvin-bot bot changed the title Hide ACH if report is non reimbursable [Payment due @situchan] Hide ACH if report is non reimbursable Apr 10, 2026
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 10, 2026

🎯 @situchan, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/622532.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

@s77rt s77rt requested a review from dangrous April 10, 2026 21:44
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.

4 participants