updated util function names
This commit is contained in:
parent
0e062c1093
commit
dd18a2175e
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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)
|
||||
);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue