A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
mobile: fix pricing plans
Ammar Ahmed2ce245659a03
diff --git a/apps/mobile/app/components/announcements/index.js b/apps/mobile/app/components/announcements/index.jsindex 889a538f5..542c799a2 100644--- a/apps/mobile/app/components/announcements/index.js+++ b/apps/mobile/app/components/announcements/index.js@@ -34,10 +34,69 @@ import BaseDialog from "../dialog/base-dialog";import { allowedOnPlatform, renderItem } from "./functions";import { useCallback } from "react";+/**+ * Test announcement+ * {+ id: "some-announcement",+ type: "dialog",+ body: [+ {+ type: "title",+ text: "This is a title",+ platforms: ["all"]+ },+ {+ type: "description",+ text: "Most of you are too busy to keep up to date with what's happening in Notesnook. That is unfortunate because Notesnook has come a looooong way.",+ style: {+ marginBottom: 1+ },+ platforms: ["all"]+ },+ {+ type: "description",+ text: "To solve this, we are launching the Notesnook Digest — a newsletter to help you stay updated about Notesnook development. And to keep things interesting I'll also sprinkle this newsletter with other interesting stuff like privacy tips & news, interesting books, things I am looking forward to etc.",+ style: {+ marginBottom: 1+ },+ platforms: ["all"]+ },+ {+ type: "description",+ text: "So be sure to subscribe. There won't be a proper schedule to this (yet) maybe once or twice a month. I promise no spam — only more awesomeness.",+ style: {+ marginBottom: 1+ },+ platforms: ["all"]+ },+ {+ type: "description",+ text: "— May privacy reign.",+ style: {+ marginBottom: 1+ },+ platforms: ["all"]+ },+ {+ type: "callToActions",+ actions: [+ {+ type: "promo",+ title: "15% Off",+ platforms: ["android"],+ data: "com.streetwriters.notesnook.sub.yr.15"+ }+ ],+ platforms: ["all"]+ }+ ]+ }+ */+export const AnnouncementDialog = () => {const { colors } = useThemeColors();const [visible, setVisible] = useState(false);- const [info, setInfo] = useState(null);+ const [info, setInfo] = useState();const remove = useMessageStore((state) => state.remove);useEffect(() => {@@ -51,7 +110,9 @@ export const AnnouncementDialog = () => {const open = (data) => {setInfo(data);- setVisible(true);+ setImmediate(() => {+ setVisible(true);+ });};const close = useCallback(() => {diff --git a/apps/mobile/app/components/premium/pricing-item.tsx b/apps/mobile/app/components/premium/pricing-item.tsxindex a06a6c657..2438f1e83 100644--- a/apps/mobile/app/components/premium/pricing-item.tsx+++ b/apps/mobile/app/components/premium/pricing-item.tsx@@ -28,7 +28,8 @@ import RNIap from "react-native-iap";export const PricingItem = ({product,onPress,- compact+ compact,+ strikethrough}: {product: {type: "yearly" | "monthly";@@ -36,6 +37,7 @@ export const PricingItem = ({info: string;offerType?: "yearly" | "monthly";};+ strikethrough?: boolean;onPress?: () => void;compact?: boolean;}) => {@@ -50,8 +52,10 @@ export const PricingItem = ({paddingHorizontal: 12,paddingVertical: compact ? 15 : 10,width: compact ? null : "100%",- minWidth: 150+ minWidth: 150,+ opacity: strikethrough ? 0.7 : 1}}+ disabled={strikethrough}>{!compact && (<View>@@ -67,8 +71,18 @@ export const PricingItem = ({)}<View>- <Paragraph size={SIZE.sm}>- <Heading size={SIZE.lg - 2}>+ <Paragraph+ style={{+ textDecorationLine: strikethrough ? "line-through" : undefined+ }}+ size={SIZE.sm}+ >+ <Heading+ style={{+ textDecorationLine: strikethrough ? "line-through" : undefined+ }}+ size={SIZE.lg - 2}+ >{Platform.OS === "android"? (product.data as RNIap.SubscriptionAndroid | undefined)?.subscriptionOfferDetails[0].pricingPhasesdiff --git a/apps/mobile/app/components/premium/pricing-plans.tsx b/apps/mobile/app/components/premium/pricing-plans.tsxindex c7be83ffd..6cd625d2b 100644--- a/apps/mobile/app/components/premium/pricing-plans.tsx+++ b/apps/mobile/app/components/premium/pricing-plans.tsx@@ -213,6 +213,35 @@ export const PricingPlans = ({}};+ function getStandardPrice() {+ if (!product) return;+ const productType = product.offerType;++ if (Platform.OS === "android") {+ const pricingPhaseListItem = (product.data as RNIap.SubscriptionAndroid)+ ?.subscriptionOfferDetails[0]?.pricingPhases.pricingPhaseList?.[1];++ if (!pricingPhaseListItem) {+ const product =+ productType === "monthly"+ ? monthlyPlan?.product+ : yearlyPlan?.product;+ return (product as RNIap.SubscriptionAndroid)+ ?.subscriptionOfferDetails[0]?.pricingPhases.pricingPhaseList?.[0]+ ?.formattedPrice;+ }++ return pricingPhaseListItem?.formattedPrice;+ } else {+ const productDefault =+ productType === "monthly" ? monthlyPlan?.product : yearlyPlan?.product;+ return (+ (product.data as RNIap.SubscriptionIOS)?.localizedPrice ||+ (productDefault as RNIap.SubscriptionIOS)?.localizedPrice+ );+ }+ }+return loading ? (<Viewstyle={{@@ -292,34 +321,84 @@ export const PricingPlans = ({) : (<>{product?.type === "promo" ? (- <Heading+ <Viewstyle={{paddingVertical: 15,- alignSelf: "center",- textAlign: "center"+ alignItems: "center"}}- size={SIZE.lg - 4}>- {Platform.OS === "android"- ? (product.data as RNIap.SubscriptionAndroid)- ?.subscriptionOfferDetails[0].pricingPhases- .pricingPhaseList?.[0].formattedPrice- : (product.data as RNIap.SubscriptionIOS)?.introductoryPrice}- <Paragraph+ {product?.offerType === "monthly" ? (+ <PricingItem+ product={{+ type: "monthly",+ data: monthlyPlan?.product,+ info: "Pay once a month, cancel anytime."+ }}+ strikethrough={true}+ />+ ) : (+ <PricingItem+ onPress={() => {+ if (!monthlyPlan?.product) return;+ buySubscription(monthlyPlan?.product);+ }}+ product={{+ type: "yearly",+ data: yearlyPlan?.product,+ info: "Pay once a year, cancel anytime."+ }}+ strikethrough={true}+ />+ )}++ <Headingstyle={{- textDecorationLine: "line-through",- color: colors.secondary.paragraph+ paddingTop: 15,+ fontSize: SIZE.lg}}- size={SIZE.sm}>- {Platform.OS === "android"- ? (product.data as RNIap.SubscriptionAndroid)- ?.subscriptionOfferDetails[1]?.pricingPhases- .pricingPhaseList?.[1]?.formattedPrice- : (product.data as RNIap.SubscriptionIOS)?.localizedPrice}- </Paragraph>{" "}- for {product.cycleText}- </Heading>+ Special offer for you+ </Heading>++ <View+ style={{+ paddingVertical: 20,+ paddingBottom: 10+ }}+ >+ <Heading+ style={{+ alignSelf: "center",+ textAlign: "center"+ }}+ size={SIZE.xxl}+ >+ {Platform.OS === "android"+ ? (product.data as RNIap.SubscriptionAndroid)+ ?.subscriptionOfferDetails[0].pricingPhases+ .pricingPhaseList?.[0]?.formattedPrice+ : (product.data as RNIap.SubscriptionIOS)+ ?.introductoryPrice ||+ (product.data as RNIap.SubscriptionIOS)+ ?.localizedPrice}{" "}+ {product?.cycleText+ ? `for ${product.cycleText}`+ : product?.offerType}+ </Heading>+ {product?.cycleText ? (+ <Paragraph+ style={{+ color: colors.secondary.paragraph,+ alignSelf: "center",+ textAlign: "center"+ }}+ size={SIZE.md}+ >+ then {getStandardPrice()} {product?.offerType}.+ </Paragraph>+ ) : null}+ </View>+ </View>) : null}{user && !product ? (@@ -334,7 +413,12 @@ export const PricingPlans = ({marginBottom: 20}}>- <Heading color={colors.primary.accent}>+ <Heading+ style={{+ textAlign: "center"+ }}+ color={colors.primary.accent}+ >Get {monthlyPlan?.info?.discount}% off in{" "}{monthlyPlan?.info?.country}</Heading>@@ -369,7 +453,7 @@ export const PricingPlans = ({product={{type: "monthly",data: monthlyPlan?.product,- info: "Pay monthly, cancel anytime."+ info: "Pay once a month, cancel anytime."}}/>@@ -391,7 +475,7 @@ export const PricingPlans = ({product={{type: "yearly",data: yearlyPlan?.product,- info: "Pay yearly"+ info: "Pay once a year, cancel anytime."}}/></View>@@ -463,7 +547,7 @@ export const PricingPlans = ({width={250}style={{paddingHorizontal: 12,- marginTop: 30,+ marginTop: product?.type === "promo" ? 0 : 30,marginBottom: 10}}/>