From dd18a2175e722f562beae05cc02983537bd1df2c Mon Sep 17 00:00:00 2001
From: Abhinav-grd <abhinavk.grd@gmail.com>
Date: Thu, 18 Mar 2021 20:56:43 +0530
Subject: [PATCH] updated util function names

---
 src/components/Sidebar.tsx                    | 8 ++++----
 src/pages/gallery/components/PlanSelector.tsx | 4 ++--
 src/pages/gallery/index.tsx                   | 4 ++--
 src/utils/billingUtil.ts                      | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index 955276b77..62dc8c20b 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -15,8 +15,8 @@ import {
     convertBytesToGBs,
     getUserSubscription,
     isOnFreePlan,
-    isPlanCancelled,
-    hasRenewingPaidPlan,
+    isSubscriptionCancelled,
+    isSubscribed,
 } from 'utils/billingUtil';
 
 enum Action {
@@ -108,7 +108,7 @@ export default function Sidebar(props: Props) {
                             constants.FREE_SUBSCRIPTION_INFO(
                                 subscription?.expiryTime
                             )
-                        ) : isPlanCancelled(subscription) ? (
+                        ) : isSubscriptionCancelled(subscription) ? (
                             constants.RENEWAL_CANCELLED_SUBSCRIPTION_INFO(
                                 subscription?.expiryTime
                             )
@@ -122,7 +122,7 @@ export default function Sidebar(props: Props) {
                     )}
                 </div>
                 <div style={{ display: 'flex' }}>
-                    {hasRenewingPaidPlan(subscription) ? (
+                    {isSubscribed(subscription) ? (
                         <>
                             <Button
                                 variant="success"
diff --git a/src/pages/gallery/components/PlanSelector.tsx b/src/pages/gallery/components/PlanSelector.tsx
index 46915c89c..786a717e3 100644
--- a/src/pages/gallery/components/PlanSelector.tsx
+++ b/src/pages/gallery/components/PlanSelector.tsx
@@ -9,7 +9,7 @@ import {
     getPlans,
     getUserSubscription,
     hasPaidPlan,
-    hasRenewingPaidPlan,
+    isSubscribed,
     isUserRenewingPlan,
 } from 'utils/billingUtil';
 
@@ -124,7 +124,7 @@ function PlanSelector(props: Props) {
         >
             <Modal.Header closeButton>
                 <Modal.Title style={{ marginLeft: '12px' }}>
-                    {hasRenewingPaidPlan(subscription)
+                    {isSubscribed(subscription)
                         ? constants.MANAGE_PLAN
                         : constants.CHOOSE_PLAN}
                 </Modal.Title>
diff --git a/src/pages/gallery/index.tsx b/src/pages/gallery/index.tsx
index eb817c07f..887cf0b2d 100644
--- a/src/pages/gallery/index.tsx
+++ b/src/pages/gallery/index.tsx
@@ -27,7 +27,7 @@ import AlertBanner from './components/AlertBanner';
 import { Alert, Button, Jumbotron } from 'react-bootstrap';
 import billingService from 'services/billingService';
 import PlanSelector from './components/PlanSelector';
-import { hasRenewingPaidPlan } from 'utils/billingUtil';
+import { isSubscribed } from 'utils/billingUtil';
 
 const DATE_CONTAINER_HEIGHT = 45;
 const IMAGE_CONTAINER_HEIGHT = 200;
@@ -357,7 +357,7 @@ export default function Gallery(props: Props) {
                 bannerMessage={props.bannerMessage}
                 setBannerMessage={props.setBannerMessage}
             />
-            {!hasRenewingPaidPlan() && (
+            {!isSubscribed() && (
                 <Button
                     id="checkout"
                     variant="success"
diff --git a/src/utils/billingUtil.ts b/src/utils/billingUtil.ts
index f93d9b153..38e09c10f 100644
--- a/src/utils/billingUtil.ts
+++ b/src/utils/billingUtil.ts
@@ -13,9 +13,9 @@ export function hasPaidPlan(subscription?: Subscription) {
     );
 }
 
-export function hasRenewingPaidPlan(subscription?: Subscription) {
+export function isSubscribed(subscription?: Subscription) {
     subscription = subscription ?? getUserSubscription();
-    return hasPaidPlan(subscription) && !isPlanCancelled(subscription);
+    return hasPaidPlan(subscription) && !isSubscriptionCancelled(subscription);
 }
 export function isPlanActive(subscription?: Subscription): boolean {
     subscription = subscription ?? getUserSubscription();
@@ -31,7 +31,7 @@ export function isOnFreePlan(subscription?: Subscription) {
     );
 }
 
-export function isPlanCancelled(subscription?: Subscription) {
+export function isSubscriptionCancelled(subscription?: Subscription) {
     subscription = subscription ?? getUserSubscription();
     return subscription && subscription.isCancelled;
 }
@@ -46,6 +46,6 @@ export function getPlans(): Plan[] {
 export function isUserRenewingPlan(plan: Plan, subscription: Subscription) {
     return (
         plan.androidID === subscription.productID &&
-        !isPlanCancelled(subscription)
+        !isSubscriptionCancelled(subscription)
     );
 }