Refactor subscription size page to use useSubPage hook by bernhardoj · Pull Request #82340 · Expensify/App

bernhardoj · 2026-02-13T01:29:23Z

Explanation of Change

Fixed Issues

Part of #79043
PROPOSAL:

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

NOTE: No subscription size page in Android/iOS

Go to Account > Subscription > Subscription settings > Subscription size
Enter a valid size
Press Next
Press the app go back button
Verify it goes back to the previous page
Press Next again
Press the device/browser back button
Verify it goes back to the previous page
Press Next again and Save
Verify it goes back to the Subscription settings page

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I verified there are no new alerts related to the canBeMissing param for useOnyx
I followed proper code patterns (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
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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
If 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 new assets were added or existing ones were modified, I verified that:
- The assets are optimized and compressed (for SVG files, run npm run compress-svg)
- The assets load correctly across all supported platforms.
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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

android.mweb.mp4

iOS: Native

iOS: mWeb Safari

ios.mweb.mp4

MacOS: Chrome / Safari

web.mp4

…0-chore/refactor-subscription-size-to-use-usesubpage" This reverts commit 416bdf8, reversing changes made to c118dd9.

…ubpage

melvin-bot · 2026-02-13T01:29:57Z

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

bernhardoj · 2026-02-13T01:30:09Z

@dukenv0307 and @arosiclair will review this

bernhardoj · 2026-02-13T01:31:32Z

src/pages/settings/Subscription/SubscriptionSettings/index.tsx

        }
        if (privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.ANNUAL && option === CONST.SUBSCRIPTION.TYPE.PAY_PER_USE && !account?.canDowngrade) {
-            Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_SIZE.getRoute(0));
+            Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_DOWNGRADE_BLOCKED.route);


The canChangeSize param is used to show the downgrade blocked view when trying to downgrade from an annual to a pay-per-use plan, so instead of conditionally rendering it based on the params that can be easily changed by the user, I navigate to the already existing downgrade blocked page.

codecov · 2026-02-13T01:35:45Z

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 Δ
src/CONST/index.ts	`87.39% <ø> (ø)`
...ttings/Subscription/SubscriptionSettings/index.tsx	`0.00% <ø> (ø)`
...ription/SubscriptionSize/subPages/Confirmation.tsx	`0.00% <ø> (ø)`
...gs/Subscription/SubscriptionSize/subPages/Size.tsx	`0.00% <ø> (ø)`
src/ROUTES.ts	`13.51% <0.00%> (-0.10%)`	⬇️
...s/settings/Subscription/SubscriptionSize/index.tsx	`0.00% <0.00%> (ø)`
... and 11 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7eff636d2e

ℹ️ 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-02-13T01:38:02Z

src/pages/settings/Subscription/SubscriptionSize/subPages/Confirmation.tsx

 import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/SubscriptionSizeForm';

 type ConfirmationProps = SubStepProps;

-function Confirmation({onNext, isEditing}: ConfirmationProps) {
+function Confirmation({onNext}: ConfirmationProps) {


Reinstate downgrade guard on subscription size confirmation

Removing isEditing here also removed the account.canDowngrade check that previously blocked annual-plan seat decreases. In the current flow, users with canDowngrade === false can go through Subscription Size, enter a smaller member count, and still reach Save, which sends an updateSubscriptionSize request instead of showing the downgrade-blocked state. That is a behavior regression for restricted downgrade scenarios.

Useful? React with 👍 / 👎.

We have checks in the UpdateSubscriptionSize command so this shouldn't be an issue even if a user links directly to this page.

lakchote · 2026-02-13T06:24:05Z

@bernhardoj typescript checks are failing

…ubpage

bernhardoj · 2026-02-14T14:33:34Z

@lakchote fixed

arosiclair

LGTM so far. Waiting for review from @dukenv0307

lakchote

LGTM, @dukenv0307 please review it

dukenv0307 · 2026-02-18T14:01:07Z

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
- MacOS: Desktop
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
If 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

Android: HybridApp

Android: mWeb Chrome

Screen.Recording.2026-02-18.at.21.00.08.mov

iOS: HybridApp

iOS: mWeb Safari

Screen.Recording.2026-02-18.at.20.59.03.mov

MacOS: Chrome / Safari

Screen.Recording.2026-02-18.at.20.56.44.mov

dukenv0307

LGTM

melvin-bot · 2026-02-18T14:01:24Z

🎯 @dukenv0307, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #82806.

dukenv0307 · 2026-02-18T14:01:38Z

All yours @lakchote

arosiclair · 2026-02-18T15:24:06Z

@bernhardoj there's conflicts now

@dukenv0307 there's flashing when you navigate in your Android mWeb video. Is that actually visible for you or is that a glitch in the video?

dukenv0307 · 2026-02-18T15:40:07Z

there's flashing when you navigate in your Android mWeb video. Is that actually visible for you or is that a glitch in the video?

@arosiclair, it is my simulator issue. I've tried to fix it but couldn't. I can confirm that this bug doesn't occur on other devices.

arosiclair · 2026-02-18T17:19:55Z

Thanks, I tested on a physical Android device and it looks good 👍

…ubpage

bernhardoj · 2026-02-19T02:13:36Z

@arosiclair done

OSBotify · 2026-02-19T13:48:29Z

✋ 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-02-19T14:03:37Z

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

github-actions · 2026-02-19T14:07:00Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-739e128-e31f2ee-8251bd1a113dbe99b293a7d1f47e41dee3ae158f/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-739e128-e31f2ee-9dd4d634a09f5c5d0be94033b6b382a9baf30cbd/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-02-19T18:01:41Z

🚀 Deployed to staging by https://github.com/arosiclair in version: 9.3.23-2 🚀

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

OSBotify · 2026-02-20T16:11:34Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.3.23-3 🚀

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

bernhardoj added 4 commits February 12, 2026 10:12

Revert "Merge pull request Expensify#82136 from Expensify/revert-8062…

b5fe5dc

…0-chore/refactor-subscription-size-to-use-usesubpage" This reverts commit 416bdf8, reversing changes made to c118dd9.

navigate directly to the subpage

b941b0b

Merge branch 'main' into chore/refactor-subscription-size-to-use-uses…

2699bc9

…ubpage

added back removed code

7eff636

bernhardoj requested review from a team as code owners February 13, 2026 01:29

melvin-bot bot assigned bernhardoj Feb 13, 2026

melvin-bot bot requested review from heyjennahay and removed request for a team February 13, 2026 01:29

bernhardoj changed the title ~~Chore/refactor subscription size to use usesubpage~~ Refactor subscription size page to use useSubPage hook Feb 13, 2026

melvin-bot bot requested review from lakchote and removed request for a team February 13, 2026 01:29

bernhardoj commented Feb 13, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Feb 13, 2026

View reviewed changes

lakchote requested review from arosiclair and dukenv0307 February 13, 2026 06:24

bernhardoj added 8 commits February 14, 2026 21:34

Merge branch 'main' into chore/refactor-subscription-size-to-use-uses…

c1888ce

…ubpage

update type

e37006b

rename folder

7f2c058

update type

14c133c

update type again

2ee0fcd

rename

28a7376

rename

27f54f6

rename again

05ccd15

arosiclair reviewed Feb 16, 2026

View reviewed changes

lakchote reviewed Feb 17, 2026

View reviewed changes

dukenv0307 approved these changes Feb 18, 2026

View reviewed changes

melvin-bot bot mentioned this pull request Feb 18, 2026

Payment issue for E/App PR#82340 #82806

Closed

dukenv0307 approved these changes Feb 18, 2026

View reviewed changes

Merge branch 'main' into chore/refactor-subscription-size-to-use-uses…

0bbb6c8

…ubpage

arosiclair approved these changes Feb 19, 2026

View reviewed changes

arosiclair merged commit 739e128 into Expensify:main Feb 19, 2026
29 checks passed

OSBotify mentioned this pull request Feb 19, 2026

Deploy Checklist: New Expensify 2026-02-19 #82970

Closed

41 tasks

This was referenced Feb 20, 2026

Refactor netsuite connection page to use useSubPage #80711

Merged

[CBN] Refactor subscription size flow #79043

Closed

MelvinBot mentioned this pull request Feb 23, 2026

[Due for payment 2026-03-19] [$250] App crashes with infinite OnboardingGuard redirect loop #83212

Closed

7 tasks

Conversation

bernhardoj commented Feb 13, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 13, 2026

Uh oh!

bernhardoj commented Feb 13, 2026

Uh oh!

bernhardoj Feb 13, 2026

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Feb 13, 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!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Feb 13, 2026

Choose a reason for hiding this comment

Uh oh!

arosiclair Feb 13, 2026

Choose a reason for hiding this comment

Uh oh!

lakchote commented Feb 13, 2026

Uh oh!

bernhardoj commented Feb 14, 2026

Uh oh!

arosiclair left a comment

Choose a reason for hiding this comment

Uh oh!

lakchote left a comment

Choose a reason for hiding this comment

Uh oh!

dukenv0307 commented Feb 18, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

dukenv0307 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Feb 18, 2026

Uh oh!

dukenv0307 commented Feb 18, 2026

Uh oh!

arosiclair commented Feb 18, 2026

Uh oh!

dukenv0307 commented Feb 18, 2026

Uh oh!

arosiclair commented Feb 18, 2026

Uh oh!

bernhardoj commented Feb 19, 2026

Uh oh!

Uh oh!

OSBotify commented Feb 19, 2026

Uh oh!

github-actions bot commented Feb 19, 2026

Uh oh!

github-actions bot commented Feb 19, 2026

Uh oh!

OSBotify commented Feb 19, 2026

Uh oh!

OSBotify commented Feb 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Feb 13, 2026 •

edited by github-actions bot

Loading