From db07593c808c8908990b45de9afb203285173278 Mon Sep 17 00:00:00 2001
From: Mike Tasset <mike.tasset@gmail.com>
Date: Tue, 3 Dec 2024 14:30:42 +0100
Subject: [PATCH 1/3] Fix: Fix trial date

---
 .../frontend-2/components/settings/workspaces/Billing.vue     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-2/components/settings/workspaces/Billing.vue b/packages/frontend-2/components/settings/workspaces/Billing.vue
index b25201c5ab..b4243290a5 100644
--- a/packages/frontend-2/components/settings/workspaces/Billing.vue
+++ b/packages/frontend-2/components/settings/workspaces/Billing.vue
@@ -232,11 +232,11 @@ const seatPrice = computed(() =>
     : seatPrices.value[WorkspacePlans.Starter][BillingInterval.Monthly]
 )
 const nextPaymentDue = computed(() =>
-  currentPlan.value
+  currentPlan.value && isActivePlan.value
     ? isPurchasablePlan.value
       ? dayjs(subscription.value?.currentBillingCycleEnd).format('MMMM D, YYYY')
       : 'Never'
-    : dayjs().add(30, 'days').format('MMMM D, YYYY')
+    : dayjs().add(31, 'days').format('MMMM D, YYYY')
 )
 const isAdmin = computed(() => workspace.value?.role === Roles.Workspace.Admin)
 const guestSeatCount = computed(() =>

From 5ec066ae22eae9334a4e1dbaaec2b47fbc3e9f37 Mon Sep 17 00:00:00 2001
From: Mike Tasset <mike.tasset@gmail.com>
Date: Tue, 3 Dec 2024 14:35:02 +0100
Subject: [PATCH 2/3] Fix date

---
 .../components/settings/workspaces/Billing.vue           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/frontend-2/components/settings/workspaces/Billing.vue b/packages/frontend-2/components/settings/workspaces/Billing.vue
index b4243290a5..00c4fd3076 100644
--- a/packages/frontend-2/components/settings/workspaces/Billing.vue
+++ b/packages/frontend-2/components/settings/workspaces/Billing.vue
@@ -72,6 +72,7 @@
                 </div>
               </div>
               <div class="p-5 pt-4 flex flex-col gap-y-1">
+                {{ subscription }}
                 <h3 class="text-body-xs text-foreground-2 pb-2">
                   {{
                     statusIsTrial && isPurchasablePlan
@@ -232,11 +233,11 @@ const seatPrice = computed(() =>
     : seatPrices.value[WorkspacePlans.Starter][BillingInterval.Monthly]
 )
 const nextPaymentDue = computed(() =>
-  currentPlan.value && isActivePlan.value
-    ? isPurchasablePlan.value
+  isPurchasablePlan.value
+    ? subscription.value?.currentBillingCycleEnd
       ? dayjs(subscription.value?.currentBillingCycleEnd).format('MMMM D, YYYY')
-      : 'Never'
-    : dayjs().add(31, 'days').format('MMMM D, YYYY')
+      : dayjs(currentPlan.value?.createdAt).add(31, 'days').format('MMMM D, YYYY')
+    : 'Never'
 )
 const isAdmin = computed(() => workspace.value?.role === Roles.Workspace.Admin)
 const guestSeatCount = computed(() =>

From 12d322f089a94656aed59d00852755ec7a0a1977 Mon Sep 17 00:00:00 2001
From: Mike Tasset <mike.tasset@gmail.com>
Date: Tue, 3 Dec 2024 14:35:51 +0100
Subject: [PATCH 3/3] fix

---
 packages/frontend-2/components/settings/workspaces/Billing.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/frontend-2/components/settings/workspaces/Billing.vue b/packages/frontend-2/components/settings/workspaces/Billing.vue
index 00c4fd3076..fcf7c4b3d7 100644
--- a/packages/frontend-2/components/settings/workspaces/Billing.vue
+++ b/packages/frontend-2/components/settings/workspaces/Billing.vue
@@ -72,7 +72,6 @@
                 </div>
               </div>
               <div class="p-5 pt-4 flex flex-col gap-y-1">
-                {{ subscription }}
                 <h3 class="text-body-xs text-foreground-2 pb-2">
                   {{
                     statusIsTrial && isPurchasablePlan