From 5a2221c5d352a369f6951b61ab30d39956fc8836 Mon Sep 17 00:00:00 2001 From: Ammar Ahmed Date: Tue, 28 Oct 2025 10:52:11 +0500 Subject: [PATCH] mobile: fix crash in subscription-status settings item --- .../app/screens/settings/settings-data.tsx | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/apps/mobile/app/screens/settings/settings-data.tsx b/apps/mobile/app/screens/settings/settings-data.tsx index d45b44a99..eb7c093d5 100644 --- a/apps/mobile/app/screens/settings/settings-data.tsx +++ b/apps/mobile/app/screens/settings/settings-data.tsx @@ -82,15 +82,22 @@ export const settingsGroups: SettingSection[] = [ { id: "subscription-status", useHook: () => useUserStore((state) => state.user), - hidden: (current) => - !current || - (current as User).subscription?.plan === SubscriptionPlan.FREE, + hidden: (current) => { + const user = current as User; + return ( + !user || + !user.subscription || + user.subscription.provider === undefined || + !strings.subscriptionProviderInfo[user?.subscription?.provider] || + user.subscription?.plan === SubscriptionPlan.FREE + ); + }, name: (current) => { const user = (current as User) || useUserStore.getState().user; return ( strings.subscriptionProviderInfo[ user?.subscription?.provider - ].title() || "Unknown provider" + ]?.title() || `Unknown provider id: ${user?.subscription?.provider}` ); }, icon: "credit-card", @@ -100,6 +107,8 @@ export const settingsGroups: SettingSection[] = [ const subscriptionProviderInfo = strings.subscriptionProviderInfo[user?.subscription?.provider]; + if (!subscriptionProviderInfo) return; + const isCurrentPlatform = (user.subscription?.provider === SubscriptionProvider.APPLE && Platform.OS === "ios") ||