From f40ccdae41444508deba57d9799a03223d7d6511 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Sun, 5 Oct 2025 01:11:09 +0500
Subject: [PATCH] mobile: add null checks

---
 .../app/components/sheets/paywall/index.tsx     |  9 +++++----
 .../app/components/sheets/plan-limits/index.tsx |  8 ++++----
 .../app/screens/settings/settings-data.tsx      |  8 ++++----
 .../app/screens/settings/user-section.jsx       | 17 +++++++++--------
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/apps/mobile/app/components/sheets/paywall/index.tsx b/apps/mobile/app/components/sheets/paywall/index.tsx
index 195352a10..8d043fd85 100644
--- a/apps/mobile/app/components/sheets/paywall/index.tsx
+++ b/apps/mobile/app/components/sheets/paywall/index.tsx
@@ -56,15 +56,16 @@ export default function PaywallSheet<Tid extends FeatureId>(props: {
 
   const isSubscribedOnWeb =
     (PremiumService.get() &&
-      pricingPlans.user?.subscription.provider ===
+      pricingPlans.user?.subscription?.provider ===
         SubscriptionProvider.PADDLE) ||
-    pricingPlans.user?.subscription.provider ===
+    pricingPlans.user?.subscription?.provider ===
       SubscriptionProvider.STREETWRITERS;
 
   const isCurrentPlatform =
-    (pricingPlans.user?.subscription.provider === SubscriptionProvider.APPLE &&
+    (pricingPlans.user?.subscription?.provider === SubscriptionProvider.APPLE &&
       Platform.OS === "ios") ||
-    (pricingPlans.user?.subscription.provider === SubscriptionProvider.GOOGLE &&
+    (pricingPlans.user?.subscription?.provider ===
+      SubscriptionProvider.GOOGLE &&
       Platform.OS === "android");
 
   return !pricingPlans.currentPlan ? null : (
diff --git a/apps/mobile/app/components/sheets/plan-limits/index.tsx b/apps/mobile/app/components/sheets/plan-limits/index.tsx
index d5170a07a..68ec57bcc 100644
--- a/apps/mobile/app/components/sheets/plan-limits/index.tsx
+++ b/apps/mobile/app/components/sheets/plan-limits/index.tsx
@@ -35,9 +35,9 @@ export function PlanLimits() {
   }, []);
 
   const isCurrentPlatform =
-    (user?.subscription.provider === SubscriptionProvider.APPLE &&
+    (user?.subscription?.provider === SubscriptionProvider.APPLE &&
       Platform.OS === "ios") ||
-    (user?.subscription.provider === SubscriptionProvider.GOOGLE &&
+    (user?.subscription?.provider === SubscriptionProvider.GOOGLE &&
       Platform.OS === "android");
 
   return (
@@ -84,8 +84,8 @@ export function PlanLimits() {
         </View>
       ))}
 
-      {(user?.subscription.provider === SubscriptionProvider.PADDLE ||
-        user?.subscription.provider === SubscriptionProvider.STREETWRITERS ||
+      {(user?.subscription?.provider === SubscriptionProvider.PADDLE ||
+        user?.subscription?.provider === SubscriptionProvider.STREETWRITERS ||
         !isCurrentPlatform) &&
       PremiumService.get() ? null : (
         <Button
diff --git a/apps/mobile/app/screens/settings/settings-data.tsx b/apps/mobile/app/screens/settings/settings-data.tsx
index bd810ed0e..cc09115a9 100644
--- a/apps/mobile/app/screens/settings/settings-data.tsx
+++ b/apps/mobile/app/screens/settings/settings-data.tsx
@@ -100,9 +100,9 @@ export const settingsGroups: SettingSection[] = [
             strings.subscriptionProviderInfo[user?.subscription?.provider];
 
           const isCurrentPlatform =
-            (user.subscription.provider === SubscriptionProvider.APPLE &&
+            (user.subscription?.provider === SubscriptionProvider.APPLE &&
               Platform.OS === "ios") ||
-            (user.subscription.provider === SubscriptionProvider.GOOGLE &&
+            (user.subscription?.provider === SubscriptionProvider.GOOGLE &&
               Platform.OS === "android");
 
           if (
@@ -132,8 +132,8 @@ export const settingsGroups: SettingSection[] = [
             "dddd, MMMM D, YYYY h:mm A"
           );
 
-          if (user.subscription.plan !== SubscriptionPlan.FREE) {
-            const status = user.subscription.status;
+          if (user.subscription?.plan !== SubscriptionPlan.FREE) {
+            const status = user.subscription?.status;
             return status === SubscriptionStatus.TRIAL
               ? strings.trialEndsOn(
                   dayjs(user?.subscription?.start)
diff --git a/apps/mobile/app/screens/settings/user-section.jsx b/apps/mobile/app/screens/settings/user-section.jsx
index 8f621673e..3857017e2 100644
--- a/apps/mobile/app/screens/settings/user-section.jsx
+++ b/apps/mobile/app/screens/settings/user-section.jsx
@@ -133,9 +133,9 @@ const SettingsUserSection = ({ item }) => {
   const total = user?.totalStorage || 0;
 
   const isCurrentPlatform =
-    (user?.subscription.provider === SubscriptionProvider.APPLE &&
+    (user?.subscription?.provider === SubscriptionProvider.APPLE &&
       Platform.OS === "ios") ||
-    (user?.subscription.provider === SubscriptionProvider.GOOGLE &&
+    (user?.subscription?.provider === SubscriptionProvider.GOOGLE &&
       Platform.OS === "android");
 
   return (
@@ -328,7 +328,7 @@ const SettingsUserSection = ({ item }) => {
                   }}
                 >
                   <Paragraph size={AppFontSize.sm}>
-                    {planToDisplayName(user.subscription.plan)}
+                    {planToDisplayName(user.subscription?.plan)}
                   </Paragraph>
                   <Paragraph
                     color={colors.secondary.paragraph}
@@ -339,14 +339,14 @@ const SettingsUserSection = ({ item }) => {
                   </Paragraph>
                 </TouchableOpacity>
 
-                {(user.subscription.provider === SubscriptionProvider.PADDLE ||
-                  user.subscription.provider ===
+                {(user.subscription?.provider === SubscriptionProvider.PADDLE ||
+                  user.subscription?.provider ===
                     SubscriptionProvider.STREETWRITERS ||
                   !isCurrentPlatform) &&
                 PremiumService.get() ? null : (
                   <Button
                     title={
-                      user.subscription.plan !== SubscriptionPlan.FREE
+                      user.subscription?.plan !== SubscriptionPlan.FREE
                         ? strings.changePlan()
                         : strings.upgradePlan()
                     }
@@ -362,8 +362,9 @@ const SettingsUserSection = ({ item }) => {
                       }
 
                       if (
-                        user.subscription.plan !== SubscriptionPlan.FREE &&
-                        user.subscription.productId.includes("5year")
+                        user.subscription?.plan !== SubscriptionPlan.FREE &&
+                        user.subscription?.productId &&
+                        user.subscription?.productId.includes("5year")
                       ) {
                         ToastManager.show({
                           message: