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

truph01 · 2026-03-11T10:49:27Z

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 5th step and focuses on the following refactor:

shouldRestrictUserBillableActions -> approveMoneyRequest -> selectPaymentType (PaymentUtils.ts)
shouldRestrictUserBillableActions -> approveMoneyRequest (IOU/index.ts)
shouldRestrictUserBillableActions -> selectPaymentType (PaymentUtils.ts)
shouldRestrictUserBillableActions -> submitReport (IOU/index.ts)
shouldRestrictUserBillableActions -> payMoneyRequest (IOU/index.ts)
shouldRestrictUserBillableActions -> createDraftTransactionAndNavigateToParticipantSelector (ReportUtils.ts)

Fixed Issues

$ #66449
PROPOSAL:

Tests

Open the workspace chat where the workspace's the trial period has already ended.
Try to submit any report by clicking on the Submit button in the report preview
Verify: 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].""

Open the workspace chat where the workspace's the trial period has already ended.
Try to submit any report by clicking on the Submit button in the report preview
Verify: You should be navigated to "Add a payment card to continue using this workspace" screen.

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-11.at.18.46.13.mov

codecov · 2026-03-11T11:21:20Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/MoneyReportHeader.tsx	`0.00% <ø> (ø)`
src/components/ProcessMoneyReportHoldMenu.tsx	`0.00% <ø> (ø)`
...ReportPreview/MoneyRequestReportPreviewContent.tsx	`60.94% <ø> (ø)`
src/components/SettlementButton/index.tsx	`86.25% <ø> (+11.16%)`	⬆️
src/libs/PaymentUtils.ts	`77.77% <100.00%> (ø)`
src/libs/ReportUtils.ts	`78.77% <100.00%> (ø)`
src/libs/actions/IOU/index.ts	`72.86% <100.00%> (ø)`
src/pages/ReportDetailsPage.tsx	`57.18% <100.00%> (+0.11%)`	⬆️
src/pages/inbox/report/PureReportActionItem.tsx	`56.80% <100.00%> (+0.05%)`	⬆️
... and 12 files with indirect coverage changes

melvin-bot · 2026-03-11T11:47:59Z

@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: bc15f15b09

ℹ️ 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-03-11T12:00:38Z

                    isSelfTourViewed,
                    userBillingGraceEndPeriods,
                    amountOwed,
+                    ownerBillingGraceEndPeriod,


Include owner grace period in payment callback deps

confirmPayment is memoized but its dependency list was not updated after adding ownerBillingGraceEndPeriod to the payMoneyRequest payload. If the owner grace-period timestamp updates while this screen stays mounted (for example after a billing status refresh), the callback keeps sending the stale captured value, so shouldRestrictUserBillableActions() can make pay/approve decisions using outdated billing state.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-03-11T12:00:38Z

                        isSelfTourViewed,
                        userBillingGraceEndPeriods,
                        amountOwed,
+                        ownerBillingGraceEndPeriod,


Include owner grace period in preview payment deps

confirmPayment in this component now passes ownerBillingGraceEndPeriod, but the useCallback dependency array still omits it. When Onyx pushes a newer grace-period value, the handler can continue using an older timestamp and route users through the wrong restricted/unrestricted payment path until another listed dependency changes.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-03-11T12:00:38Z

                        activePolicy,
                        userBillingGraceEndPeriodCollection,
                        amountOwed,
+                        ownerBillingGraceEndPeriod,


Recompute track-expense menu when grace period changes

menuItems is memoized and now captures ownerBillingGraceEndPeriod inside the Track Expense actions, but that value is not in the useMemo dependency list. If the grace-period timestamp changes after initial render, these actions keep using the stale captured value and can navigate to restricted/unrestricted flows incorrectly.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-03-11T12:00:38Z

                            activePolicy,
                            userBillingGraceEndPeriodCollection,
                            amountOwed,
+                            ownerBillingGraceEndPeriod,


Refresh actionable buttons when grace period updates

actionableItemButtons now forwards ownerBillingGraceEndPeriod to draft-transaction navigation, but its useMemo dependencies were not updated. That leaves these actionable whisper handlers using stale billing-grace data after Onyx updates, which can produce incorrect restriction checks for submit/categorize/share actions.

Useful? React with 👍 / 👎.

JmillsExpensify

No product review required on this one.

shubham1206agra · 2026-03-14T08:51:46Z

@truph01 Fix conflicts please

truph01 · 2026-03-15T03:19:56Z

@shubham1206agra I fixed conflicts

truph01 · 2026-03-19T10:25:38Z

@shubham1206agra I fixed conflicts

truph01 · 2026-03-19T10:31:17Z

The

Jest Unit Tests / test (job 8) (pull_request)Failing after 6m

isn't related to this PR

shubham1206agra · 2026-03-20T04:54:51Z

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-20.at.10.24.38.AM.mov

shubham1206agra · 2026-03-20T04:55:28Z

@tgolen Please review this PR

shubham1206agra · 2026-03-20T04:55:38Z

@truph01 Please merge main

tgolen

PR looks fine, but has conflicts. I mentioned renaming the variable, but that doesn't need to happen in this PR. If you can just update that in future PRs, that should be fine, so I'm going to approve for now.

tgolen · 2026-03-20T17:17:11Z

                        isSelfTourViewed,
                        userBillingGraceEndPeriods,
                        amountOwed,
+                        ownerBillingGraceEndPeriod,


Same as the other PR, but please rename all these to ownerBillingGracePeriodEnd

@tgolen I think it would be better to create a separate PR that focuses solely on the rename, since ownerBillingGraceEndPeriod is used throughout the app—not just in this PR.

OSBotify · 2026-03-23T17:18: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-03-23T17:19:14Z

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

github-actions · 2026-03-23T17:24:20Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-2fee2eb-d6051eb-695dba489635c9790dd4303a68636b672c19b701/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-2fee2eb-d6051eb-7530cdadd64ffeda4ac4e1d597322c10f5bae0b6/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-25T16:09:59Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.3.43-3 🚀

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

fix: remove Onyx.connect()

c118e2e

melvin-bot Bot assigned truph01 Mar 11, 2026

truph01 added 3 commits March 11, 2026 17:59

fix: refactor submitReport

46b5a0f

fix: lint

87ca0f6

fix: refactor payMoneyRequest

83fb0d4

truph01 added 2 commits March 11, 2026 18:35

fix: refactor createDraftTransactionAndNavigateToParticipantSelector

c44dea5

fix: prettier

bc15f15

truph01 marked this pull request as ready for review March 11, 2026 11:47

truph01 requested review from a team as code owners March 11, 2026 11:47

melvin-bot Bot requested review from JmillsExpensify and shubham1206agra and removed request for a team March 11, 2026 11:47

melvin-bot Bot removed the request for review from a team March 11, 2026 11:47

chatgpt-codex-connector Bot reviewed Mar 11, 2026

View reviewed changes

JmillsExpensify reviewed Mar 11, 2026

View reviewed changes

truph01 added 2 commits March 12, 2026 09:58

Merge branch 'Expensify:main' into fix/66449-part-5

2ee66fd

fix: lint

8a6d57f

truph01 mentioned this pull request Mar 12, 2026

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

Closed

truph01 added 4 commits March 12, 2026 10:15

Merge branch 'Expensify:main' into fix/66449-part-5

d56d684

fix: conflicts

740d0b5

fix: conflicts

6c1b706

Merge branch 'Expensify:main' into fix/66449-part-5

88d4f4d

truph01 added 2 commits March 14, 2026 19:18

fix: conflicts

3982c09

fix: conflicts

38ba534

fix: conflicts

ff0d555

fix: conflicts

02c7567

shubham1206agra approved these changes Mar 20, 2026

View reviewed changes

melvin-bot Bot requested a review from danieldoglas March 20, 2026 04:55

tgolen previously approved these changes Mar 20, 2026

View reviewed changes

truph01 added 2 commits March 21, 2026 11:49

fix: conflicts

55e8d9c

fix: conflicts

e42eb22

truph01 dismissed tgolen’s stale review via e42eb22 March 21, 2026 04:49

truph01 mentioned this pull request Mar 21, 2026

fix: remove onyx connect ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END (part 6) #84916

Merged

53 tasks

Merge branch 'Expensify:main' into fix/66449-part-5

d715cb8

tgolen approved these changes Mar 23, 2026

View reviewed changes

tgolen merged commit 2fee2eb into Expensify:main Mar 23, 2026
31 checks passed

OSBotify mentioned this pull request Mar 24, 2026

Deploy Checklist: New Expensify 2026-03-24 #86199

Closed

53 tasks

truph01 mentioned this pull request Mar 30, 2026

[No QA] fix: renames ownerBillingGraceEndPeriod to ownerBillingGracePeriodEnd #86638

Merged

53 tasks

Conversation

truph01 commented Mar 11, 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!

codecov Bot commented Mar 11, 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!

melvin-bot Bot commented Mar 11, 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 Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

shubham1206agra commented Mar 14, 2026

Uh oh!

truph01 commented Mar 15, 2026

Uh oh!

truph01 commented Mar 19, 2026

Uh oh!

truph01 commented Mar 19, 2026

Uh oh!

shubham1206agra commented Mar 20, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

shubham1206agra commented Mar 20, 2026

Uh oh!

shubham1206agra commented Mar 20, 2026

Uh oh!

tgolen left a comment

Choose a reason for hiding this comment

Uh oh!

tgolen Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

truph01 Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

github-actions Bot commented Mar 23, 2026

Uh oh!

github-actions Bot commented Mar 23, 2026

Uh oh!

OSBotify commented Mar 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

truph01 commented Mar 11, 2026 •

edited

Loading

codecov Bot commented Mar 11, 2026 •

edited by github-actions Bot

Loading