mobile: add null checks

release v3.3.1 on mobile

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 : (

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

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)

apps/mobile/app/screens/settings/user-section.jsx

@@ -24,7 +24,7 @@ import { useThemeColors } from "@notesnook/theme";
 import { useNetInfo } from "@react-native-community/netinfo";
 import dayjs from "dayjs";
 import React from "react";
-import { Image, TouchableOpacity, View } from "react-native";
+import { Image, Platform, TouchableOpacity, View } from "react-native";
 import ImagePicker from "react-native-image-crop-picker";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../common/database";
@@ -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:

apps/mobile/native/android/app/build.gradle

@@ -124,7 +124,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 3069
+        versionCode 3071
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

apps/mobile/native/globals.js

@@ -22,7 +22,7 @@ import {
 import Config from "react-native-config";
 
 i18n.load({
-  en: !__DEV__ && Config.isTesting !== "true"  ? $pseudo : $en
+  en: __DEV__ && Config.isTesting !== "true"  ? $pseudo : $en
 });
 setI18nGlobal(i18n);
 i18n.activate("en");

apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj

@@ -1089,7 +1089,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2148;
+				CURRENT_PROJECT_VERSION = 2150;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1163,7 +1163,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.3.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1194,7 +1194,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2148;
+				CURRENT_PROJECT_VERSION = 2150;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1268,7 +1268,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.3.2;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1427,7 +1427,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2148;
+				CURRENT_PROJECT_VERSION = 2150;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1439,7 +1439,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.3.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1470,7 +1470,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2148;
+				CURRENT_PROJECT_VERSION = 2150;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1483,7 +1483,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.3.2;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1513,7 +1513,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2148;
+				CURRENT_PROJECT_VERSION = 2150;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1594,7 +1594,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.3.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1625,7 +1625,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2148;
+				CURRENT_PROJECT_VERSION = 2150;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1707,7 +1707,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.3.2;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "private": true,
   "license": "GPL-3.0-or-later",
   "workspaces": [

fastlane/metadata/android/en-US/changelogs/15354.txt

@@ -0,0 +1,5 @@
+- We have launches new pricing plans, Essential, Pro and Believer
+- Free users can now upload attachments and create private vault
+- Minor bug fixes and improvements
+
+Thank you for using Notesnook!