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: allow changing plan if not subscribed anymore
Ammar Ahmed4a4576ebd53d
diff --git a/apps/mobile/app/components/sheets/paywall/index.tsx b/apps/mobile/app/components/sheets/paywall/index.tsxindex a0a35ced6..2cf9700e4 100644--- a/apps/mobile/app/components/sheets/paywall/index.tsx+++ b/apps/mobile/app/components/sheets/paywall/index.tsx@@ -23,6 +23,7 @@ import { Button } from "../../ui/button";import Heading from "../../ui/typography/heading";import Paragraph from "../../ui/typography/paragraph";import { SubscriptionProvider } from "@notesnook/core";+import PremiumService from "../../../services/premium";const isGithubRelease = Config.GITHUB_RELEASE === "true";const INDEX_TO_PLAN = {1: "essential",@@ -54,7 +55,9 @@ export default function PaywallSheet<Tid extends FeatureId>(props: {}, []);const isSubscribedOnWeb =- pricingPlans.user?.subscription.provider === SubscriptionProvider.PADDLE ||+ (PremiumService.get() &&+ pricingPlans.user?.subscription.provider ===+ SubscriptionProvider.PADDLE) ||pricingPlans.user?.subscription.provider ===SubscriptionProvider.STREETWRITERS;@@ -186,7 +189,8 @@ export default function PaywallSheet<Tid extends FeatureId>(props: {onPress={() => {if (isSubscribedOnWeb) {ToastManager.show({- message: strings.changePlanOnWeb()+ message: strings.changePlanOnWeb(),+ context: "local"});return;}diff --git a/apps/mobile/app/components/sheets/plan-limits/index.tsx b/apps/mobile/app/components/sheets/plan-limits/index.tsxindex d15c11649..4d6a591ac 100644--- a/apps/mobile/app/components/sheets/plan-limits/index.tsx+++ b/apps/mobile/app/components/sheets/plan-limits/index.tsx@@ -19,6 +19,7 @@ import Heading from "../../ui/typography/heading";import Paragraph from "../../ui/typography/paragraph";import { SubscriptionPlan, SubscriptionProvider } from "@notesnook/core";import { useUserStore } from "../../../stores/use-user-store";+import PremiumService from "../../../services/premium";export function PlanLimits() {const { colors } = useThemeColors();@@ -77,9 +78,9 @@ export function PlanLimits() {</View>))}- {user?.subscription.provider === SubscriptionProvider.PADDLE ||- user?.subscription.provider ===- SubscriptionProvider.STREETWRITERS ? null : (+ {(user?.subscription.provider === SubscriptionProvider.PADDLE ||+ user?.subscription.provider === SubscriptionProvider.STREETWRITERS) &&+ PremiumService.get() ? null : (<Buttontitle={strings.changePlan()}onPress={() => {diff --git a/apps/mobile/app/screens/settings/user-section.jsx b/apps/mobile/app/screens/settings/user-section.jsxindex f65ac01d8..896cf28f0 100644--- a/apps/mobile/app/screens/settings/user-section.jsx+++ b/apps/mobile/app/screens/settings/user-section.jsx@@ -46,6 +46,7 @@ import { planToDisplayName } from "../../utils/constants";import { AppFontSize } from "../../utils/size";import { DefaultAppStyles } from "../../utils/styles";import { SectionItem } from "./section-item";+import PremiumService from "../../services/premium";export const getTimeLeft = (t2) => {let daysRemaining = dayjs(t2).diff(dayjs(), "days");@@ -336,9 +337,10 @@ const SettingsUserSection = ({ item }) => {</Paragraph></TouchableOpacity>- {user.subscription.provider === SubscriptionProvider.PADDLE ||- user.subscription.provider ===- SubscriptionProvider.STREETWRITERS ? null : (+ {(user.subscription.provider === SubscriptionProvider.PADDLE ||+ user.subscription.provider ===+ SubscriptionProvider.STREETWRITERS) &&+ PremiumService.get() ? null : (<Buttontitle={user.subscription.plan !== SubscriptionPlan.FREE