From 6f284e53a2fb9db817af82187390e724140d9b48 Mon Sep 17 00:00:00 2001
From: Rishabh Mishra <me@rsbh.dev>
Date: Mon, 14 Oct 2024 16:24:58 +0530
Subject: [PATCH] fix: undefined plan name when user is on trial (#794)

* fix: undefined plan name when user is on trial

* fix: show banner if user is not only on trial
---
 .../billing/upcoming-billing-cycle.tsx        | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/sdks/js/packages/core/react/components/organization/billing/upcoming-billing-cycle.tsx b/sdks/js/packages/core/react/components/organization/billing/upcoming-billing-cycle.tsx
index 958530842..026c1de8d 100644
--- a/sdks/js/packages/core/react/components/organization/billing/upcoming-billing-cycle.tsx
+++ b/sdks/js/packages/core/react/components/organization/billing/upcoming-billing-cycle.tsx
@@ -89,6 +89,7 @@ export const UpcomingBillingCycle = ({
     billingAccount,
     config,
     activeSubscription,
+    trialSubscription,
     isActiveOrganizationLoading,
     basePlan
   } = useFrontier();
@@ -184,31 +185,26 @@ export const UpcomingBillingCycle = ({
     billingAccount?.provider_id
   ]);
 
-  const planName = getPlanNameWithInterval(plan);
+  const planName = activeSubscription
+    ? getPlanNameWithInterval(plan)
+    : getPlanNameWithInterval(basePlan);
 
-  const planInfo = activeSubscription
-    ? {
-        message: `You are subscribed to ${planName}.`,
-        action: {
-          label: 'Upgrade',
-          link: '/plans'
-        }
-      }
-    : basePlan
-    ? {
-        message: `You are subscribed to ${basePlan?.title}.`,
-        action: {
-          label: 'Upgrade',
-          link: '/plans'
-        }
-      }
-    : {
-        message: 'You are not subscribed to any plan',
-        action: {
-          label: 'Subscribe',
-          link: '/plans'
+  const planInfo =
+    activeSubscription || basePlan
+      ? {
+          message: `You are subscribed to ${planName}.`,
+          action: {
+            label: 'Upgrade',
+            link: '/plans'
+          }
         }
-      };
+      : {
+          message: 'You are not subscribed to any plan',
+          action: {
+            label: 'Subscribe',
+            link: '/plans'
+          }
+        };
 
   const onActionBtnClick = () => {
     // @ts-ignore
@@ -226,11 +222,12 @@ export const UpcomingBillingCycle = ({
     isPlansLoading ||
     isPermissionLoading;
 
+  const isUserOnlyTrialing = !activeSubscription?.id && trialSubscription?.id;
   const due_date = upcomingInvoice?.due_date || upcomingInvoice?.period_end_at;
 
   return isLoading ? (
     <Skeleton />
-  ) : due_date ? (
+  ) : due_date && !isUserOnlyTrialing ? (
     <Flex
       align={'center'}
       justify={'between'}