From b042ed113dfdcd1dbbbfe5d04bf6b220c79f4b9a Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Wed, 18 Jun 2025 04:23:55 +0000
Subject: [PATCH] more fixes

---
 .../billing/alerts/projectsLimit.svelte       |  3 ++-
 .../billing/alerts/selectProjectCloud.svelte  | 22 +++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/lib/components/billing/alerts/projectsLimit.svelte b/src/lib/components/billing/alerts/projectsLimit.svelte
index 7a028a25c..6723c187a 100644
--- a/src/lib/components/billing/alerts/projectsLimit.svelte
+++ b/src/lib/components/billing/alerts/projectsLimit.svelte
@@ -16,13 +16,14 @@
 <SelectProjectCloud bind:showSelectProject />
 
 {#if $currentPlan && $currentPlan.projects > 0 && !hideBillingHeaderRoutes.includes(page.url.pathname)}
-    <HeaderAlert title="Action required: You have more than {$currentPlan.projects} projects.">
+    <HeaderAlert type="warning" title="Action required: You have more than {$currentPlan.projects} projects.">
         <svelte:fragment>
             Choose which projects to keep before {billingProjectsLimitDate} or upgrade to Pro. Projects
             over the limit will be blocked after this date.
         </svelte:fragment>
         <svelte:fragment slot="buttons">
             <Button
+                compact
                 text
                 on:click={() => {
                     showSelectProject = true;
diff --git a/src/lib/components/billing/alerts/selectProjectCloud.svelte b/src/lib/components/billing/alerts/selectProjectCloud.svelte
index 24d5f4119..4c8518694 100644
--- a/src/lib/components/billing/alerts/selectProjectCloud.svelte
+++ b/src/lib/components/billing/alerts/selectProjectCloud.svelte
@@ -34,7 +34,7 @@
             invalidate(Dependencies.ORGANIZATION);
             addNotification({
                 type: 'success',
-                message: `Updated selected projects to keep`
+                message: `Projects updated for archiving`
             });
         } catch (e) {
             error = e.message;
@@ -44,7 +44,7 @@
 
 <Modal bind:show={showSelectProject} title={'Manage projects'} onSubmit={updateSelected}>
     <svelte:fragment slot="description">
-        Choose which two projects over will be blocked after this date.
+        Choose which two projects to keep. Projects over the limit will be blocked after this date.
     </svelte:fragment>
     {#if error}
         <Alert.Inline status="error" title="Error">{error}</Alert.Inline>
@@ -76,18 +76,18 @@
         <Alert.Inline
             status="warning"
             title={`${projects.length - selectedProjects.length} projects will be archived on ${billingProjectsLimitDate}`}>
-            {#each projectsToArchive as project, index}{@const text = `<b>${project.name}</b>`}
-                {@html text}{index == projectsToArchive.length - 2
-                    ? ', and '
-                    : index < projectsToArchive.length - 1
-                      ? ', '
-                      : ''}
-            {/each} will be archived.
+            <span>
+                {#each projectsToArchive as project, index}
+                    {@const text = `${index === 0 ? '' : ' '}<b>${project.name}</b> `}
+                    {@html text}{#if index < projectsToArchive.length - 1}{#if index == projectsToArchive.length - 2} and {/if}{#if index < projectsToArchive.length - 2}, {/if}{/if}
+                {/each}
+                will be archived.
+            </span>
         </Alert.Inline>
     {/if}
     <svelte:fragment slot="footer">
-        <Button.Button variant="secondary" on:click={() => (showSelectProject = false)}
+        <Button.Button size="s" variant="secondary" on:click={() => (showSelectProject = false)}
             >Cancel</Button.Button>
-        <Button.Button disabled={selectedProjects.length !== 2}>Save</Button.Button>
+        <Button.Button size="s" disabled={selectedProjects.length !== 2}>Save</Button.Button>
     </svelte:fragment>
 </Modal>