Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

web: use trialExpiryDate for showing trial end date

Abdullah Atta288f60165131
diff --git a/apps/web/src/dialogs/settings/components/subscription-status.tsx b/apps/web/src/dialogs/settings/components/subscription-status.tsx
index 6c064af98..06f75f056 100644
--- a/apps/web/src/dialogs/settings/components/subscription-status.tsx
+++ b/apps/web/src/dialogs/settings/components/subscription-status.tsx
@@ -37,13 +37,13 @@ export function SubscriptionStatus() {
const user = useUserStore((store) => store.user);
const featuresUsage = usePromise(() => getFeaturesUsage(), [user]);
- const { title, autoRenew, expiryDate, trial, legacy } =
+ const { title, autoRenew, expiryDate, trialExpiryDate, trial, legacy } =
getSubscriptionInfo(user);
const subtitle =
title === "Free"
? ""
: trial
- ? `Your free trial is on-going. Your subscription will start on ${expiryDate}.`
+ ? `Your free trial is on-going. Your subscription will start on ${trialExpiryDate}.`
: autoRenew
? `Your subscription will auto renew on ${expiryDate}.`
: expiryDate
diff --git a/apps/web/src/dialogs/settings/components/user-profile.tsx b/apps/web/src/dialogs/settings/components/user-profile.tsx
index 40bade4ed..f4cbeae61 100644
--- a/apps/web/src/dialogs/settings/components/user-profile.tsx
+++ b/apps/web/src/dialogs/settings/components/user-profile.tsx
@@ -45,6 +45,7 @@ export function getSubscriptionInfo(user: User | undefined): {
expiryDate?: string;
startDate?: string;
autoRenew?: boolean;
+ trialExpiryDate?: string;
} {
const { type, expiry, plan, status, provider } = user?.subscription || {};
if (!expiry) return { title: "Free" };
@@ -73,7 +74,11 @@ export function getSubscriptionInfo(user: User | undefined): {
const expiryDate =
(!!user?.subscription?.expiry &&
- getFormattedDate(user?.subscription?.expiry, "date-time")) ||
+ getFormattedDate(user.subscription.expiry, "date-time")) ||
+ undefined;
+ const trialExpiryDate =
+ (!!user?.subscription?.trialExpiry &&
+ getFormattedDate(user.subscription.trialExpiry, "date-time")) ||
undefined;
const startDate =
(!!user?.subscription?.start &&
@@ -86,6 +91,7 @@ export function getSubscriptionInfo(user: User | undefined): {
trial,
expiryDate,
startDate,
+ trialExpiryDate,
autoRenew,
paused,
canceled
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index d55d3d378..224242959 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -611,6 +611,7 @@ export type User = {
appId: 0;
cancelURL: string | null;
expiry: number;
+ trialExpiry?: number;
productId: string;
provider: SubscriptionProvider;
start: number;