From 3d4aa4abcbbe5f341b3dfda0843693807eba5a11 Mon Sep 17 00:00:00 2001
From: "gitar-bot[bot]" <159877585+gitar-bot[bot]@users.noreply.github.com>
Date: Fri, 15 Mar 2024 11:53:30 +0200
Subject: [PATCH] [Remix] Cleaning up stale feature flag: proPlanAutoCharge
 with value true (#6581)

---
 .../billing/BillingDashboard/BillingPlan/BillingPlan.tsx     | 3 +--
 frontend/src/component/application/ApplicationOverview.tsx   | 2 +-
 frontend/src/hooks/useUsersPlan.ts                           | 5 +----
 frontend/src/interfaces/uiConfig.ts                          | 1 -
 src/lib/__snapshots__/create-config.test.ts.snap             | 1 -
 src/lib/types/experimental.ts                                | 5 -----
 6 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/frontend/src/component/admin/billing/BillingDashboard/BillingPlan/BillingPlan.tsx b/frontend/src/component/admin/billing/BillingDashboard/BillingPlan/BillingPlan.tsx
index 1d05ebc7314..6e64d9bddcb 100644
--- a/frontend/src/component/admin/billing/BillingDashboard/BillingPlan/BillingPlan.tsx
+++ b/frontend/src/component/admin/billing/BillingDashboard/BillingPlan/BillingPlan.tsx
@@ -154,8 +154,7 @@ export const BillingPlan: FC<IBillingPlanProps> = ({ instanceStatus }) => {
                 </Grid>
                 <ConditionallyRender
                     condition={Boolean(
-                        uiConfig?.flags?.proPlanAutoCharge &&
-                            instanceStatus.plan === InstancePlan.PRO,
+                        instanceStatus.plan === InstancePlan.PRO,
                     )}
                     show={
                         <>
diff --git a/frontend/src/component/application/ApplicationOverview.tsx b/frontend/src/component/application/ApplicationOverview.tsx
index d8972031b95..5edad60d403 100644
--- a/frontend/src/component/application/ApplicationOverview.tsx
+++ b/frontend/src/component/application/ApplicationOverview.tsx
@@ -16,7 +16,7 @@ import TopicOutlinedIcon from '@mui/icons-material/TopicOutlined';
 import { Badge } from '../common/Badge/Badge';
 import { useNavigate } from 'react-router-dom';
 import { usePlausibleTracker } from 'hooks/usePlausibleTracker';
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { useFeedback } from '../feedbackNew/useFeedback';
 import ReviewsOutlined from '@mui/icons-material/ReviewsOutlined';
 
diff --git a/frontend/src/hooks/useUsersPlan.ts b/frontend/src/hooks/useUsersPlan.ts
index fc8aa0f2808..e1796c59b29 100644
--- a/frontend/src/hooks/useUsersPlan.ts
+++ b/frontend/src/hooks/useUsersPlan.ts
@@ -15,10 +15,7 @@ export const useUsersPlan = (users: IUser[]): IUsersPlanOutput => {
     const { instanceStatus } = useInstanceStatus();
     const { uiConfig } = useUiConfig();
 
-    const isBillingUsers = Boolean(
-        uiConfig?.flags?.proPlanAutoCharge &&
-            instanceStatus?.plan === InstancePlan.PRO,
-    );
+    const isBillingUsers = Boolean(instanceStatus?.plan === InstancePlan.PRO);
     const seats = instanceStatus?.seats ?? 5;
 
     const planUsers = useMemo(
diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts
index 0c4a1d63086..a1a2d3989b6 100644
--- a/frontend/src/interfaces/uiConfig.ts
+++ b/frontend/src/interfaces/uiConfig.ts
@@ -51,7 +51,6 @@ export type UiFlags = {
     banner?: Variant;
     featuresExportImport?: boolean;
     caseInsensitiveInOperators?: boolean;
-    proPlanAutoCharge?: boolean;
     notifications?: boolean;
     personalAccessTokensKillSwitch?: boolean;
     demo?: boolean;
diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap
index aa2a5d490ca..67c17e68add 100644
--- a/src/lib/__snapshots__/create-config.test.ts.snap
+++ b/src/lib/__snapshots__/create-config.test.ts.snap
@@ -132,7 +132,6 @@ exports[`should create default config 1`] = `
       "newStrategyConfigurationFeedback": false,
       "outdatedSdksBanner": false,
       "personalAccessTokensKillSwitch": false,
-      "proPlanAutoCharge": false,
       "queryMissingTokens": false,
       "responseTimeMetricsFix": false,
       "responseTimeWithAppNameKillSwitch": false,
diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
index 3912973a94c..0cea6108967 100644
--- a/src/lib/types/experimental.ts
+++ b/src/lib/types/experimental.ts
@@ -16,7 +16,6 @@ export type IFlagKey =
     | 'featuresExportImport'
     | 'caseInsensitiveInOperators'
     | 'strictSchemaValidation'
-    | 'proPlanAutoCharge'
     | 'personalAccessTokensKillSwitch'
     | 'migrationLock'
     | 'demo'
@@ -104,10 +103,6 @@ const flags: IFlags = {
         process.env.UNLEASH_STRICT_SCHEMA_VALIDTION,
         false,
     ),
-    proPlanAutoCharge: parseEnvVarBoolean(
-        process.env.UNLEASH_PRO_PLAN_AUTO_CHARGE,
-        false,
-    ),
     personalAccessTokensKillSwitch: parseEnvVarBoolean(
         process.env.UNLEASH_PAT_KILL_SWITCH,
         false,