Skip to content

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

mobile: fix crash in settings -> user subscription

Ammar Ahmed208bd13cddd9
diff --git a/apps/mobile/app/screens/settings/settings-data.tsx b/apps/mobile/app/screens/settings/settings-data.tsx
index 7b517b1d2..99e7a576b 100644
--- a/apps/mobile/app/screens/settings/settings-data.tsx
+++ b/apps/mobile/app/screens/settings/settings-data.tsx
@@ -82,7 +82,8 @@ export const settingsGroups: SettingSection[] = [
useHook: () => useUserStore((state) => state.user),
hidden: (current) => !current,
name: (current) => {
- const user = current as User;
+ const user = (current as User) || useUserStore.getState().user;
+ if (!user) return strings.subscribeToPro();
const isBasic = user.subscription?.type === SUBSCRIPTION_STATUS.BASIC;
const isTrial = user.subscription?.type === SUBSCRIPTION_STATUS.TRIAL;
return isBasic || !user.subscription?.type
@@ -96,6 +97,7 @@ export const settingsGroups: SettingSection[] = [
icon: "crown",
description: (current) => {
const user = current as User;
+ if (!user) return strings.neverHesitate();
const subscriptionDaysLeft =
user &&
getTimeLeft(