From ce06db539ffdab4b546c6cabdafd3c68c0370fc1 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 1 Sep 2025 20:00:01 +0530
Subject: [PATCH] fix: messages and bug.

---
 src/lib/components/billing/alerts/projectsLimit.svelte | 10 ++++------
 .../billing/alerts/selectProjectCloud.svelte           |  5 ++++-
 src/lib/components/organizationUsageLimits.svelte      |  4 +++-
 .../(console)/organization-[organization]/+page.svelte |  5 ++++-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/lib/components/billing/alerts/projectsLimit.svelte b/src/lib/components/billing/alerts/projectsLimit.svelte
index a5e5d81e7..c6d8d9f5d 100644
--- a/src/lib/components/billing/alerts/projectsLimit.svelte
+++ b/src/lib/components/billing/alerts/projectsLimit.svelte
@@ -3,10 +3,7 @@
     import { Click } from '$lib/actions/analytics';
     import { Button } from '$lib/elements/forms';
     import { HeaderAlert } from '$lib/layout';
-    import {
-        hideBillingHeaderRoutes,
-        upgradeURL
-    } from '$lib/stores/billing';
+    import { hideBillingHeaderRoutes, upgradeURL } from '$lib/stores/billing';
     import { currentPlan, organization } from '$lib/stores/organization';
     import SelectProjectCloud from './selectProjectCloud.svelte';
     import { toLocaleDate } from '$lib/helpers/date';
@@ -30,8 +27,9 @@
         type="warning"
         title="Action required: You have more than {$currentPlan.projects} projects.">
         <svelte:fragment>
-            Choose which projects to keep before {toLocaleDate($organization.billingNextInvoiceDate)} or upgrade
-            to Pro. Projects over the limit will be blocked after this date.
+            Choose which projects to keep before {toLocaleDate(
+                $organization.billingNextInvoiceDate
+            )} or upgrade to Pro. Projects over the limit will be blocked after this date.
         </svelte:fragment>
         <svelte:fragment slot="buttons">
             <Button
diff --git a/src/lib/components/billing/alerts/selectProjectCloud.svelte b/src/lib/components/billing/alerts/selectProjectCloud.svelte
index 66c1b04fa..510334aa2 100644
--- a/src/lib/components/billing/alerts/selectProjectCloud.svelte
+++ b/src/lib/components/billing/alerts/selectProjectCloud.svelte
@@ -148,9 +148,12 @@
         {/if}
 
         {#if selectedProjects.length === $currentPlan?.projects}
+            {@const difference = projects.length - selectedProjects.length}
+            {@const messagePrefix =
+                difference > 1 ? `${difference} projects` : `${difference} project`}
             <Alert.Inline
                 status="warning"
-                title={`${projects.length - selectedProjects.length} projects will be archived on ${toLocaleDate($organization.billingNextInvoiceDate)}`}>
+                title={`${messagePrefix} will be archived on ${toLocaleDate($organization.billingNextInvoiceDate)}`}>
                 <span>
                     {@html formatProjectsToArchive()}
                     will be archived.
diff --git a/src/lib/components/organizationUsageLimits.svelte b/src/lib/components/organizationUsageLimits.svelte
index 1f240f479..b26fbc3d2 100644
--- a/src/lib/components/organizationUsageLimits.svelte
+++ b/src/lib/components/organizationUsageLimits.svelte
@@ -292,9 +292,11 @@
         </Table.Root>
     </div>
     {#if selectedProjects.length === allowedProjectsToKeep}
+        {@const difference = projects.length - selectedProjects.length}
+        {@const messagePrefix = difference > 1 ? `${difference} projects` : `${difference} project`}
         <Alert.Inline
             status="warning"
-            title={`${projects.length - selectedProjects.length} projects will be archived on ${toLocaleDate($organization.billingNextInvoiceDate)}`}>
+            title={`${messagePrefix} will be archived on ${toLocaleDate($organization.billingNextInvoiceDate)}`}>
             {formatProjectsToArchive()} will be archived
         </Alert.Inline>
     {/if}
diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
index 909b1ead7..2339498ec 100644
--- a/src/routes/(console)/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -134,8 +134,11 @@
     </Layout.Stack>
 
     {#if isCloud && $currentPlan?.projects && $currentPlan?.projects > 0 && data.organization.projects.length > 0 && $canWriteProjects && (projectsToArchive.length > 0 || data.projects.total > $currentPlan.projects)}
+        {@const difference = projectsToArchive}
+        {@const messagePrefix =
+            difference.length > 1 ? `${difference} projects` : `${difference} project`}
         <Alert.Inline
-            title={`${projectsToArchive.length} projects will be archived on ${toLocaleDate($organization.billingNextInvoiceDate)}`}>
+            title={`${messagePrefix} will be archived on ${toLocaleDate($organization.billingNextInvoiceDate)}`}>
             <Typography.Text>Upgrade your plan to restore archived projects</Typography.Text>
             <svelte:fragment slot="actions">
                 <Button