A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
mobile: fix wrong trial end date shown in settings
Ammar Ahmedf0f785735581
diff --git a/apps/mobile/app/screens/settings/settings-data.tsx b/apps/mobile/app/screens/settings/settings-data.tsxindex afd94a195..2923dc10b 100644--- a/apps/mobile/app/screens/settings/settings-data.tsx+++ b/apps/mobile/app/screens/settings/settings-data.tsx@@ -143,21 +143,20 @@ export const settingsGroups: SettingSection[] = ["dddd, MMMM D, YYYY h:mm A");+ const trialEndDate = dayjs(user?.subscription?.start)+ .add(+ user?.subscription?.productId?.includes("monthly") ? 7 : 14,+ "day"+ )+ .format("dddd, MMMM D, YYYY h:mm A");+if (user.subscription?.plan !== SubscriptionPlan.FREE &&user.subscription?.productId) {const status = user.subscription?.status;return status === SubscriptionStatus.TRIAL- ? strings.trialEndsOn(- dayjs(user?.subscription?.start)- .add(- user?.subscription?.productId?.includes("monthly")- ? 7- : 14- )- .format("dddd, MMMM D, YYYY h:mm A")- )+ ? strings.trialOnGoing(trialEndDate): status === SubscriptionStatus.ACTIVE? strings.subRenewOn(expiryDate): status === SubscriptionStatus.CANCELED ||diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.poindex 9cab86210..8b48047b9 100644--- a/packages/intl/locale/en.po+++ b/packages/intl/locale/en.po@@ -7471,6 +7471,10 @@ msgstr "Your free trial has started"msgid "Your free trial is ending soon"msgstr "Your free trial is ending soon"+#: src/strings.ts:2614+msgid "Your free trial is on-going. Your subscription will start on {trialExpiryDate}"+msgstr "Your free trial is on-going. Your subscription will start on {trialExpiryDate}"+#: src/strings.ts:1777msgid "Your full name"msgstr "Your full name"diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.poindex 4b597f800..a55f1f0c3 100644--- a/packages/intl/locale/pseudo-LOCALE.po+++ b/packages/intl/locale/pseudo-LOCALE.po@@ -7417,6 +7417,10 @@ msgstr ""msgid "Your free trial is ending soon"msgstr ""+#: src/strings.ts:2614+msgid "Your free trial is on-going. Your subscription will start on {trialExpiryDate}"+msgstr ""+#: src/strings.ts:1777msgid "Your full name"msgstr ""diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.tsindex f71e13b4d..a69227fed 100644--- a/packages/intl/src/strings.ts+++ b/packages/intl/src/strings.ts@@ -2609,5 +2609,7 @@ Use this if changes from other devices are not appearing on this device. This wiviews: () => t`Views`,clickToUpdate: () => t`Click to update`,noPassword: () => t`No password`,- publishToTheWeb: () => t`Publish to the web`+ publishToTheWeb: () => t`Publish to the web`,+ trialOnGoing: (trialExpiryDate: string) =>+ t`Your free trial is on-going. Your subscription will start on ${trialExpiryDate}`};