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

updated util function names

Browse source
This commit is contained in:
Abhinav-grd 2021-03-18 20:56:43 +05:30
parent 0e062c1093
commit dd18a2175e
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/Sidebar.tsx
View file

@ -15,8 +15,8 @@ import {
convertBytesToGBs, convertBytesToGBs,
getUserSubscription, getUserSubscription,
isOnFreePlan, isOnFreePlan,
isPlanCancelled, isSubscriptionCancelled,
hasRenewingPaidPlan, isSubscribed,
} from 'utils/billingUtil'; } from 'utils/billingUtil';
enum Action { enum Action {
@ -108,7 +108,7 @@ export default function Sidebar(props: Props) {
constants.FREE_SUBSCRIPTION_INFO( constants.FREE_SUBSCRIPTION_INFO(
subscription?.expiryTime subscription?.expiryTime
) )
) : isPlanCancelled(subscription) ? ( ) : isSubscriptionCancelled(subscription) ? (
constants.RENEWAL_CANCELLED_SUBSCRIPTION_INFO( constants.RENEWAL_CANCELLED_SUBSCRIPTION_INFO(
subscription?.expiryTime subscription?.expiryTime
) )
@ -122,7 +122,7 @@ export default function Sidebar(props: Props) {
)} )}
</div> </div>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{hasRenewingPaidPlan(subscription) ? ( {isSubscribed(subscription) ? (
<> <>
<Button <Button
variant="success" variant="success"

4
src/pages/gallery/components/PlanSelector.tsx
View file

@ -9,7 +9,7 @@ import {
getPlans, getPlans,
getUserSubscription, getUserSubscription,
hasPaidPlan, hasPaidPlan,
hasRenewingPaidPlan, isSubscribed,
isUserRenewingPlan, isUserRenewingPlan,
} from 'utils/billingUtil'; } from 'utils/billingUtil';
@ -124,7 +124,7 @@ function PlanSelector(props: Props) {
> >
<Modal.Header closeButton> <Modal.Header closeButton>
<Modal.Title style={{ marginLeft: '12px' }}> <Modal.Title style={{ marginLeft: '12px' }}>
{hasRenewingPaidPlan(subscription) {isSubscribed(subscription)
? constants.MANAGE_PLAN ? constants.MANAGE_PLAN
: constants.CHOOSE_PLAN} : constants.CHOOSE_PLAN}
</Modal.Title> </Modal.Title>

4
src/pages/gallery/index.tsx
View file

@ -27,7 +27,7 @@ import AlertBanner from './components/AlertBanner';
import { Alert, Button, Jumbotron } from 'react-bootstrap'; import { Alert, Button, Jumbotron } from 'react-bootstrap';
import billingService from 'services/billingService'; import billingService from 'services/billingService';
import PlanSelector from './components/PlanSelector'; import PlanSelector from './components/PlanSelector';
import { hasRenewingPaidPlan } from 'utils/billingUtil'; import { isSubscribed } from 'utils/billingUtil';
const DATE_CONTAINER_HEIGHT = 45; const DATE_CONTAINER_HEIGHT = 45;
const IMAGE_CONTAINER_HEIGHT = 200; const IMAGE_CONTAINER_HEIGHT = 200;
@ -357,7 +357,7 @@ export default function Gallery(props: Props) {
bannerMessage={props.bannerMessage} bannerMessage={props.bannerMessage}
setBannerMessage={props.setBannerMessage} setBannerMessage={props.setBannerMessage}
/> />
{!hasRenewingPaidPlan() && ( {!isSubscribed() && (
<Button <Button
id="checkout" id="checkout"
variant="success" variant="success"

8
src/utils/billingUtil.ts
View file

@ -13,9 +13,9 @@ export function hasPaidPlan(subscription?: Subscription) {
); );
} }
export function hasRenewingPaidPlan(subscription?: Subscription) { export function isSubscribed(subscription?: Subscription) {
subscription = subscription ?? getUserSubscription(); subscription = subscription ?? getUserSubscription();
return hasPaidPlan(subscription) && !isPlanCancelled(subscription); return hasPaidPlan(subscription) && !isSubscriptionCancelled(subscription);
} }
export function isPlanActive(subscription?: Subscription): boolean { export function isPlanActive(subscription?: Subscription): boolean {
subscription = subscription ?? getUserSubscription(); 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(); subscription = subscription ?? getUserSubscription();
return subscription && subscription.isCancelled; return subscription && subscription.isCancelled;
} }
@ -46,6 +46,6 @@ export function getPlans(): Plan[] {
export function isUserRenewingPlan(plan: Plan, subscription: Subscription) { export function isUserRenewingPlan(plan: Plan, subscription: Subscription) {
return ( return (
plan.androidID === subscription.productID && plan.androidID === subscription.productID &&
!isPlanCancelled(subscription) !isSubscriptionCancelled(subscription)
); );
} }