ref: Migrate off isProPlan helper and onto GQL isProPlan

src/pages/AccountSettings/AccountSettings.test.jsx

@@ -163,6 +163,7 @@ describe('AccountSettings', () => {
                 value: planValue,
                 isEnterprisePlan: planValue === Plans.USERS_ENTERPRISEM,
                 isFreePlan: planValue === Plans.USERS_BASIC,
+                isProPlan: false,
               },
             },
           },

src/pages/AccountSettings/AccountSettingsSideMenu.test.jsx

@@ -151,6 +151,7 @@ describe('AccountSettingsSideMenu', () => {
                 value: planValue,
                 isEnterprisePlan: planValue === Plans.USERS_ENTERPRISEM,
                 isFreePlan: planValue === Plans.USERS_BASIC,
+                isProPlan: false,
               },
             },
           },

src/pages/DefaultOrgSelector/DefaultOrgSelector.test.jsx

@@ -214,6 +214,7 @@ describe('DefaultOrgSelector', () => {
                 ...mockTrialData,
                 isEnterprisePlan: false,
                 isFreePlan: false,
+                isProPlan: false,
                 trialStatus,
                 value,
               },

src/pages/MembersPage/MembersActivation/Activation/Activation.test.jsx

@@ -28,6 +28,7 @@ const mockedAccountDetails = {
 const mockPlanData = {
   isEnterprisePlan: false,
   isFreePlan: true,
+  isProPlan: false,
   baseUnitPrice: 10,
   benefits: [],
   billingRate: BillingRate.MONTHLY,

src/pages/MembersPage/MembersActivation/MembersActivation.test.jsx

@@ -42,6 +42,7 @@ const mockPlanData = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: false,
 }
 
 const server = setupServer()

src/pages/MembersPage/MembersList/MembersList.test.jsx

@@ -52,6 +52,7 @@ const mockActiveUserRequest = {
 
 const mockPlanData = {
   isEnterprisePlan: false,
+  isProPlan: false,
   baseUnitPrice: 10,
   benefits: [],
   billingRate: 'monthly',

src/pages/MembersPage/MembersList/MembersTable/MembersTable.test.jsx

@@ -91,6 +91,7 @@ const queryClient = new QueryClient({
 
 const mockPlanData = {
   isEnterprisePlan: false,
+  isProPlan: false,
   baseUnitPrice: 10,
   benefits: [],
   billingRate: 'monthly',

src/pages/OwnerPage/HeaderBanners/ExceededUploadsAlert/ExceededUploadsAlert.test.jsx

@@ -39,6 +39,7 @@ const mockPlanDataResponse = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: false,
 }
 
 beforeAll(() => {

src/pages/OwnerPage/HeaderBanners/HeaderBanners.test.jsx

@@ -42,6 +42,7 @@ const mockPlanDataResponse = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: false,
 }
 
 const mockPlanDataResponseNoUploadLimit = {

src/pages/OwnerPage/HeaderBanners/ReachingUploadLimitAlert/ReachingUploadLimitAlert.test.jsx

@@ -32,6 +32,7 @@ const mockPlanDataResponse = {
   value: Plans.USERS_PR_INAPPM,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: false,
   trialStatus: TrialStatuses.NOT_STARTED,
   trialStartDate: '',
   trialEndDate: '',

src/pages/OwnerPage/Tabs/TrialReminder/TrialReminder.test.tsx

@@ -40,6 +40,7 @@ const mockResponse = {
   planUserCount: 1,
   hasSeatsLeft: true,
   isEnterprisePlan: false,
+  isProPlan: false,
 }
 
 const wrapper: React.FC<React.PropsWithChildren> = ({ children }) => {

src/pages/PlanPage/subRoutes/CancelPlanPage/CancelPlanPage.test.tsx

@@ -80,6 +80,7 @@ const mockPlanData = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: false,
 }
 
 const queryClient = new QueryClient({
@@ -158,6 +159,7 @@ describe('CancelPlanPage', () => {
                 value: planValue,
                 isEnterprisePlan: planValue === Plans.USERS_ENTERPRISEM,
                 isFreePlan: planValue === Plans.USERS_BASIC,
+                isProPlan: planValue === Plans.USERS_PR_INAPPM,
               },
             },
           },

src/pages/PlanPage/subRoutes/CancelPlanPage/CancelPlanPage.tsx

@@ -11,7 +11,6 @@ import {
 } from 'services/account'
 import {
   BillingRate,
-  isProPlan,
   isTrialPlan,
   shouldDisplayTeamCard,
 } from 'shared/utils/billing'
@@ -55,7 +54,7 @@ function CancelPlanPage() {
     !accountDetailsData?.subscriptionDetail?.customer?.discount
   const showSpecialOffer = discountNotApplied && isMonthlyPlan
   const showTeamSpecialOffer =
-    shouldDisplayTeamCard({ plans }) && isProPlan(planData?.plan?.value)
+    shouldDisplayTeamCard({ plans }) && planData?.plan?.isProPlan
   const showCancelPage = showSpecialOffer || showTeamSpecialOffer
 
   let redirectTo = `/plan/${provider}/${owner}/cancel/downgrade`

src/pages/PlanPage/subRoutes/CancelPlanPage/subRoutes/DowngradePlan/DowngradePlan.test.jsx

@@ -30,6 +30,7 @@ const mockPlanData = {
     hasPrivateRepos: true,
     plan: {
       isEnterprisePlan: false,
+      isProPlan: false,
       baseUnitPrice: 10,
       benefits: [],
       billingRate: 'monthly',

src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentOrgPlan.test.tsx

@@ -52,6 +52,7 @@ const mockPlanDataResponse = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: false,
 }
 
 const mockEnterpriseAccountDetailsNinetyPercent = {

src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/CurrentPlanCard.test.tsx

@@ -26,6 +26,7 @@ const proPlanDetails = {
     billingRate: null,
     isEnterprisePlan: false,
     isFreePlan: false,
+    isProPlan: true,
   },
 }
 
@@ -42,6 +43,7 @@ const freePlanDetails = {
     ],
     isEnterprisePlan: false,
     isFreePlan: true,
+    isProPlan: false,
   },
 }
 
@@ -58,6 +60,7 @@ const enterprisePlan = {
     ],
     isEnterprisePlan: true,
     isFreePlan: false,
+    isProPlan: false,
   },
 }
 
@@ -74,6 +77,7 @@ const usesInvoiceTeamPlan = {
     ],
     isEnterprisePlan: false,
     isFreePlan: false,
+    isProPlan: false,
   },
   usesInvoice: true,
 }
@@ -88,6 +92,7 @@ const trialPlanDetails = {
     value: Plans.USERS_TRIAL,
     isEnterprisePlan: false,
     isFreePlan: false,
+    isProPlan: false,
   },
 }
 

src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.test.jsx

@@ -127,6 +127,7 @@ const freePlan = {
   monthlyUploadLimit: null,
   isFreePlan: true,
   isEnterprisePlan: false,
+  isProPlan: false,
 }
 
 const scheduledPhase = {
@@ -150,6 +151,7 @@ const mockPlanData = {
   planUserCount: 1,
   hasSeatsLeft: true,
   isEnterprisePlan: false,
+  isProPlan: false,
 }
 
 const mockPreTrialPlanInfo = {

src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/PlanUpgradePro/PlanUpgradePro.jsx

@@ -2,7 +2,7 @@ import PropType from 'prop-types'
 
 import { planPropType } from 'services/account'
 import BenefitList from 'shared/plan/BenefitList'
-import { findSentryPlans, useProPlans } from 'shared/utils/billing'
+import { findProPlans, findSentryPlans } from 'shared/utils/billing'
 import { SENTRY_PRICE } from 'shared/utils/upgradeForm'
 
 import ActionsBilling from '../../shared/ActionsBilling/ActionsBilling'
@@ -49,7 +49,7 @@ PlanDetails.propTypes = {
 }
 
 function PlanUpgradePro({ isSentryUpgrade, plans }) {
-  const { proPlanMonth, proPlanYear } = useProPlans({ plans })
+  const { proPlanMonth, proPlanYear } = findProPlans({ plans })
   const { sentryPlanYear } = findSentryPlans({ plans })
 
   const upgradeToPlan = isSentryUpgrade ? sentryPlanYear : proPlanMonth

src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/PlanUpgradeTeam/PlanUpgradeTeam.test.jsx

@@ -15,6 +15,7 @@ vi.mock('shared/plan/BenefitList', () => ({ default: () => 'BenefitsList' }))
 const mockPlanBasic = {
   isEnterprisePlan: false,
   isFreePlan: true,
+  isProPlan: false,
   baseUnitPrice: 0,
   benefits: ['Up to # user', 'Unlimited public repositories'],
   billingRate: BillingRate.MONTHLY,
@@ -32,6 +33,7 @@ const mockPlanBasic = {
 
 const mockPlanPro = {
   isEnterprisePlan: false,
+  isProPlan: true,
   isFreePlan: false,
   baseUnitPrice: 10,
   benefits: ['Up to # user', 'Unlimited public repositories'],
@@ -51,6 +53,7 @@ const mockPlanPro = {
 const mockPlanTrialing = {
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: false,
   baseUnitPrice: 10,
   benefits: ['Up to # user', 'Unlimited public repositories'],
   billingRate: BillingRate.MONTHLY,

src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/ProPlanSubheading/ProPlanSubheading.test.tsx

@@ -24,6 +24,7 @@ const mockResponse = {
   planUserCount: 1,
   hasSeatsLeft: true,
   isEnterprisePlan: false,
+  isProPlan: false,
   isFreePlan: true,
 }
 

src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/PaidPlanCard/PaidPlanCard.test.tsx

@@ -29,6 +29,7 @@ vi.mock('shared/plan/ScheduledPlanDetails', () => ({
 
 const mockProPlan = {
   isEnterprisePlan: false,
+  isProPlan: true,
   isFreePlan: false,
   marketingName: 'Pro',
   value: Plans.USERS_PR_INAPPM,
@@ -48,6 +49,7 @@ const mockProPlan = {
 const mockTeamPlan = {
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: false,
   marketingName: 'Team',
   value: Plans.USERS_TEAMM,
   billingRate: BillingRate.MONTHLY,

src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/shared/ActionsBilling/ActionsBilling.test.jsx

@@ -164,6 +164,8 @@ const mockTrialData = {
     planUserCount: 1,
     hasSeatsLeft: true,
     isEnterprisePlan: false,
+    isProPlan: false,
+    isFreePlan: true,
   },
 }
 

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeDetails/ProPlanDetails/ProPlanDetails.test.jsx

@@ -130,6 +130,7 @@ const mockPlanData = {
   planUserCount: 1,
   hasSeatsLeft: true,
   isEnterprisePlan: false,
+  isProPlan: false,
 }
 
 const server = setupServer()

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeDetails/SentryPlanDetails/SentryPlanDetails.test.jsx

@@ -127,6 +127,7 @@ const mockPlanData = {
   planUserCount: 1,
   hasSeatsLeft: true,
   isEnterprisePlan: false,
+  isProPlan: false,
 }
 
 const server = setupServer()

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeDetails/TeamPlanDetails/TeamPlanDetails.test.jsx

@@ -93,6 +93,7 @@ const mockPlanData = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: false,
 }
 
 const server = setupServer()

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/ProPlanController/BillingOptions/BillingOptions.test.tsx

@@ -70,6 +70,7 @@ const mockPlanDataResponse = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: true,
 }
 
 const server = setupServer()

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/ProPlanController/ProPlanController.test.tsx

@@ -129,6 +129,7 @@ const mockPlanDataResponseMonthly = {
   planUserCount: 1,
   hasSeatsLeft: true,
   isEnterprisePlan: false,
+  isProPlan: true,
   isFreePlan: false,
 }
 
@@ -147,6 +148,7 @@ const mockPlanDataResponseYearly = {
   planUserCount: 1,
   hasSeatsLeft: true,
   isEnterprisePlan: false,
+  isProPlan: true,
   isFreePlan: false,
 }
 

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/SentryPlanController/BillingOptions/BillingOptions.test.tsx

@@ -70,6 +70,7 @@ const mockPlanDataResponse = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: true,
 }
 
 const server = setupServer()

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/SentryPlanController/SentryPlanController.test.tsx

@@ -116,6 +116,7 @@ const mockPlanDataResponseMonthly = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: true,
 }
 
 const mockPlanDataResponseYearly = {
@@ -134,6 +135,7 @@ const mockPlanDataResponseYearly = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: true,
 }
 
 const queryClient = new QueryClient({

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/TeamPlanController/BillingOptions/BillingOptions.test.tsx

@@ -60,6 +60,7 @@ const mockPlanDataResponse = {
   planUserCount: 1,
   hasSeatsLeft: true,
   isFreePlan: false,
+  isProPlan: false,
 }
 
 const server = setupServer()

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/TeamPlanController/ErrorBanner/ErrorBanner.test.tsx

@@ -134,6 +134,7 @@ describe('ErrorBanner', () => {
           planUserCount: 1,
           isEnterprisePlan: false,
           isFreePlan: false,
+          isProPlan: false,
         }
         if (planValue === Plans.USERS_BASIC) {
           return HttpResponse.json({

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/TeamPlanController/TeamPlanController.test.tsx

@@ -115,6 +115,7 @@ const mockPlanDataResponseMonthly = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: false,
 }
 
 const mockPlanDataResponseYearly = {
@@ -133,6 +134,7 @@ const mockPlanDataResponseYearly = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isProPlan: false,
 }
 
 const queryClient = new QueryClient({

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/PlanTypeOptions/PlanTypeOptions.test.tsx

@@ -189,14 +189,15 @@ describe('PlanTypeOptions', () => {
           planUserCount: 1,
           isEnterprisePlan: false,
           isFreePlan: false,
+          isProPlan: false,
         }
         if (planValue === Plans.USERS_BASIC) {
           return HttpResponse.json({
             data: { plan: { ...basicPlan, ...planChunk } },
           })
         } else if (planValue === Plans.USERS_PR_INAPPY) {
           return HttpResponse.json({
-            data: { plan: { ...proPlanYear, ...planChunk } },
+            data: { plan: { ...proPlanYear, ...planChunk, isProPlan: true } },
           })
         } else if (planValue === Plans.USERS_TRIAL) {
           return HttpResponse.json({
@@ -212,7 +213,9 @@ describe('PlanTypeOptions', () => {
           })
         } else if (planValue === Plans.USERS_SENTRYY) {
           return HttpResponse.json({
-            data: { plan: { ...sentryPlanYear, ...planChunk } },
+            data: {
+              plan: { ...sentryPlanYear, ...planChunk, isProPlan: true },
+            },
           })
         }
       })