beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

renamed is PlanActive to isSubscriptionActive

Browse source
This commit is contained in:
Abhinav-grd 2021-04-17 19:18:25 +05:30
parent a611d2e8ca
commit 5475de6074
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/Sidebar.tsx
View file

@ -10,7 +10,7 @@ import { getToken } from 'utils/common/key';
import { getEndpoint } from 'utils/common/apiUtil'; import { getEndpoint } from 'utils/common/apiUtil';
import { Button } from 'react-bootstrap'; import { Button } from 'react-bootstrap';
import { import {
isPlanActive, isSubscriptionActive,
convertBytesToGBs, convertBytesToGBs,
getUserSubscription, getUserSubscription,
isOnFreePlan, isOnFreePlan,
@ -94,7 +94,7 @@ export default function Sidebar(props: Props) {
{constants.SUBSCRIPTION_PLAN} {constants.SUBSCRIPTION_PLAN}
</h5> </h5>
<div style={{ color: '#959595' }}> <div style={{ color: '#959595' }}>
{isPlanActive(subscription) ? ( {isSubscriptionActive(subscription) ? (
isOnFreePlan(subscription) ? ( isOnFreePlan(subscription) ? (
constants.FREE_SUBSCRIPTION_INFO( constants.FREE_SUBSCRIPTION_INFO(
subscription?.expiryTime subscription?.expiryTime

6
src/utils/billingUtil.ts
View file

@ -8,7 +8,7 @@ export function hasPaidPlan(subscription?: Subscription) {
subscription = subscription ?? getUserSubscription(); subscription = subscription ?? getUserSubscription();
return ( return (
subscription && subscription &&
isPlanActive(subscription) && isSubscriptionActive(subscription) &&
subscription.productID !== FREE_PLAN subscription.productID !== FREE_PLAN
); );
} }
@ -17,7 +17,7 @@ export function isSubscribed(subscription?: Subscription) {
subscription = subscription ?? getUserSubscription(); subscription = subscription ?? getUserSubscription();
return hasPaidPlan(subscription) && !isSubscriptionCancelled(subscription); return hasPaidPlan(subscription) && !isSubscriptionCancelled(subscription);
} }
export function isPlanActive(subscription?: Subscription): boolean { export function isSubscriptionActive(subscription?: Subscription): boolean {
subscription = subscription ?? getUserSubscription(); subscription = subscription ?? getUserSubscription();
return subscription && subscription.expiryTime > Date.now() * 1000; return subscription && subscription.expiryTime > Date.now() * 1000;
} }
@ -26,7 +26,7 @@ export function isOnFreePlan(subscription?: Subscription) {
subscription = subscription ?? getUserSubscription(); subscription = subscription ?? getUserSubscription();
return ( return (
subscription && subscription &&
isPlanActive(subscription) && isSubscriptionActive(subscription) &&
subscription.productID === FREE_PLAN subscription.productID === FREE_PLAN
); );
} }