Remove Onyx.connect() for the key: ONYXKEYS.SESSION in src/libs/SubscriptionUtils Part 1 by hungvu193 · Pull Request #87510 · Expensify/App

hungvu193 · 2026-04-09T15:40:25Z

Explanation of Change

Part 1: Remove usages of Onyx.connect for ONYXKEYS.SESSION by making the functions "pure":

shouldShowDiscountBanner

Fixed Issues

$ #66442
PROPOSAL: N/A

Tests

Create a brand new account.
Complete the onboarding
Verify that the discount banner displays correctly.
Go to Account > Subscription > Verify that the discount banner displays correctly.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

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

Create a brand new account.
Complete the onboarding
Verify that the discount banner displays correctly.
Go to Account > Subscription > Verify that the discount banner displays correctly.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Screen.Recording.2026-04-10.at.14.34.56.mov

Screen.Recording.2026-04-10.at.14.36.11.mov

codecov · 2026-04-10T04:27:13Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/pages/home/FreeTrialSection/useFreeTrial.ts	`100.00% <ø> (+45.45%)`	⬆️
src/pages/inbox/HeaderView.tsx	`97.87% <100.00%> (ø)`
src/libs/SubscriptionUtils.ts	`81.38% <83.33%> (ø)`
.../settings/Subscription/CardSection/CardSection.tsx	`0.00% <0.00%> (ø)`
... and 370 files with indirect coverage changes

hungvu193 · 2026-04-10T07:30:52Z

@MelvinBot review this

MelvinBot · 2026-04-10T07:34:44Z

Review: Looks good ✅

Clean mechanical refactor — all callers updated correctly, no missed call sites, no logic changes.

Details

Correctness: Every caller of shouldRestrictUserBillableActions, getFreeTrialText, shouldShowTrialEndedUI, and shouldCalculateBillNewDot passes accountID as the new first parameter from an appropriate source (useCurrentUserPersonalDetails, useOnyx(SESSION), or existing action params).

Safety when session is undefined: isPolicyOwner guards with !!currentUserAccountID and getOwnedPaidPolicies falls back to CONST.DEFAULT_NUMBER_ID (0) — both return safe defaults (false / empty array) before session loads.

Tests: All test updates consistently prepend the accountID parameter. The tests are now more explicit, passing TEST_USER_ACCOUNT_ID directly rather than relying on Onyx SESSION state.

Note: SubscriptionUtils.ts still has module-level Onyx.connect for NVP_PRIVATE_AMOUNT_OWED and COLLECTION.POLICY (used as default params). Fine for this PR's scope — can be addressed in follow-up.

melvin-bot · 2026-04-10T07:43:56Z

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

shubham1206agra · 2026-04-10T07:56:51Z

@hungvu193 Please do this PR in parts

hungvu193 · 2026-04-10T08:45:46Z

@shubham1206agra Done 😄

shubham1206agra · 2026-04-10T09:01:57Z

+ * @param accountID — Session account ID of the current user (used to detect owned paid policies).
+ */
 function shouldShowDiscountBanner(
+    accountID: number | undefined,


Suggested change

accountID: number | undefined,

currentUserAccountID: number | undefined,

shubham1206agra · 2026-04-10T09:02:54Z

@hungvu193 Remove NoQA from here and add tests.

hungvu193 · 2026-04-10T09:36:40Z

Done

flaviadefaria · 2026-04-10T11:35:44Z

No new product considerations here, so unsubscribing and unassigning myself.

shubham1206agra · 2026-04-10T17:12:20Z

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-10.at.10.42.02.PM.mov

melvin-bot · 2026-04-10T17:12:32Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #66442 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

OSBotify · 2026-04-13T15:40:42Z

✋ 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-04-13T15:46:44Z

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

github-actions · 2026-04-13T15:51:57Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-5de6c8d-b3e65d0-44954a22741218f8310cc2cbf130f216e37166d3/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-5de6c8d-b3e65d0-bcda60d889ab8eb1194d298cdb900239f79f66c2/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-13T20:34:05Z

🚀 Deployed to staging by https://github.com/dangrous in version: 9.3.59-0 🚀

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

Bundle Size Analysis (Sentry):

Android

MelvinBot · 2026-04-13T20:35:36Z

No help site changes required.

This PR is a purely internal code refactoring — it makes shouldShowDiscountBanner a pure function by accepting currentUserAccountID as a parameter instead of reading it from a module-level Onyx.connect subscription. There are no user-facing behavior changes, no new features, no renamed UI elements, and no changes to product flows that would affect documentation under App/docs/articles.

OSBotify · 2026-04-16T03:30:44Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.3.59-4 🚀

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

migrate shouldShowDiscountBanner

9e5f850

melvin-bot Bot assigned hungvu193 Apr 9, 2026

hungvu193 changed the title ~~migrate shouldShowDiscountBanner~~ Remove Onyx.connect() for the key: ONYXKEYS.SESSION in src/libs/SubscriptionUtils Part 1 Apr 10, 2026

hungvu193 changed the title ~~Remove Onyx.connect() for the key: ONYXKEYS.SESSION in src/libs/SubscriptionUtils Part 1~~ Remove Onyx.connect() for the key: ONYXKEYS.SESSION in src/libs/SubscriptionUtils Apr 10, 2026

hungvu193 changed the title ~~Remove Onyx.connect() for the key: ONYXKEYS.SESSION in src/libs/SubscriptionUtils~~ [NO QA] Remove Onyx.connect() for the key: ONYXKEYS.SESSION in src/libs/SubscriptionUtils Apr 10, 2026

hungvu193 marked this pull request as ready for review April 10, 2026 07:43

hungvu193 requested review from a team as code owners April 10, 2026 07:43

melvin-bot Bot requested review from flaviadefaria and shubham1206agra and removed request for a team April 10, 2026 07:43

melvin-bot Bot removed the request for review from a team April 10, 2026 07:43

hungvu193 mentioned this pull request Apr 10, 2026

[Due for payment 2026-06-23] Remove Onyx.connect() for the key: ONYXKEYS.SESSION in src/libs/SubscriptionUtils.ts #66442

Closed

hungvu193 changed the title ~~[NO QA] Remove Onyx.connect() for the key: ONYXKEYS.SESSION in src/libs/SubscriptionUtils~~ [NO QA] Remove Onyx.connect() for the key: ONYXKEYS.SESSION in src/libs/SubscriptionUtils Part 1 Apr 10, 2026

hungvu193 force-pushed the fix-664420-par1 branch from abef95c to 9e5f850 Compare April 10, 2026 08:07

shubham1206agra reviewed Apr 10, 2026

View reviewed changes

Comment thread src/libs/SubscriptionUtils.ts Outdated

hungvu193 added 3 commits April 10, 2026 15:10

update tests

69fb895

update default param name

39e3be4

prettier

99d8ed3

shubham1206agra reviewed Apr 10, 2026

View reviewed changes

hungvu193 changed the title ~~[NO QA] Remove Onyx.connect() for the key: ONYXKEYS.SESSION in src/libs/SubscriptionUtils Part 1~~ Remove Onyx.connect() for the key: ONYXKEYS.SESSION in src/libs/SubscriptionUtils Part 1 Apr 10, 2026

update the variable name

14ae51a

hungvu193 requested a review from shubham1206agra April 10, 2026 09:14

flaviadefaria removed their request for review April 10, 2026 11:35

shubham1206agra approved these changes Apr 10, 2026

View reviewed changes

melvin-bot Bot requested a review from dangrous April 10, 2026 17:12

dangrous approved these changes Apr 13, 2026

View reviewed changes

dangrous merged commit 5de6c8d into Expensify:main Apr 13, 2026
34 checks passed

OSBotify mentioned this pull request Apr 13, 2026

Deploy Checklist: New Expensify 2026-04-13 #87792

Closed

89 tasks

	accountID: number \| undefined,
	currentUserAccountID: number \| undefined,

Uh oh!

Conversation

hungvu193 commented Apr 9, 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 Apr 10, 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!

hungvu193 commented Apr 10, 2026

Uh oh!

MelvinBot commented Apr 10, 2026

Uh oh!

melvin-bot Bot commented Apr 10, 2026

Uh oh!

shubham1206agra commented Apr 10, 2026

Uh oh!

Uh oh!

hungvu193 commented Apr 10, 2026

Uh oh!

shubham1206agra Apr 10, 2026

Choose a reason for hiding this comment

Uh oh!

shubham1206agra commented Apr 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hungvu193 commented Apr 10, 2026

Uh oh!

flaviadefaria commented Apr 10, 2026

Uh oh!

shubham1206agra commented Apr 10, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Apr 10, 2026

Uh oh!

Uh oh!

OSBotify commented Apr 13, 2026

Uh oh!

github-actions Bot commented Apr 13, 2026

Uh oh!

github-actions Bot commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 13, 2026

Uh oh!

MelvinBot commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

hungvu193 commented Apr 9, 2026 •

edited

Loading

codecov Bot commented Apr 10, 2026 •

edited by github-actions Bot

Loading

shubham1206agra commented Apr 10, 2026 •

edited

Loading