From 5475de60747698bc560647e5148061d7202a1626 Mon Sep 17 00:00:00 2001 From: Abhinav-grd Date: Sat, 17 Apr 2021 19:18:25 +0530 Subject: [PATCH] renamed is PlanActive to isSubscriptionActive --- src/components/Sidebar.tsx | 4 ++-- src/utils/billingUtil.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx index 43213d746..7ec7f5a4f 100644 --- a/src/components/Sidebar.tsx +++ b/src/components/Sidebar.tsx @@ -10,7 +10,7 @@ import { getToken } from 'utils/common/key'; import { getEndpoint } from 'utils/common/apiUtil'; import { Button } from 'react-bootstrap'; import { - isPlanActive, + isSubscriptionActive, convertBytesToGBs, getUserSubscription, isOnFreePlan, @@ -94,7 +94,7 @@ export default function Sidebar(props: Props) { {constants.SUBSCRIPTION_PLAN}
- {isPlanActive(subscription) ? ( + {isSubscriptionActive(subscription) ? ( isOnFreePlan(subscription) ? ( constants.FREE_SUBSCRIPTION_INFO( subscription?.expiryTime diff --git a/src/utils/billingUtil.ts b/src/utils/billingUtil.ts index 5798723a0..52f8221d9 100644 --- a/src/utils/billingUtil.ts +++ b/src/utils/billingUtil.ts @@ -8,7 +8,7 @@ export function hasPaidPlan(subscription?: Subscription) { subscription = subscription ?? getUserSubscription(); return ( subscription && - isPlanActive(subscription) && + isSubscriptionActive(subscription) && subscription.productID !== FREE_PLAN ); } @@ -17,7 +17,7 @@ export function isSubscribed(subscription?: Subscription) { subscription = subscription ?? getUserSubscription(); return hasPaidPlan(subscription) && !isSubscriptionCancelled(subscription); } -export function isPlanActive(subscription?: Subscription): boolean { +export function isSubscriptionActive(subscription?: Subscription): boolean { subscription = subscription ?? getUserSubscription(); return subscription && subscription.expiryTime > Date.now() * 1000; } @@ -26,7 +26,7 @@ export function isOnFreePlan(subscription?: Subscription) { subscription = subscription ?? getUserSubscription(); return ( subscription && - isPlanActive(subscription) && + isSubscriptionActive(subscription) && subscription.productID === FREE_PLAN ); }