fix: better subscription state text

This commit is contained in:
Mo Bitar
2021-12-01 11:28:03 -06:00
parent a8f949e8c5
commit fbafc136e8

View File

@@ -15,22 +15,53 @@ const StatusText = observer(({ subscriptionState }: Props) => {
const { userSubscription, userSubscriptionName } = subscriptionState; const { userSubscription, userSubscriptionName } = subscriptionState;
const expirationDate = new Date( const expirationDate = new Date(
convertTimestampToMilliseconds(userSubscription!.endsAt) convertTimestampToMilliseconds(userSubscription!.endsAt)
).toLocaleString(); );
const expirationDateString = expirationDate.toLocaleString();
const expired = expirationDate.getTime() < new Date().getTime();
const canceled = userSubscription!.cancelled;
return userSubscription!.cancelled ? ( if (canceled) {
return (
<Text className="mt-1"> <Text className="mt-1">
Your{' '} Your{' '}
<span className="font-bold"> <span className="font-bold">
Standard Notes{userSubscriptionName ? ' ' : ''} Standard Notes{userSubscriptionName ? ' ' : ''}
{userSubscriptionName} {userSubscriptionName}
</span>{' '} </span>{' '}
subscription has been{' '} subscription has been canceled
{' '}
{expired ? (
<span className="font-bold"> <span className="font-bold">
canceled but will remain valid until {expirationDate} and expired on {expirationDateString}
</span>
) : (
<span className="font-bold">
but will remain valid until {expirationDateString}
</span>
)}
. You may resubscribe below if you wish.
</Text>
);
}
if (expired) {
return (
<Text className="mt-1">
Your{' '}
<span className="font-bold">
Standard Notes{userSubscriptionName ? ' ' : ''}
{userSubscriptionName}
</span>{' '}
subscription {' '}
<span className="font-bold">
expired on {expirationDateString}
</span> </span>
. You may resubscribe below if you wish. . You may resubscribe below if you wish.
</Text> </Text>
) : ( );
}
return (
<Text className="mt-1"> <Text className="mt-1">
Your{' '} Your{' '}
<span className="font-bold"> <span className="font-bold">
@@ -38,7 +69,7 @@ const StatusText = observer(({ subscriptionState }: Props) => {
{userSubscriptionName} {userSubscriptionName}
</span>{' '} </span>{' '}
subscription will be{' '} subscription will be{' '}
<span className="font-bold">renewed on {expirationDate}</span>. <span className="font-bold">renewed on {expirationDateString}</span>.
</Text> </Text>
); );
}); });