Skip to content

Skip unvalidated account check for Elsewhere payments in selection mode#87536

Merged
puneetlath merged 1 commit intomainfrom
claude-fixShouldBlockActionElsewherePayment
Apr 9, 2026
Merged

Skip unvalidated account check for Elsewhere payments in selection mode#87536
puneetlath merged 1 commit intomainfrom
claude-fixShouldBlockActionElsewherePayment

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

@MelvinBot MelvinBot commented Apr 9, 2026 •
edited
Loading

Explanation of Change

#86714 updated checkForNecessaryAction in MoneyReportHeader and SettlementButton to accept an optional paymentMethodType parameter so that unvalidated users can still pay via "Elsewhere". However, #85796 introduced shouldBlockAction in useSelectionModeReportActions with the old behavior (no paymentMethodType parameter), so the selection-mode pay flow still blocks unvalidated users for all payment types including Elsewhere.

This PR:

  1. Adds an optional paymentMethodType parameter to shouldBlockAction
  2. Skips the isUserValidated check when paymentMethodType is ELSEWHERE
  3. Passes iouPaymentType to shouldBlockAction in onSelectionModePaymentSelect
  4. Adds unit tests for both cases (Elsewhere allowed, non-Elsewhere blocked)

Fixed Issues

$ #72502

Tests

  1. Sign in with an unvalidated account
  2. Open an approved expense report ready to be paid
  3. Long-press an expense to enter selection mode, then select all expenses
  4. Open the "X selected" dropdown and tap the Pay action
  5. Select "Pay elsewhere"
  6. Verify the payment proceeds without being blocked by the unvalidated account modal
  • Verify that no errors appear in the JS console

Offline tests

N/A — this change only affects a guard condition and does not introduce offline-sensitive logic.

QA Steps

Same as Tests above.

  • 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 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.

Checks run

  • Prettier: passed (no changes)
  • ESLint: passed
  • TypeScript (tsgo): passed
  • Unit tests: 39/39 passed

Screenshots/Videos

Android: Native

N/A — logic-only change with no UI modifications

Android: mWeb Chrome

N/A — logic-only change with no UI modifications

iOS: Native

N/A — logic-only change with no UI modifications

iOS: mWeb Safari

N/A — logic-only change with no UI modifications

MacOS: Chrome / Safari

N/A — logic-only change with no UI modifications

@MelvinBot @situchan
Skip unvalidated account check for Elsewhere payments in selection mode
cdec241 
shouldBlockAction in useSelectionModeReportActions was missing the
paymentMethodType parameter added in #86714, causing it to
always block unvalidated users even for Elsewhere payments.

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team April 9, 2026 19:58
@situchan
Copy link
Copy Markdown
Contributor

situchan commented Apr 9, 2026

@MelvinBot Update Fixed Issues section to link #72502

@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented Apr 9, 2026

Updated the Fixed Issues section to link #72502.

@situchan
Copy link
Copy Markdown
Contributor

situchan commented Apr 9, 2026

@MelvinBot mark as ready for review

@MelvinBot MelvinBot marked this pull request as ready for review April 9, 2026 20:02
@MelvinBot MelvinBot requested a review from a team as a code owner April 9, 2026 20:02
@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented Apr 9, 2026

Marked this PR as ready for review.

@melvin-bot melvin-bot bot requested review from flaviadefaria and situchan and removed request for a team April 9, 2026 20:02
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 9, 2026

@situchan 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 a team and puneetlath April 9, 2026 20:02
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 9, 2026

@puneetlath 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 removed the request for review from a team April 9, 2026 20:02
@situchan
Copy link
Copy Markdown
Contributor

situchan commented Apr 9, 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: mWeb Chrome
iOS: HybridApp
Screen.Recording.2026-04-10.at.2.02.07.AM.mov
iOS: mWeb Safari
MacOS: Chrome / Safari

@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented Apr 9, 2026

Code Review

Verdict: This PR looks good. The change is minimal, correct, and consistent with the existing pattern in MoneyReportHeader and SettlementButton.

Consistency check — all three locations now use the identical guard:

  • MoneyReportHeader.tsx:1190 — if (!isUserValidated && paymentMethodType !== CONST.IOU.PAYMENT_TYPE.ELSEWHERE)
  • SettlementButton/index.tsx:199 — same pattern
  • useSelectionModeReportActions.ts:269 — same pattern (this PR)

Call-site audit — no missed callers:

  • onSelectionModePaymentSelect (line 423): correctly passes iouPaymentType ✅
  • handleWorkspaceSelected (line 461): correctly omits it (workspace payments use VBBA, never Elsewhere) ✅
  • Exported at line 548 but has zero external callers ✅

PaymentMethodType was already imported (line 45), so no new imports needed. Unit tests cover both the blocked and allowed cases.

No issues found.

@chatgpt-codex-connector
Copy link
Copy Markdown

chatgpt-codex-connector bot commented Apr 9, 2026

Codex Review: Didn't find any major issues. Keep it up!

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@codecov
Copy link
Copy Markdown

codecov bot commented Apr 9, 2026 •
edited by github-actions bot
Loading

Codecov Report

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

Files with missing lines Coverage Δ
src/hooks/useSelectionModeReportActions.ts 82.10% <66.66%> (ø)
... and 11 files with indirect coverage changes

Krishna2323
Krishna2323 approved these changes Apr 9, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@Krishna2323 Krishna2323 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks correct!

@melvin-bot melvin-bot bot requested a review from puneetlath April 9, 2026 20:21
@puneetlath puneetlath merged commit d2f3dbe into main Apr 9, 2026
47 checks passed
@puneetlath puneetlath deleted the claude-fixShouldBlockActionElsewherePayment branch April 9, 2026 20:22
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 9, 2026

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

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 9, 2026

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-d2f3dbe-b0990c7-6d19a789025720ce9b279fd461cca7e90674add1/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-d2f3dbe-b0990c7-7769e75afc832ceb494d147f4334bb187b08273c/index.html
Android iOS
Web 🕸️
https://87536.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 9, 2026

✋ 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 OSBotify mentioned this pull request Apr 10, 2026
Open
84 tasks
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 10, 2026

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.3.58-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented Apr 10, 2026

No help site changes required.

This PR is a logic-only bug fix that modifies a guard condition in useSelectionModeReportActions.ts to allow unvalidated users to pay via "Elsewhere" in selection mode. It does not change any UI text, labels, workflows, or product concepts that would need documentation updates in App/docs/articles.

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

Reviewers

@flaviadefaria flaviadefaria Awaiting requested review from flaviadefaria

@puneetlath puneetlath Awaiting requested review from puneetlath

2 more reviewers

@Krishna2323 Krishna2323 Krishna2323 approved these changes

@situchan situchan situchan approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@situchan situchan

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@MelvinBot @situchan @OSBotify @puneetlath @Krishna2323