From 9fcaace8edda15373f9828c94d0aac5c108d456a Mon Sep 17 00:00:00 2001
From: ConnorYoh <40631091+ConnorYoh@users.noreply.github.com>
Date: Tue, 25 Nov 2025 14:58:33 +0000
Subject: [PATCH] Make sure license gets pushed and saved for default license
 replacements (#5001)

---
 .../config/configSections/AdminPlanSection.tsx      | 13 -------------
 .../src/proprietary/contexts/CheckoutContext.tsx    |  3 ++-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/frontend/src/proprietary/components/shared/config/configSections/AdminPlanSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/AdminPlanSection.tsx
index 70300ef39..52e20a6d0 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/AdminPlanSection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/AdminPlanSection.tsx
@@ -9,7 +9,6 @@ import AvailablePlansSection from '@app/components/shared/config/configSections/
 import StaticPlanSection from '@app/components/shared/config/configSections/plan/StaticPlanSection';
 import { alert } from '@app/components/toast';
 import LocalIcon from '@app/components/shared/LocalIcon';
-import { ManageBillingButton } from '@app/components/shared/ManageBillingButton';
 import { InfoBanner } from '@app/components/shared/InfoBanner';
 import { useLicenseAlert } from '@app/hooks/useLicenseAlert';
 import { isSupabaseConfigured } from '@app/services/supabaseClient';
@@ -223,18 +222,6 @@ const AdminPlanSection: React.FC = () => {
           buttonColor="orange.7"
         />
       )}
-      {/* Manage Subscription Button - Only show if user has active license and Supabase is configured */}
-      {licenseInfo?.licenseKey && isSupabaseConfigured && (
-        <Paper withBorder p="md" radius="md">
-          <Group justify="space-between" align="center">
-            <Text size="sm" c="dimmed">
-              {t('plan.manageSubscription.description', 'Manage your subscription, billing, and payment methods')}
-            </Text>
-            <ManageBillingButton />
-          </Group>
-        </Paper>
-      )}
-
       <AvailablePlansSection
         plans={plans}
         currentLicenseInfo={licenseInfo}
diff --git a/frontend/src/proprietary/contexts/CheckoutContext.tsx b/frontend/src/proprietary/contexts/CheckoutContext.tsx
index 13f753199..f8c544934 100644
--- a/frontend/src/proprietary/contexts/CheckoutContext.tsx
+++ b/frontend/src/proprietary/contexts/CheckoutContext.tsx
@@ -79,7 +79,8 @@ export const CheckoutProvider: React.FC<CheckoutProviderProps> = ({
         }
 
         // Check if this is an upgrade or new subscription
-        if (licenseInfo?.licenseKey) {
+        // Only treat as upgrade if there's a valid PRO/ENTERPRISE license (not NORMAL/free tier)
+        if (licenseInfo?.licenseType && licenseInfo.licenseType !== 'NORMAL') {
           // UPGRADE: Resync existing license with Keygen
           console.log('Upgrade detected - resyncing existing license');