mirror of
https://github.com/streetwriters/notesnook.git
synced 2025-12-16 19:57:52 +01:00
Merge pull request #8865 from streetwriters/mobile-fix-crash-sub-status
mobile: fix crash in subscription-status settings item
This commit is contained in:
@@ -82,15 +82,22 @@ export const settingsGroups: SettingSection[] = [
|
|||||||
{
|
{
|
||||||
id: "subscription-status",
|
id: "subscription-status",
|
||||||
useHook: () => useUserStore((state) => state.user),
|
useHook: () => useUserStore((state) => state.user),
|
||||||
hidden: (current) =>
|
hidden: (current) => {
|
||||||
!current ||
|
const user = current as User;
|
||||||
(current as User).subscription?.plan === SubscriptionPlan.FREE,
|
return (
|
||||||
|
!user ||
|
||||||
|
!user.subscription ||
|
||||||
|
user.subscription.provider === undefined ||
|
||||||
|
!strings.subscriptionProviderInfo[user?.subscription?.provider] ||
|
||||||
|
user.subscription?.plan === SubscriptionPlan.FREE
|
||||||
|
);
|
||||||
|
},
|
||||||
name: (current) => {
|
name: (current) => {
|
||||||
const user = (current as User) || useUserStore.getState().user;
|
const user = (current as User) || useUserStore.getState().user;
|
||||||
return (
|
return (
|
||||||
strings.subscriptionProviderInfo[
|
strings.subscriptionProviderInfo[
|
||||||
user?.subscription?.provider
|
user?.subscription?.provider
|
||||||
].title() || "Unknown provider"
|
]?.title() || `Unknown provider id: ${user?.subscription?.provider}`
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
icon: "credit-card",
|
icon: "credit-card",
|
||||||
@@ -100,6 +107,8 @@ export const settingsGroups: SettingSection[] = [
|
|||||||
const subscriptionProviderInfo =
|
const subscriptionProviderInfo =
|
||||||
strings.subscriptionProviderInfo[user?.subscription?.provider];
|
strings.subscriptionProviderInfo[user?.subscription?.provider];
|
||||||
|
|
||||||
|
if (!subscriptionProviderInfo) return;
|
||||||
|
|
||||||
const isCurrentPlatform =
|
const isCurrentPlatform =
|
||||||
(user.subscription?.provider === SubscriptionProvider.APPLE &&
|
(user.subscription?.provider === SubscriptionProvider.APPLE &&
|
||||||
Platform.OS === "ios") ||
|
Platform.OS === "ios") ||
|
||||||
|
|||||||
Reference in New Issue
Block a user