fix: remove onyx connect ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END (part 3) by truph01 · Pull Request #84293 · Expensify/App

truph01 · 2026-03-05T16:44:43Z

Explanation of Change

This PR is part of an effort to remove Onyx.connect() usage for the key ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END in src/libs/SubscriptionUtils.ts.

Since this refactor affects multiple areas, it is split into a few small PRs. This PR is the 3rd step and focuses on the following refactor:

Direct calls shouldRestrictUserBillableActions from components (no intermediate utility):

shouldRestrictUserBillableActions → IOURequestStepParticipants.tsx
shouldRestrictUserBillableActions → MoneyRequestParticipantsSelector.tsx
shouldRestrictUserBillableActions → EmptySearchView.tsx
shouldRestrictUserBillableActions → ReportChangeWorkspacePage.tsx
shouldRestrictUserBillableActions → NewReportWorkspaceSelectionPage.tsx
shouldRestrictUserBillableActions → AddUnreportedExpense.tsx
shouldRestrictUserBillableActions → MoneyReportHeader.tsx
shouldRestrictUserBillableActions → BaseFloatingCameraButton.tsx
shouldRestrictUserBillableActions → SearchMoneyRequestReportEmptyState.tsx
shouldRestrictUserBillableActions → SearchFiltersBarCreateButton.tsx
shouldRestrictUserBillableActions → SettlementButton/index.tsx

Fixed Issues

$ #66449
PROPOSAL:

Tests

Click global FAB > Create expense.
In participant selector, choose workspace where the trial period has already ended.
You should be navigated to "Add a payment card to continue using this workspace" 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-03-05.at.23.58.24.mov

melvin-bot · 2026-03-05T16:45:20Z

@jasperhuangg 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-03-05T17:00:11Z

@shubham1206agra will review this one

shubham1206agra · 2026-03-05T17:27:41Z

src/components/MoneyReportHeader.tsx

                    return;
                }
-                if (policy && shouldRestrictUserBillableActions(policy.id, userBillingGraceEndPeriods, ownerBillingGraceEndPeriod)) {
+                if (policy && shouldRestrictUserBillableActions(policy.id, userBillingGraceEndPeriods, undefined, ownerBillingGraceEndPeriod)) {


Putting in my K2

…ATE_OWNER_BILLING_GRACE_PERIOD_END-part-3

codecov · 2026-03-06T13:07:19Z

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/SearchFiltersBarCreateButton.tsx	`83.90% <100.00%> (-13.72%)`	⬇️
src/components/MoneyReportHeader.tsx	`0.00% <0.00%> (ø)`
src/components/SettlementButton/index.tsx	`86.50% <0.00%> (ø)`
src/pages/AddUnreportedExpense.tsx	`0.00% <0.00%> (ø)`
src/pages/NewReportWorkspaceSelectionPage.tsx	`0.00% <0.00%> (ø)`
src/pages/ReportChangeWorkspacePage.tsx	`0.00% <0.00%> (ø)`
.../FloatingCameraButton/BaseFloatingCameraButton.tsx	`76.47% <0.00%> (-4.78%)`	⬇️
src/pages/Search/EmptySearchView.tsx	`65.13% <0.00%> (ø)`
...tReportView/SearchMoneyRequestReportEmptyState.tsx	`3.44% <0.00%> (ø)`
...s/iou/request/MoneyRequestParticipantsSelector.tsx	`0.00% <0.00%> (ø)`
... and 1 more
... and 95 files with indirect coverage changes

joekaufmanexpensify · 2026-03-06T20:46:28Z

No product review needed

shubham1206agra · 2026-03-08T15:37:57Z

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-03-08.at.9.07.28.PM.mov

shubham1206agra · 2026-03-08T15:50:56Z

@tgolen Please review this PR

github-actions · 2026-03-09T20:18:12Z

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

github-actions · 2026-03-09T20:22:58Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-88af7d1-586107e-8a490cdc48fc346112af59780c0a03fcf727284a/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-88af7d1-586107e-3f691c7eb300db0a4e7898cd7249ab20ea5df855/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-09T21:27:40Z

🚀 Deployed to staging by https://github.com/tgolen in version: 9.3.34-0 🚀

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

OSBotify · 2026-03-10T18:49:46Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.34-2 🚀

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

linhvovan29546 · 2026-03-18T14:05:33Z

src/components/SettlementButton/index.tsx

    const [personalPolicyID] = useOnyx(ONYXKEYS.PERSONAL_POLICY_ID);
    const [betas] = useOnyx(ONYXKEYS.BETAS);
    const [userBillingGraceEndPeriods] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
+    const [ownerBillingGraceEndPeriod] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);


@truph01 @shubham1206agra This change prevents SettlementButton from being memoized by the React Compiler. Could you please check this?
cc @roryabraham Since we already removed the manual memoization here

@linhvovan29546 Please ask the same in #80252 as this PR added the memoization back

@shubham1206agra We merged the latest PR two weeks ago #81818 So it's not caused by #80252

@linhvovan29546 The memoization is still present in the file so it's not our fault

My mistake, I referenced the wrong here. To clarify: the memoization is caused by PR #83638

fix: update shouldRestrictUserBillableActions call in components

cc8f80c

truph01 requested review from a team as code owners March 5, 2026 16:44

melvin-bot bot assigned truph01 Mar 5, 2026

melvin-bot bot requested review from jasperhuangg and joekaufmanexpensify and removed request for a team March 5, 2026 16:44

truph01 mentioned this pull request Mar 5, 2026

[Due for payment soon] Remove Onyx.connect() for the key: ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END in src/libs/SubscriptionUtils.ts #66449

Open

shubham1206agra reviewed Mar 5, 2026

View reviewed changes

Merge branch 'Expensify:main' into fix/66449-remove-ONYXKEYS.NVP_PRIV…

a236a1e

…ATE_OWNER_BILLING_GRACE_PERIOD_END-part-3

truph01 added 3 commits March 7, 2026 00:11

fix: add more migrations

abcb9f2

fix: prettier

a31d789

fix: add test

86c98f5

joekaufmanexpensify removed their request for review March 6, 2026 20:46

shubham1206agra approved these changes Mar 8, 2026

View reviewed changes

melvin-bot bot requested a review from danieldoglas March 8, 2026 15:40

tgolen approved these changes Mar 9, 2026

View reviewed changes

tgolen merged commit 88af7d1 into Expensify:main Mar 9, 2026
30 checks passed

OSBotify mentioned this pull request Mar 9, 2026

Deploy Checklist: New Expensify 2026-03-09 #84634

Closed

75 tasks

linhvovan29546 reviewed Mar 18, 2026

View reviewed changes

Conversation

truph01 commented Mar 5, 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 Mar 5, 2026

Uh oh!

truph01 commented Mar 5, 2026

Uh oh!

shubham1206agra Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Mar 6, 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!

joekaufmanexpensify commented Mar 6, 2026

Uh oh!

shubham1206agra commented Mar 8, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

shubham1206agra commented Mar 8, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 9, 2026

Uh oh!

github-actions bot commented Mar 9, 2026

Uh oh!

OSBotify commented Mar 9, 2026

Uh oh!

OSBotify commented Mar 10, 2026

Uh oh!

linhvovan29546 Mar 18, 2026

Choose a reason for hiding this comment

Uh oh!

shubham1206agra Mar 18, 2026

Choose a reason for hiding this comment

Uh oh!

linhvovan29546 Mar 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shubham1206agra Mar 18, 2026

Choose a reason for hiding this comment

Uh oh!

linhvovan29546 Mar 18, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

truph01 commented Mar 5, 2026 •

edited

Loading

codecov bot commented Mar 6, 2026 •

edited by github-actions bot

Loading

linhvovan29546 Mar 18, 2026 •

edited

Loading