Skip to content

Fix subscription settings UI branch for legacy Collect#88115

Open
emkhalid wants to merge 3 commits intoExpensify:mainfrom
emkhalid:fix/legacy-collect-subscription
Open

Fix subscription settings UI branch for legacy Collect#88115
emkhalid wants to merge 3 commits intoExpensify:mainfrom
emkhalid:fix/legacy-collect-subscription

Conversation

@emkhalid
Copy link
Copy Markdown
Contributor

@emkhalid emkhalid commented Apr 16, 2026

Explanation of Change

This PR updates Subscription settings to choose the correct UI for Collect workspaces based on Team 2025 pricing instead of treating all Team workspaces the same.

Legacy Collect workspaces now use the legacy subscription settings UI, which restores annual-specific settings like Auto-renew and Auto-increase annual seats for old Collect annual subscriptions. New Collect / Team 2025 workspaces continue to use the simplified monthly Collect UI.

Fixed Issues

$ #87136
PROPOSAL: #87136 (comment)

Tests

  1. Open the app on each platform.
  2. Go to Settings > Subscription.
  3. Verify the correct Collect / Control plan card is shown for the tested workspace.
  4. Open Subscription settings.
  5. Verify an old Collect annual workspace shows the legacy annual settings UI:
    • Annual is selected
    • Subscription size is shown
    • Auto-renew is shown
    • Auto-increase annual seats is shown
  6. Verify an old Collect pay-per-use workspace shows the legacy settings UI with:
    • Pay-per-use selected
    • no Subscription size
    • no Auto-renew
    • no Auto-increase annual seats
  7. Verify a new Collect / Team 2025 workspace shows the simplified monthly Collect UI:
    • Collect workspaces are billed monthly per member, with no annual commitment.
    • Pricing
    • per-member monthly price
    • no legacy annual controls
  8. Verify Corporate annual and Corporate pay-per-use still behave as before.
  • Verify that no errors appear in the JS console

Offline tests

  1. Load Settings > Subscription > Subscription settings.
  2. Turn off the network.
  3. Verify the screen stays stable and does not switch to an incorrect subscription UI.
  4. Turn the network back on.
  5. Verify the subscription settings page still shows the correct UI for the tested workspace state.

QA Steps

Same as Tests

// 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

  • 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 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-native-Old.Collect.-.Annual.shows.the.legacy.annual.settings.UI.mp4
Android: mWeb Chrome
Android-web-Old.Collect.-.Annual.shows.the.legacy.annual.settings.UI.mp4
iOS: Native
IOS-native-Old.Collect.-.Annual.shows.the.legacy.annual.settings.UI.mp4
iOS: mWeb Safari
IOS-web-Old.Collect.-.Annual.shows.the.legacy.annual.settings.UI.video-converter.com.mp4
MacOS: Chrome / Safari
MACOS-Old.Collect.-.Annual.shows.the.legacy.annual.settings.UI.mov

@emkhalid emkhalid requested review from a team as code owners April 16, 2026 13:40
@melvin-bot melvin-bot bot requested review from Eskalifer1 and heyjennahay and removed request for a team April 16, 2026 13:40
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 16, 2026

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

@melvin-bot melvin-bot bot removed the request for review from a team April 16, 2026 13:40
@codecov
Copy link
Copy Markdown

codecov bot commented Apr 16, 2026

Codecov Report

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

Files with missing lines Coverage Δ
src/libs/SubscriptionUtils.ts 81.28% <100.00%> (+0.20%) ⬆️
...Subscription/SubscriptionSettings/index.native.tsx 0.00% <0.00%> (ø)
...ttings/Subscription/SubscriptionSettings/index.tsx 0.00% <0.00%> (ø)
... and 116 files with indirect coverage changes

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8529118ef2

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/libs/SubscriptionUtils.ts Outdated
}

function shouldUseSimplifiedCollectSubscriptionUI(plan: PersonalPolicyTypeExcludedProps | null, hasTeam2025Pricing: boolean): boolean {
return plan === CONST.POLICY.TYPE.TEAM && !hasTeam2025Pricing;
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Invert Collect UI gate for Team 2025 workspaces

shouldUseSimplifiedCollectSubscriptionUI() currently returns true for TEAM && !hasTeam2025Pricing, which is the opposite of how hasTeam2025Pricing is used elsewhere (e.g., getSubscriptionPrice() switches to 2025 pricing when it is true). Because both web and native SubscriptionSettings branch on this helper, Team 2025 workspaces are routed to the legacy annual/pay-per-use configuration UI, while legacy Collect workspaces still get the simplified monthly UI; this reverses the intended behavior and can expose invalid settings to the wrong accounts.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed.

@emkhalid
Copy link
Copy Markdown
Contributor Author

I recorded the following supplemental validation videos using local mock data to simulate the relevant subscription states.

The main issue scenario is:

  • Old Collect + Annual

The additional videos cover neighboring states and regression checks so it is clear that the correct UI branch is shown for each subscription/pricing combination.

  1. Old Collect + Annual
    This is the main bug scenario from the issue.
    Expected:
    The Subscription settings page should show the legacy annual settings UI, not the simplified monthly Collect UI. Annual should be selected, Subscription size should be visible, and annual-only controls like Auto-renew and Auto-increase annual seats should be shown.

Video:

Old.Collect.-.Annual.subscription.shows.the.legacy.settings.UI.mov
  1. Old Collect + Pay-per-use
    This verifies the legacy old Collect workspace still uses the legacy settings UI when the subscription type is pay-per-use.
    Expected:
    The Subscription settings page should show the legacy settings UI with Pay-per-use selected. Annual-only controls such as Subscription size, Auto-renew, and Auto-increase annual seats should not be shown.

Video:

Old.Collect.-.Pay-per-use.shows.the.legacy.settings.UI.mov
  1. New Collect / Team 2025
    This verifies the new Collect pricing model still uses the simplified monthly UI.
    Expected:
    The Subscription settings page should show the simplified Collect monthly UI, including the monthly per-member pricing text, and should not show legacy annual settings controls.

Video:

New.Collect.Team.2025.shows.the.simplified.monthly.UI.mov
  1. Corporate + Annual
    This is a regression check for the existing Corporate annual flow.
    Expected:
    The Subscription settings page should continue showing the legacy annual settings UI with Annual selected, Subscription size visible, and annual-only controls present.

Video:

Corporate.-.Annual.keeps.the.legacy.annual.settings.UI.mov
  1. Corporate + Pay-per-use
    This is a regression check for the existing Corporate pay-per-use flow.
    Expected:
    The Subscription settings page should continue showing the legacy settings UI with Pay-per-use selected and without annual-only controls.

Video:

Corporate.-.Pay-per-use.keeps.the.legacy.settings.UI.mov
  1. Old Collect + Annual platform validation
    This is an additional validation of the main issue scenario in the platform flow used for testing.
    Expected:
    Old Collect annual should still show the legacy annual settings UI with Annual, Subscription size, Auto-renew, and Auto-increase annual seats.

Video:

Old.Collect.-.Annual.platform.verification.mov
  1. Old Collect + Pay-per-use platform validation
    This is an additional validation of the legacy old Collect pay-per-use flow in the platform flow used for testing.
    Expected:
    Old Collect pay-per-use should still show the legacy settings UI with Pay-per-use selected and without annual-only controls.

Video:

Old.Collect.-.Pay-per-use.platform.check.mov
  1. New Collect / Team 2025 platform validation
    This is an additional validation of the simplified monthly Collect flow in the platform flow used for testing.
    Expected:
    New Collect / Team 2025 should show the simplified monthly Collect UI and should not show legacy annual settings controls.

Video:

New.Collect.Team.2025.platform.check.mov
  1. Old Collect + Annual summary matches details
    This verifies consistency between the subscription summary state and the Subscription settings details page.
    Expected:
    The old Collect annual state should remain consistent when opening Subscription settings, and the details page should show the legacy annual settings UI.

Video:

Old.Collect.-.Annual.summary.matches.details.mov
  1. Old Collect + Pay-per-use summary matches details
    This verifies consistency between the subscription summary state and the Subscription settings details page for pay-per-use.
    Expected:
    The old Collect pay-per-use state should remain consistent when opening Subscription settings, and the details page should show the legacy pay-per-use settings UI without annual-only controls.

Video:

Old.Collect.-.Pay-per-use.summary.matches.details.mov

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant