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

hungvu193 · 2026-04-10T11:07:28Z

Explanation of Change

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

getFreeTrialText
shouldShowTrialEndedUI

Fixed Issues

$ #66442
PROPOSAL: N/A

Tests

Create a brand new account.
Complete the onboarding
Verify that the free trial text displays correctly
Wait till free trial ended > Account > Subscription
Verify that free trial ended UI displays.

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 free trial text displays correctly
Wait till the free trial ended > Home
Verify that you can see Add payment card to keep using Expensify under Time sensitive section.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Screen.Recording.2026-04-12.at.23.23.32.mov

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

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

codecov · 2026-04-10T11:16:33Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/SubscriptionUtils.ts	`86.17% <100.00%> (+4.78%)`	⬆️
...iveSection/hooks/useTimeSensitiveAddPaymentCard.ts	`100.00% <100.00%> (ø)`
src/pages/settings/InitialSettingsPage.tsx	`0.00% <ø> (ø)`
.../settings/Subscription/CardSection/CardSection.tsx	`0.00% <0.00%> (ø)`
src/pages/settings/Subscription/FreeTrial.tsx	`0.00% <0.00%> (ø)`
... and 74 files with indirect coverage changes

hungvu193 · 2026-04-10T17:18:40Z

@MelvinBot Fix prettier please

MelvinBot · 2026-04-10T17:20:07Z

The Prettier check is failing on src/pages/settings/Subscription/CardSection/CardSection.tsx. Run npm run prettier locally and commit the result.

⚠️ I can't push changes to this PR because I didn't open it and I'm not listed as an assignee. To have me make this fix, add me to the PR assignees and then retry your request.

hungvu193 · 2026-04-11T03:05:45Z

@MelvinBot Assign this PR to you too.

MelvinBot · 2026-04-11T03:06:56Z

I've added myself as an assignee on this PR. 👍

hungvu193 · 2026-04-11T03:07:45Z

@MelvinBot Fix the prettier

Co-authored-by: Hans <hungvu193@users.noreply.github.com>

MelvinBot · 2026-04-11T03:09:33Z

Fixed the prettier check: ran prettier on src/pages/settings/Subscription/CardSection/CardSection.tsx which had a multi-line function call that prettier collapsed to a single line.

melvin-bot · 2026-04-13T15:37:11Z

@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-13T15:38:58Z

@hungvu193 Merge main please

hungvu193 · 2026-04-13T15:54:17Z

@hungvu193 Merge main please

Done

joekaufmanexpensify · 2026-04-14T20:49:24Z

No product review needed

Co-authored-by: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>

hungvu193 · 2026-04-15T10:07:10Z

@MelvinBot merge main

Co-authored-by: Hans <hungvu193@users.noreply.github.com>

MelvinBot · 2026-04-15T10:23:10Z

Done! I've merged main into this branch and pushed the result. The merge resolved cleanly (auto-merged tests/unit/SubscriptionUtilsTest.ts).

MelvinBot · 2026-04-15T10:37:32Z

⏱️ Ran out of time before I could finish. This usually means the task was too complex or I got stuck exploring. Please try again with a more specific request or post in #melvinbot-ai.

Run details

shubham1206agra · 2026-04-15T11:18:55Z

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-15.at.4.48.12.PM.mov

dangrous

Logic change looks fine, one test comment.

dangrous · 2026-04-15T14:27:50Z

+            const result = getFreeTrialText(accountID, translate, ownedPaidPolicies, introSelected, firstDayFreeTrial, lastDayFreeTrial);
+
+            expect(translate).toHaveBeenCalledWith('subscription.billingBanner.trialStarted.title', expect.any(Number));
+            expect(result).toMatch(/^trialStarted:\d+$/);


Should we check for the exactly correct date? Probably good to double check, if this function wasn't being tested at all before...

Sure. I'll update it accordingly

Updated @dangrous

…nto fix-664420-part2

github-actions · 2026-04-16T20:11:58Z

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

OSBotify · 2026-04-16T20:15:50Z

✋ 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-16T20:17:12Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-72d72a1-4ad96fb-d7e6502942a3b2c7ab94abdcde9d23bc5c33707f/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-72d72a1-4ad96fb-757017b36278f6844850c231164217fa6f5c2e03/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-21T11:37:46Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-21T11:38:58Z

No help site changes are required for this PR.

This is a purely internal code refactoring that makes getFreeTrialText and shouldShowTrialEndedUI accept currentUserAccountID as an explicit parameter instead of relying on a deprecated Onyx.connect global. There are no user-facing behavior changes, UI changes, or new features/terminology that would affect documentation under App/docs/articles.

OSBotify · 2026-04-23T19:57:24Z

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

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

hungvu193 added 2 commits April 10, 2026 17:50

part 2 migrate getFreeTrialText

c6ff78e

add tests

880d915

melvin-bot Bot assigned hungvu193 Apr 10, 2026

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

part 2

3109dd8

MelvinBot self-assigned this Apr 11, 2026

Fix: prettier formatting in CardSection.tsx

6e6ec60

Co-authored-by: Hans <hungvu193@users.noreply.github.com>

hungvu193 marked this pull request as ready for review April 13, 2026 15:37

hungvu193 requested review from a team as code owners April 13, 2026 15:37

melvin-bot Bot requested review from joekaufmanexpensify and shubham1206agra and removed request for a team April 13, 2026 15:37

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

Merge remote-tracking branch 'origin/main' into fix-664420-part2

bbec265

joekaufmanexpensify removed their request for review April 14, 2026 20:49

shubham1206agra reviewed Apr 15, 2026

View reviewed changes

Comment thread src/libs/SubscriptionUtils.ts Outdated

Update src/libs/SubscriptionUtils.ts

3088111

Co-authored-by: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>

Merge remote-tracking branch 'origin/main' into fix-664420-part2

e23ae6b

Co-authored-by: Hans <hungvu193@users.noreply.github.com>

shubham1206agra approved these changes Apr 15, 2026

View reviewed changes

melvin-bot Bot requested a review from dangrous April 15, 2026 11:19

dangrous suggested changes Apr 15, 2026

View reviewed changes

hungvu193 added 2 commits April 15, 2026 22:48

update test

8200c3f

Merge branch 'fix-664420-part2' of https://github.com/hungvu193/App i…

6ebb851

…nto fix-664420-part2

dangrous approved these changes Apr 16, 2026

View reviewed changes

dangrous merged commit 72d72a1 into Expensify:main Apr 16, 2026
32 checks passed

OSBotify mentioned this pull request Apr 21, 2026

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

Closed

melvin-bot Bot mentioned this pull request Apr 23, 2026

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

Closed

Uh oh!

Conversation

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

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

Uh oh!

Uh oh!

MelvinBot commented Apr 11, 2026

Uh oh!

hungvu193 commented Apr 11, 2026

Uh oh!

MelvinBot commented Apr 11, 2026

Uh oh!

melvin-bot Bot commented Apr 13, 2026

Uh oh!

shubham1206agra commented Apr 13, 2026

Uh oh!

hungvu193 commented Apr 13, 2026

Uh oh!

joekaufmanexpensify commented Apr 14, 2026

Uh oh!

Uh oh!

hungvu193 commented Apr 15, 2026

Uh oh!

MelvinBot commented Apr 15, 2026

Uh oh!

MelvinBot commented Apr 15, 2026

Uh oh!

shubham1206agra commented Apr 15, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

dangrous left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dangrous Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

hungvu193 Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

hungvu193 Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Apr 16, 2026

Uh oh!

OSBotify commented Apr 16, 2026

Uh oh!

github-actions Bot commented Apr 16, 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

hungvu193 commented Apr 10, 2026 •

edited

Loading

codecov Bot commented Apr 10, 2026 •

edited by github-actions Bot

Loading

hungvu193 commented Apr 11, 2026 •

edited

Loading