From 3ba65a3311c5c2a1d05fcd78233f79941c90e13e Mon Sep 17 00:00:00 2001
From: Fred KISSIE <fredkiss3@gmail.com>
Date: Tue, 18 Nov 2025 02:35:11 +0100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20check=20for=20disabled=20f?=
 =?UTF-8?q?eatures=20in=20general=20org=20settings=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/[orgId]/settings/general/page.tsx | 45 ++++++-----------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/src/app/[orgId]/settings/general/page.tsx b/src/app/[orgId]/settings/general/page.tsx
index 84f876d0..7928dc47 100644
--- a/src/app/[orgId]/settings/general/page.tsx
+++ b/src/app/[orgId]/settings/general/page.tsx
@@ -49,9 +49,10 @@ import { useUserContext } from "@app/hooks/useUserContext";
 import { useTranslations } from "next-intl";
 import { build } from "@server/build";
 import { SwitchInput } from "@app/components/SwitchInput";
-import { SecurityFeaturesAlert } from "@app/components/SecurityFeaturesAlert";
+import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
 import { useLicenseStatusContext } from "@app/hooks/useLicenseStatusContext";
 import { useSubscriptionStatusContext } from "@app/hooks/useSubscriptionStatusContext";
+import { usePaidStatus } from "@app/hooks/usePaidStatus";
 
 // Session length options in hours
 const SESSION_LENGTH_OPTIONS = [
@@ -113,16 +114,7 @@ export default function GeneralPage() {
     const { user } = useUserContext();
     const t = useTranslations();
     const { env } = useEnvContext();
-    const { isUnlocked } = useLicenseStatusContext();
-    const subscription = useSubscriptionStatusContext();
-
-    // Check if security features are disabled due to licensing/subscription
-    const isSecurityFeatureDisabled = () => {
-        const isEnterpriseNotLicensed = build === "enterprise" && !isUnlocked();
-        const isSaasNotSubscribed =
-            build === "saas" && !subscription?.isSubscribed();
-        return isEnterpriseNotLicensed || isSaasNotSubscribed;
-    };
+    const { isPaidUser, hasSaasSubscription } = usePaidStatus();
 
     const [loadingDelete, setLoadingDelete] = useState(false);
     const [loadingSave, setLoadingSave] = useState(false);
@@ -398,9 +390,7 @@ export default function GeneralPage() {
                                                         {LOG_RETENTION_OPTIONS.filter(
                                                             (option) => {
                                                                 if (
-                                                                    build ==
-                                                                        "saas" &&
-                                                                    !subscription?.subscribed &&
+                                                                    hasSaasSubscription &&
                                                                     option.value >
                                                                         30
                                                                 ) {
@@ -428,19 +418,15 @@ export default function GeneralPage() {
                                     )}
                                 />
 
-                                {build != "oss" && (
+                                {build !== "oss" && (
                                     <>
-                                        <SecurityFeaturesAlert />
+                                        <PaidFeaturesAlert />
 
                                         <FormField
                                             control={form.control}
                                             name="settingsLogRetentionDaysAccess"
                                             render={({ field }) => {
-                                                const isDisabled =
-                                                    (build == "saas" &&
-                                                        !subscription?.subscribed) ||
-                                                    (build == "enterprise" &&
-                                                        !isUnlocked());
+                                                const isDisabled = !isPaidUser;
 
                                                 return (
                                                     <FormItem>
@@ -506,11 +492,7 @@ export default function GeneralPage() {
                                             control={form.control}
                                             name="settingsLogRetentionDaysAction"
                                             render={({ field }) => {
-                                                const isDisabled =
-                                                    (build == "saas" &&
-                                                        !subscription?.subscribed) ||
-                                                    (build == "enterprise" &&
-                                                        !isUnlocked());
+                                                const isDisabled = !isPaidUser;
 
                                                 return (
                                                     <FormItem>
@@ -590,13 +572,12 @@ export default function GeneralPage() {
                             </SettingsSectionHeader>
                             <SettingsSectionBody>
                                 <SettingsSectionForm>
-                                    <SecurityFeaturesAlert />
+                                    <PaidFeaturesAlert />
                                     <FormField
                                         control={form.control}
                                         name="requireTwoFactor"
                                         render={({ field }) => {
-                                            const isDisabled =
-                                                isSecurityFeatureDisabled();
+                                            const isDisabled = !isPaidUser;
 
                                             return (
                                                 <FormItem className="col-span-2">
@@ -643,8 +624,7 @@ export default function GeneralPage() {
                                         control={form.control}
                                         name="maxSessionLengthHours"
                                         render={({ field }) => {
-                                            const isDisabled =
-                                                isSecurityFeatureDisabled();
+                                            const isDisabled = !isPaidUser;
 
                                             return (
                                                 <FormItem className="col-span-2">
@@ -730,8 +710,7 @@ export default function GeneralPage() {
                                         control={form.control}
                                         name="passwordExpiryDays"
                                         render={({ field }) => {
-                                            const isDisabled =
-                                                isSecurityFeatureDisabled();
+                                            const isDisabled = !isPaidUser;
 
                                             return (
                                                 <FormItem className="col-span-2">