fix: isFreePlan behaving wrongly

classroomio · Sep 12, 2024 · eea6ac5 · eea6ac5
1 parent bb3eb4c
commit eea6ac5
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/apps/dashboard/src/lib/utils/store/org.ts b/apps/dashboard/src/lib/utils/store/org.ts
@@ -32,9 +32,11 @@ export const orgAudience = writable<OrgAudience[]>([]);
 export const orgTeam = writable<OrgTeamMember[]>([]);
 export const isOrgAdmin = derived(currentOrg, ($currentOrg) => $currentOrg.role_id === ROLE.ADMIN);
 
-export const currentOrgPlan = derived(currentOrg, ($currentOrg) =>
-  $currentOrg.organization_plan.find((p) => p.is_active)
-);
+const getActivePlan = (org: CurrentOrg) => {
+  return org.organization_plan.find((p) => p.is_active);
+};
+
+export const currentOrgPlan = derived(currentOrg, ($currentOrg) => getActivePlan($currentOrg));
 
 export const currentOrgPath = derived(currentOrg, ($currentOrg) =>
   $currentOrg.siteName ? `/org/${$currentOrg.siteName}` : ''
@@ -51,11 +53,14 @@ export const currentOrgDomain = derived(currentOrg, ($currentOrg) => {
         : '';
 });
 
-export const isFreePlan = derived(currentOrgPlan, ($plan) => {
-  if (!$plan) return false;
+export const isFreePlan = derived(currentOrg, ($currentOrg) => {
+  if (!$currentOrg.id) return false;
 
-  return !$plan || $plan.plan_name === PLAN.BASIC;
+  const plan = getActivePlan($currentOrg);
+
+  return !plan || plan.plan_name === PLAN.BASIC;
 });
+
 export const currentOrgMaxAudience = derived(currentOrgPlan, ($plan) =>
   !$plan
     ? 20