From b1fa5a1fd0d34f3a486910bf1cc4928454828bce Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Mon, 11 Dec 2023 13:17:41 +0100
Subject: [PATCH] fix: alert messages, modals

---
 src/lib/layout/containerHeader.svelte         |  8 +++----
 .../excesLimitModal.svelte                    | 23 ++++++++++++++-----
 .../planExcess.svelte                         |  6 ++++-
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/lib/layout/containerHeader.svelte b/src/lib/layout/containerHeader.svelte
index b65560090..12857fe71 100644
--- a/src/lib/layout/containerHeader.svelte
+++ b/src/lib/layout/containerHeader.svelte
@@ -87,10 +87,10 @@
             {:else}
                 <Alert type={alertType} isStandalone>
                     <span class="text">
-                        You've reached the {services} limit for the {tier} plan. You won't be able to
-                        create additional resources until you {#if $organization?.billingPlan === 'tier-0'}
-                            <Button link on:click={upgradeMethod}>upgrade</Button>.
-                        {/if}
+                        You've reached the {services} limit for the {tier} plan. <Button
+                            link
+                            on:click={upgradeMethod}>Upgrade</Button> your organization for additional
+                        resources.
                     </span>
                 </Alert>
             {/if}
diff --git a/src/routes/console/organization-[organization]/excesLimitModal.svelte b/src/routes/console/organization-[organization]/excesLimitModal.svelte
index 8771c935c..537ffb87e 100644
--- a/src/routes/console/organization-[organization]/excesLimitModal.svelte
+++ b/src/routes/console/organization-[organization]/excesLimitModal.svelte
@@ -41,20 +41,31 @@
             users: totUsers > plan.users ? totUsers - plan.users : 0,
             executions:
                 usage?.executions[0] > plan.executions ? usage.executions[0] - plan.executions : 0,
-            members: members.total > plan.members ? members.total - (plan.members || Infinity) : 0
+            members: members?.total > plan.members ? members.total - (plan.members || Infinity) : 0
         };
     }
+
+    $: if (show) calculateExcess();
 </script>
 
 <Modal bind:show title="Limit reached">
     <svelte:fragment slot="title">
         Your usage exceeds the {tierToPlan($organization.billingPlan).name} plan limits
     </svelte:fragment>
-    <p class="text">
-        Usage for <b>{$organization.name}</b> organization has reached the limits of the {tierToPlan(
-            $organization.billingPlan
-        ).name} plan. Consider upgrading to increase your resource usage.
-    </p>
+    {#if $organization.billingPlan === 'tier-0'}
+        <p class="text">
+            Usage for <b>{$organization.name}</b> organization has reached the limits of the {tierToPlan(
+                $organization.billingPlan
+            ).name} plan. Consider upgrading to increase your resource usage.
+        </p>
+    {:else}
+        <p class="text">
+            Usage for <b>{$organization.name}</b> organization has reached the limits of the {tierToPlan(
+                $organization.billingPlan
+            ).name} plan. Excess usage fees will apply.
+        </p>
+    {/if}
+
     <PlanExcess {excess} currentTier={$organization.billingPlan} />
     <svelte:fragment slot="footer">
         <div class="u-flex u-main-space-between u-width-full-line">
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/planExcess.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/planExcess.svelte
index 593ff46b1..206249b84 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/planExcess.svelte
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/planExcess.svelte
@@ -31,7 +31,11 @@
 
 <Alert type="error">
     <svelte:fragment slot="title">
-        Changing your plan now will result in removal of organization members and more
+        {#if currentTier === 'tier-0'}
+            Your usage exceeds the {plan.name} plan limits
+        {:else}
+            Changing your plan now will result in removal of organization members and more
+        {/if}
     </svelte:fragment>
 
     {#if excess?.members > 0}