[No QA] fix: Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.POLICY (part 4) by truph01 · Pull Request #88012 · Expensify/App

truph01 · 2026-04-15T22:43:59Z

Explanation of Change

This PR is the 4th step toward removing Onyx.connect() for ONYXKEYS.COLLECTION.POLICY in src/libs/SubscriptionUtils.ts.

In PR #86615, we updated shouldRestrictUserBillableActions by introducing a new 5th param:

function shouldRestrictUserBillableActions(
    policyID: string,
    ...
    policy: OnyxEntry<Policy> = deprecatedAllPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`],
)

In this PR, we remove the 5th param and merge it with the 1st. The 1st param now accepts either a string ID or a policy object: policyIDOrPolicy: string | OnyxEntry<Policy>.

In the final refactor PR, the param will be updated to policy: OnyxEntry<Policy> once all callers pass a policy object directly.

Fixed Issues

$ #66457
PROPOSAL:

Tests

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

… update 1st param

melvin-bot · 2026-04-15T23:01:24Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 927a7183f1

ℹ️ 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 · 2026-04-15T23:19:41Z

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 Δ
.../SearchPageHeader/SearchActionsBarCreateButton.tsx	`93.87% <ø> (ø)`
src/hooks/useReceiptScanDrop.tsx	`30.43% <ø> (ø)`
src/libs/PaymentUtils.ts	`79.64% <100.00%> (ø)`
src/libs/ReportUtils.ts	`81.22% <100.00%> (-0.06%)`	⬇️
src/libs/SubscriptionUtils.ts	`86.02% <100.00%> (ø)`
src/libs/actions/IOU/ReportWorkflow.ts	`78.32% <100.00%> (ø)`
src/libs/shouldUseDefaultExpensePolicy.ts	`100.00% <100.00%> (ø)`
.../FloatingCameraButton/BaseFloatingCameraButton.tsx	`85.71% <0.00%> (+5.71%)`	⬆️
src/components/SettlementButton/index.tsx	`85.27% <0.00%> (ø)`
src/hooks/useExpenseActions.ts	`0.00% <0.00%> (ø)`
... and 4 more
... and 24 files with indirect coverage changes

JmillsExpensify

No product review required.

shubham1206agra · 2026-04-16T15:43:16Z

@truph01 Please fix conflicts

shubham1206agra · 2026-04-16T15:43:26Z

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.

truph01 · 2026-04-17T10:15:17Z

@shubham1206agra I fixed conflicts

madmax330 · 2026-04-20T12:47:57Z

@truph01 conflicts

truph01 · 2026-04-20T19:16:35Z

@madmax330 All yours!

github-actions · 2026-04-21T08:57:22Z

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

github-actions · 2026-04-21T09:02:23Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-442aeea-c079286-ae3585755f701bdb83c37bf9e35da0649551e6bc/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-442aeea-c079286-0b6a58f71b26f4e9a4d10301ff0c2bafd15dc080/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-21T09:05:14Z

✋ 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 · 2026-04-21T11:39:57Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-21T11:40:56Z

I reviewed the changes in this PR. This is a purely internal code refactoring that changes the signature of shouldRestrictUserBillableActions (merging the policyID and policy params into a single policyIDOrPolicy param). There are no user-facing changes — no new features, UI changes, or terminology updates.

No help site documentation changes are required.

OSBotify · 2026-04-23T19:59:33Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.3.61-4 🚀

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

fix: update shouldRestrictUserBillableActions to remove 5th param and…

74acafa

… update 1st param

melvin-bot Bot assigned truph01 Apr 15, 2026

truph01 added 2 commits April 16, 2026 05:59

fix: conflicts

231e0f3

fix: conflicts

927a718

truph01 marked this pull request as ready for review April 15, 2026 23:01

truph01 requested review from a team as code owners April 15, 2026 23:01

melvin-bot Bot requested review from JmillsExpensify and shubham1206agra and removed request for a team April 15, 2026 23:01

melvin-bot Bot removed the request for review from a team April 15, 2026 23:01

truph01 mentioned this pull request Apr 15, 2026

[Due for payment 2026-05-20] Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.POLICY in src/libs/SubscriptionUtils.ts #66457

Closed

fix: test

e35353f

chatgpt-codex-connector Bot reviewed Apr 15, 2026

View reviewed changes

Comment thread src/libs/actions/IOU/ReportWorkflow.ts

Comment thread src/libs/actions/IOU/ReportWorkflow.ts Outdated

fix: revert change

b969d3e

JmillsExpensify reviewed Apr 16, 2026

View reviewed changes

shubham1206agra approved these changes Apr 16, 2026

View reviewed changes

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

truph01 added 4 commits April 17, 2026 13:37

fix: conflicts

59c2cf7

fix: conflicts

0724b0c

fix: conflicts

9fae305

fix: typecheck

5686882

truph01 added 2 commits April 21, 2026 01:49

Merge branch 'main' into fix/66457-part-4

37ad0ec

fix: prettier

666db3b

truph01 added 2 commits April 21, 2026 01:55

fix: typecheck

13b7728

fix: react compiler

215af0d

truph01 added 2 commits April 21, 2026 13:36

fix: conflicts

4d8dd73

fix: conflicts

703057f

madmax330 approved these changes Apr 21, 2026

View reviewed changes

madmax330 merged commit 442aeea into Expensify:main Apr 21, 2026
33 checks passed

OSBotify mentioned this pull request Apr 21, 2026

Deploy Checklist: New Expensify 2026-04-21 #88394

Closed

Conversation

truph01 commented Apr 15, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Apr 15, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

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

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

shubham1206agra commented Apr 16, 2026

Uh oh!

shubham1206agra commented Apr 16, 2026

Reviewer Checklist

Uh oh!

truph01 commented Apr 17, 2026

Uh oh!

madmax330 commented Apr 20, 2026

Uh oh!

truph01 commented Apr 20, 2026

Uh oh!

Uh oh!

github-actions Bot commented Apr 21, 2026

Uh oh!

github-actions Bot commented Apr 21, 2026

Uh oh!

OSBotify commented Apr 21, 2026

Uh oh!

OSBotify commented Apr 21, 2026

Uh oh!

MelvinBot commented Apr 21, 2026

Uh oh!

OSBotify commented Apr 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

codecov Bot commented Apr 15, 2026 •

edited by github-actions Bot

Loading