chore(dashboard): added suggestions from the pr #6612

novuhq · Oct 4, 2024 · db593ff · db593ff
1 parent f859800
commit db593ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 34 deletions.
diff --git a/apps/dashboard/src/components/side-navigation/free-trial-card.tsx b/apps/dashboard/src/components/side-navigation/free-trial-card.tsx
@@ -13,14 +13,13 @@ const pluralizeDaysLeft = (numberOfDays: number) => {
 };
 
 export const FreeTrialCard = () => {
-  const { subscription, isLoading } = useBillingSubscription();
-  const { trial, hasPaymentMethod } = subscription;
+  const { subscription, daysLeft, isLoading } = useBillingSubscription();
 
-  if (isLoading || !trial.isActive || hasPaymentMethod) {
+  if (isLoading || !subscription || !subscription.trial.isActive || subscription?.hasPaymentMethod) {
     return null;
   }
 
-  const pluralizedDays = pluralizeDaysLeft(trial.daysLeft);
+  const pluralizedDays = pluralizeDaysLeft(daysLeft);
 
   return (
     <a
@@ -60,7 +59,7 @@ export const FreeTrialCard = () => {
         Experience novu without any limits for free for the next {pluralizedDays}.
       </span>
       <div className={`max-h-3 overflow-hidden opacity-100 ${transition} group-hover:max-h-0 group-hover:opacity-0`}>
-        <Progress value={trial.daysLeft} max={trial.daysTotal > 0 ? trial.daysTotal : 100} />
+        <Progress value={daysLeft} max={subscription.trial.daysTotal > 0 ? subscription.trial.daysTotal : 100} />
       </div>
       <div
         className={`-mt-2 max-h-0 overflow-hidden opacity-0 ${transition} group-hover:max-h-8 group-hover:opacity-100`}

diff --git a/apps/dashboard/src/hooks/use-billing-subscription.ts b/apps/dashboard/src/hooks/use-billing-subscription.ts
@@ -1,14 +1,14 @@
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
 import { differenceInDays, isSameDay } from 'date-fns';
-import { ApiServiceLevelEnum, GetSubscriptionDto } from '@novu/shared';
+import { GetSubscriptionDto } from '@novu/shared';
 import { useAuth } from '@/context';
 import { getBillingSubscription } from '@/api/billing';
 import { QueryKeys } from '@/utils/query-keys';
 
 const today = new Date();
 
-export type UseSubscriptionType = GetSubscriptionDto & { trial: { daysLeft: number }; isLoading: boolean };
+export type UseSubscriptionType = GetSubscriptionDto & { daysLeft: number; isLoading: boolean };
 
 export const useBillingSubscription = () => {
   const { currentOrganization } = useAuth();
@@ -18,25 +18,6 @@ export const useBillingSubscription = () => {
     getBillingSubscription,
     {
       enabled: !!currentOrganization,
-      initialData: {
-        apiServiceLevel: ApiServiceLevelEnum.FREE,
-        isActive: false,
-        hasPaymentMethod: false,
-        status: 'trialing',
-        currentPeriodStart: null,
-        currentPeriodEnd: null,
-        billingInterval: null,
-        events: {
-          current: 0,
-          included: 0,
-        },
-        trial: {
-          isActive: false,
-          start: today.toISOString(),
-          end: today.toISOString(),
-          daysTotal: 0,
-        },
-      },
     }
   );
 
@@ -46,16 +27,11 @@ export const useBillingSubscription = () => {
     return isSameDay(new Date(subscription.trial.end), today)
       ? 0
       : differenceInDays(new Date(subscription.trial.end), today);
-  }, [subscription.trial.end]);
+  }, [subscription?.trial.end]);
 
   return {
     isLoading: isLoadingSubscription,
-    subscription: {
-      ...subscription,
-      trial: {
-        ...subscription.trial,
-        daysLeft,
-      },
-    },
+    subscription,
+    daysLeft,
   };
 };