From 8529118ef289f4f7545bf6d0685b413c07afa71e Mon Sep 17 00:00:00 2001 From: emkhalid Date: Thu, 16 Apr 2026 13:53:47 +0430 Subject: [PATCH 1/5] Fix subscription settings UI branch for legacy Collect --- src/libs/SubscriptionUtils.ts | 5 +++++ .../SubscriptionSettings/index.native.tsx | 6 +++--- .../SubscriptionSettings/index.tsx | 6 +++--- tests/unit/SubscriptionUtilsTest.ts | 19 +++++++++++++++++++ 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts index 48a0caa04d15..7166d187475d 100644 --- a/src/libs/SubscriptionUtils.ts +++ b/src/libs/SubscriptionUtils.ts @@ -514,6 +514,10 @@ function getSubscriptionPrice( return CONST.SUBSCRIPTION_PRICES[preferredCurrency][plan][privateSubscriptionType]; } +function shouldUseSimplifiedCollectSubscriptionUI(plan: PersonalPolicyTypeExcludedProps | null, hasTeam2025Pricing: boolean): boolean { + return plan === CONST.POLICY.TYPE.TEAM && !hasTeam2025Pricing; +} + function getSubscriptionPlanInfo( translate: LocalizedTranslate, subscriptionPlan: PersonalPolicyTypeExcludedProps | null, @@ -627,6 +631,7 @@ export { shouldCalculateBillNewDot, getSubscriptionPlanInfo, getSubscriptionPrice, + shouldUseSimplifiedCollectSubscriptionUI, shouldShowTrialEndedUI, isSubscriptionTypeOfInvoicing, hasInsufficientFundsError, diff --git a/src/pages/settings/Subscription/SubscriptionSettings/index.native.tsx b/src/pages/settings/Subscription/SubscriptionSettings/index.native.tsx index 219bbde8418a..1d6dde59d83e 100644 --- a/src/pages/settings/Subscription/SubscriptionSettings/index.native.tsx +++ b/src/pages/settings/Subscription/SubscriptionSettings/index.native.tsx @@ -23,7 +23,7 @@ import useThemeStyles from '@hooks/useThemeStyles'; import {openLink} from '@libs/actions/Link'; import {convertToShortDisplayString} from '@libs/CurrencyUtils'; import {isPolicyAdmin} from '@libs/PolicyUtils'; -import {getSubscriptionPrice, isSubscriptionTypeOfInvoicing} from '@libs/SubscriptionUtils'; +import {getSubscriptionPrice, isSubscriptionTypeOfInvoicing, shouldUseSimplifiedCollectSubscriptionUI} from '@libs/SubscriptionUtils'; import type {SkeletonSpanReasonAttributes} from '@libs/telemetry/useSkeletonSpan'; import Navigation from '@navigation/Navigation'; import NotFoundPage from '@pages/ErrorPage/NotFoundPage'; @@ -53,7 +53,7 @@ function SubscriptionSettings() { upper: convertToShortDisplayString(subscriptionPrice * CONST.SUBSCRIPTION_PRICE_FACTOR, preferredCurrency), }); const adminsChatReportID = isActivePolicyAdmin && activePolicy?.chatReportIDAdmins ? activePolicy.chatReportIDAdmins?.toString() : undefined; - const isCollect = subscriptionPlan === CONST.POLICY.TYPE.TEAM; + const shouldUseSimplifiedCollectUI = shouldUseSimplifiedCollectSubscriptionUI(subscriptionPlan, hasTeam2025Pricing); const collectPriceDisplay = convertToShortDisplayString(subscriptionPrice, preferredCurrency); const openAdminsRoom = () => { @@ -100,7 +100,7 @@ function SubscriptionSettings() { /> {translate('subscription.mobileReducedFunctionalityMessage')} - {isCollect ? ( + {shouldUseSimplifiedCollectUI ? ( <> {translate('subscription.subscriptionSettings.collectBillingDescription')} diff --git a/src/pages/settings/Subscription/SubscriptionSettings/index.tsx b/src/pages/settings/Subscription/SubscriptionSettings/index.tsx index 4386da60d98e..d3722986fb9c 100644 --- a/src/pages/settings/Subscription/SubscriptionSettings/index.tsx +++ b/src/pages/settings/Subscription/SubscriptionSettings/index.tsx @@ -32,7 +32,7 @@ import useThemeStyles from '@hooks/useThemeStyles'; import {openLink} from '@libs/actions/Link'; import {convertToShortDisplayString} from '@libs/CurrencyUtils'; import {isPolicyAdmin} from '@libs/PolicyUtils'; -import {getSubscriptionPrice, isSubscriptionTypeOfInvoicing} from '@libs/SubscriptionUtils'; +import {getSubscriptionPrice, isSubscriptionTypeOfInvoicing, shouldUseSimplifiedCollectSubscriptionUI} from '@libs/SubscriptionUtils'; import type {SkeletonSpanReasonAttributes} from '@libs/telemetry/useSkeletonSpan'; import Navigation from '@navigation/Navigation'; import NotFoundPage from '@pages/ErrorPage/NotFoundPage'; @@ -86,7 +86,7 @@ function SubscriptionSettings() { upper: convertToShortDisplayString(subscriptionPrice * CONST.SUBSCRIPTION_PRICE_FACTOR, preferredCurrency), }); const adminsChatReportID = isActivePolicyAdmin && activePolicy?.chatReportIDAdmins ? activePolicy.chatReportIDAdmins?.toString() : undefined; - const isCollect = subscriptionPlan === CONST.POLICY.TYPE.TEAM; + const shouldUseSimplifiedCollectUI = shouldUseSimplifiedCollectSubscriptionUI(subscriptionPlan, hasTeam2025Pricing); const collectPriceDisplay = convertToShortDisplayString(subscriptionPrice, preferredCurrency); const onOptionSelected = (option: SubscriptionType) => { @@ -229,7 +229,7 @@ function SubscriptionSettings() { onBackButtonPress={() => Navigation.goBack()} /> - {isCollect ? ( + {shouldUseSimplifiedCollectUI ? ( <> {translate('subscription.subscriptionSettings.collectBillingDescription')} diff --git a/tests/unit/SubscriptionUtilsTest.ts b/tests/unit/SubscriptionUtilsTest.ts index 3dc8482cf6be..5482e3bb7d7a 100644 --- a/tests/unit/SubscriptionUtilsTest.ts +++ b/tests/unit/SubscriptionUtilsTest.ts @@ -19,6 +19,7 @@ import { shouldShowDiscountBanner, shouldShowPreTrialBillingBanner, shouldShowTrialEndedUI, + shouldUseSimplifiedCollectSubscriptionUI, } from '@libs/SubscriptionUtils'; import {getPrivatePromoDiscountInfo} from '@pages/settings/Subscription/utils'; import CONST from '@src/CONST'; @@ -1098,6 +1099,24 @@ describe('SubscriptionUtils', () => { }); }); + describe('shouldUseSimplifiedCollectSubscriptionUI', () => { + it('returns false for Team workspaces with Team 2025 pricing', () => { + expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, true)).toBeFalsy(); + }); + + it('returns true for Team workspaces without Team 2025 pricing', () => { + expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, false)).toBeTruthy(); + }); + + it('returns false for Corporate workspaces without Team 2025 pricing', () => { + expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.CORPORATE, false)).toBeFalsy(); + }); + + it('returns false for Corporate workspaces with Team 2025 pricing', () => { + expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.CORPORATE, true)).toBeFalsy(); + }); + }); + describe('getEarlyDiscountInfo', () => { const TEST_DATE = new Date(); From da97d6a4274a86252c5b99ac5e76d56b16bc5e33 Mon Sep 17 00:00:00 2001 From: emkhalid Date: Thu, 16 Apr 2026 18:56:00 +0430 Subject: [PATCH 2/5] fix(subscription): use simplified UI only for Team 2025 Collect workspaces --- src/libs/SubscriptionUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts index 7166d187475d..f8f634be6541 100644 --- a/src/libs/SubscriptionUtils.ts +++ b/src/libs/SubscriptionUtils.ts @@ -515,7 +515,7 @@ function getSubscriptionPrice( } function shouldUseSimplifiedCollectSubscriptionUI(plan: PersonalPolicyTypeExcludedProps | null, hasTeam2025Pricing: boolean): boolean { - return plan === CONST.POLICY.TYPE.TEAM && !hasTeam2025Pricing; + return plan === CONST.POLICY.TYPE.TEAM && hasTeam2025Pricing; } function getSubscriptionPlanInfo( From 314ed5052a8f411aefd39c7fadc569bf86dd08a2 Mon Sep 17 00:00:00 2001 From: emkhalid Date: Thu, 16 Apr 2026 19:21:55 +0430 Subject: [PATCH 3/5] test: fix outdated jest expectations for Collect subscription UI gate --- tests/unit/SubscriptionUtilsTest.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit/SubscriptionUtilsTest.ts b/tests/unit/SubscriptionUtilsTest.ts index 5482e3bb7d7a..3abbc0a9e105 100644 --- a/tests/unit/SubscriptionUtilsTest.ts +++ b/tests/unit/SubscriptionUtilsTest.ts @@ -1100,12 +1100,12 @@ describe('SubscriptionUtils', () => { }); describe('shouldUseSimplifiedCollectSubscriptionUI', () => { - it('returns false for Team workspaces with Team 2025 pricing', () => { - expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, true)).toBeFalsy(); + it('returns true for Team workspaces with Team 2025 pricing', () => { + expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, true)).toBeTruthy(); }); - it('returns true for Team workspaces without Team 2025 pricing', () => { - expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, false)).toBeTruthy(); + it('returns false for Team workspaces without Team 2025 pricing', () => { + expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, false)).toBeFalsy(); }); it('returns false for Corporate workspaces without Team 2025 pricing', () => { From 76bb70f5cb3146912a87f24a6a534c22315d84a0 Mon Sep 17 00:00:00 2001 From: emkhalid Date: Sun, 19 Apr 2026 18:36:37 +0430 Subject: [PATCH 4/5] fix(subscription): restore Collect UI gate per reviewer feedback --- src/libs/SubscriptionUtils.ts | 2 +- tests/unit/SubscriptionUtilsTest.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts index efb3b0c02af2..4788b5cba043 100644 --- a/src/libs/SubscriptionUtils.ts +++ b/src/libs/SubscriptionUtils.ts @@ -516,7 +516,7 @@ function getSubscriptionPrice( } function shouldUseSimplifiedCollectSubscriptionUI(plan: PersonalPolicyTypeExcludedProps | null, hasTeam2025Pricing: boolean): boolean { - return plan === CONST.POLICY.TYPE.TEAM && hasTeam2025Pricing; + return plan === CONST.POLICY.TYPE.TEAM && !hasTeam2025Pricing; } function getSubscriptionPlanInfo( diff --git a/tests/unit/SubscriptionUtilsTest.ts b/tests/unit/SubscriptionUtilsTest.ts index f896ef387c48..8863b6109e1b 100644 --- a/tests/unit/SubscriptionUtilsTest.ts +++ b/tests/unit/SubscriptionUtilsTest.ts @@ -1102,12 +1102,12 @@ describe('SubscriptionUtils', () => { }); describe('shouldUseSimplifiedCollectSubscriptionUI', () => { - it('returns true for Team workspaces with Team 2025 pricing', () => { - expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, true)).toBeTruthy(); + it('returns false for Team workspaces with Team 2025 pricing', () => { + expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, true)).toBeFalsy(); }); - it('returns false for Team workspaces without Team 2025 pricing', () => { - expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, false)).toBeFalsy(); + it('returns true for Team workspaces without Team 2025 pricing', () => { + expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, false)).toBeTruthy(); }); it('returns false for Corporate workspaces without Team 2025 pricing', () => { From a27f9a46a85387f80e4ebc6d1fd1c3cb3dd347a8 Mon Sep 17 00:00:00 2001 From: emkhalid Date: Mon, 20 Apr 2026 18:35:56 +0430 Subject: [PATCH 5/5] fix(subscription): restore Team 2025 Collect UI gate --- src/libs/SubscriptionUtils.ts | 2 +- tests/unit/SubscriptionUtilsTest.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts index 4788b5cba043..efb3b0c02af2 100644 --- a/src/libs/SubscriptionUtils.ts +++ b/src/libs/SubscriptionUtils.ts @@ -516,7 +516,7 @@ function getSubscriptionPrice( } function shouldUseSimplifiedCollectSubscriptionUI(plan: PersonalPolicyTypeExcludedProps | null, hasTeam2025Pricing: boolean): boolean { - return plan === CONST.POLICY.TYPE.TEAM && !hasTeam2025Pricing; + return plan === CONST.POLICY.TYPE.TEAM && hasTeam2025Pricing; } function getSubscriptionPlanInfo( diff --git a/tests/unit/SubscriptionUtilsTest.ts b/tests/unit/SubscriptionUtilsTest.ts index 8863b6109e1b..f896ef387c48 100644 --- a/tests/unit/SubscriptionUtilsTest.ts +++ b/tests/unit/SubscriptionUtilsTest.ts @@ -1102,12 +1102,12 @@ describe('SubscriptionUtils', () => { }); describe('shouldUseSimplifiedCollectSubscriptionUI', () => { - it('returns false for Team workspaces with Team 2025 pricing', () => { - expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, true)).toBeFalsy(); + it('returns true for Team workspaces with Team 2025 pricing', () => { + expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, true)).toBeTruthy(); }); - it('returns true for Team workspaces without Team 2025 pricing', () => { - expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, false)).toBeTruthy(); + it('returns false for Team workspaces without Team 2025 pricing', () => { + expect(shouldUseSimplifiedCollectSubscriptionUI(CONST.POLICY.TYPE.TEAM, false)).toBeFalsy(); }); it('returns false for Corporate workspaces without Team 2025 pricing', () => {