fix: Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.POLICY (part 7) by truph01 · Pull Request #88857 · Expensify/App

truph01 · 2026-04-27T04:33:23Z

Explanation of Change

This PR is the 7th step toward removing Onyx.connect() for ONYXKEYS.COLLECTION.POLICY in src/libs/SubscriptionUtils.ts. It focuses on refactoring shouldRestrictUserBillableActions -> payMoneyRequest (actions/IOU/PayMoneyRequest.ts) flow.

Fixed Issues

$ #66457
PROPOSAL:

Tests

Log in with account has workspace chat where the workspace's the trial period has already ended.
Open policy expense chat
Find any report which is ready to pay
Click on pay button in report preview
Verify: User is redirected to restricted screen.

Verify that no errors appear in the JS console

Offline tests

QA Steps

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

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

Screen.Recording.2026-04-27.at.11.54.59.mov

melvin-bot · 2026-04-27T04:33:29Z

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

truph01 · 2026-04-27T08:20:20Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e4fe1e54da

ℹ️ 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".

chatgpt-codex-connector · 2026-04-27T08:29:57Z

+    const policyForBillingRestriction = chatReportPolicy ?? (policy?.id === chatReport.policyID ? policy : undefined);
+    if (
+        chatReport.policyID &&
+        policyForBillingRestriction &&
+        shouldRestrictUserBillableActions(policyForBillingRestriction, ownerBillingGracePeriodEnd, userBillingGracePeriodEnds, amountOwed)


Keep billing restriction check when chat policy is unresolved

The new guard requires policyForBillingRestriction to be truthy before calling shouldRestrictUserBillableActions, so payments are allowed whenever chatReportPolicy is still undefined and the IOU policy ID differs from chatReport.policyID. In UI flows this can happen while usePolicy(chatReport?.policyID) is still hydrating, and unlike the previous code path we no longer fall back to passing chatReport.policyID directly (which allowed SubscriptionUtils to resolve from the policy collection). This creates a regression where restricted users can briefly bypass the redirect and attempt payment.

Useful? React with 👍 / 👎.

@truph01 should we address this?

trjExpensify · 2026-04-27T11:15:50Z

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

shubham1206agra · 2026-04-28T04:52:43Z

@truph01 Fix conflicts please

shubham1206agra · 2026-04-28T16:39:59Z

@truph01 Bump here

codecov · 2026-04-28T17:24:30Z

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/hooks/useSelectionModeReportActions.ts	`86.06% <100.00%> (+0.17%)`	⬆️
src/libs/actions/IOU/PayMoneyRequest.ts	`79.04% <100.00%> (+0.51%)`	⬆️
...aderActions/MoneyReportHeaderSelectionDropdown.tsx	`0.62% <0.00%> (-0.01%)`	⬇️
...oneyReportHeaderPrimaryAction/PayPrimaryAction.tsx	`0.00% <0.00%> (ø)`
...Item/MoneyRequestReportPreview/PayActionButton.tsx	`0.00% <0.00%> (ø)`
src/hooks/useHoldMenuSubmit.ts	`0.00% <0.00%> (ø)`
...eaderActions/MoneyReportHeaderSecondaryActions.tsx	`0.00% <0.00%> (ø)`
... and 65 files with indirect coverage changes

truph01 · 2026-04-28T17:25:22Z

@shubham1206agra All good now.

shubham1206agra · 2026-04-29T15:14:56Z

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 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
xIf 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

Screen.Recording.2026-04-29.at.8.44.42.PM.mov

madmax330 · 2026-05-01T14:34:42Z

@truph01 there's conflicts

truph01 · 2026-05-01T16:04:47Z

@madmax330 All good now!

github-actions · 2026-05-01T17:42:22Z

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

OSBotify · 2026-05-01T17:46:16Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-05-01T17:46:24Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-4af0f94-b9f8e95-24b7e43ed3e6f44d44bf0362d7519116dfb7fe80/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-4af0f94-b9f8e95-dfa780836fb181e0b23e9bbecf6a01ee950ca7c0/index.html

Web 🕸️
https://88857.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-04T13:28:02Z

🚀 Deployed to staging by https://github.com/madmax330 in version: 9.3.66-0 🚀

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

MelvinBot · 2026-05-04T13:29:43Z

I reviewed all changes in this PR. This is a purely internal refactoring that replaces Onyx.connect() with usePolicy hooks for passing chatReportPolicy through the payment flow. No user-facing behavior, UI, or workflows changed.

No help site updates are required.

fix: refactor payMoneyRequest

e4fe1e5

truph01 requested review from a team as code owners April 27, 2026 04:33

melvin-bot Bot assigned truph01 Apr 27, 2026

melvin-bot Bot requested review from shubham1206agra and trjExpensify and removed request for a team April 27, 2026 04:33

melvin-bot Bot removed the request for review from a team April 27, 2026 04:33

chatgpt-codex-connector Bot reviewed Apr 27, 2026

View reviewed changes

trjExpensify removed their request for review April 27, 2026 11:15

truph01 added 2 commits April 29, 2026 00:15

fix: conflicts

2dca011

fix: conflicts

cf97312

shubham1206agra approved these changes Apr 29, 2026

View reviewed changes

melvin-bot Bot requested a review from madmax330 April 29, 2026 15:16

truph01 added 2 commits May 1, 2026 22:45

fix: conflicts

e888541

fix: conflicts

18b9b5b

madmax330 approved these changes May 1, 2026

View reviewed changes

madmax330 merged commit 4af0f94 into Expensify:main May 1, 2026
34 checks passed

OSBotify mentioned this pull request May 4, 2026

Deploy Checklist: New Expensify 2026-05-04 #89508

Open

75 tasks

Conversation

truph01 commented Apr 27, 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!

melvin-bot Bot commented Apr 27, 2026

Uh oh!

truph01 commented Apr 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

madmax330 Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

trjExpensify commented Apr 27, 2026

Uh oh!

shubham1206agra commented Apr 28, 2026

Uh oh!

shubham1206agra commented Apr 28, 2026

Uh oh!

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

truph01 commented Apr 28, 2026

Uh oh!

shubham1206agra commented Apr 29, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

madmax330 commented May 1, 2026

Uh oh!

truph01 commented May 1, 2026

Uh oh!

Uh oh!

github-actions Bot commented May 1, 2026

Uh oh!

OSBotify commented May 1, 2026

Uh oh!

github-actions Bot commented May 1, 2026

Uh oh!

OSBotify commented May 4, 2026

Uh oh!

MelvinBot commented May 4, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

truph01 commented Apr 27, 2026 •

edited

Loading

codecov Bot commented Apr 28, 2026 •

edited by github-actions Bot

Loading