Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

mobile: minor improvements

Ammar Ahmedcfe0cded1596
diff --git a/apps/mobile/app/components/auth/two-factor.js b/apps/mobile/app/components/auth/two-factor.js
index 0277cf74d..e0f67d24b 100644
--- a/apps/mobile/app/components/auth/two-factor.js
+++ b/apps/mobile/app/components/auth/two-factor.js
@@ -206,13 +206,15 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
code.current = value;
//onNext();
}}
+ cursorColor={colors.selected.accent}
+ selectionHandleColor={colors.selected.accent}
+ selectionColor={colors.selected.accent}
onSubmitEditing={onNext}
- caretHidden
height={60}
inputStyle={{
fontSize: AppFontSize.lg,
textAlign: "center",
- letterSpacing: 10,
+ letterSpacing: 7,
width: 250
}}
keyboardType={
@@ -220,8 +222,6 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
}
enablesReturnKeyAutomatically
containerStyle={{
- borderWidth: 0,
- width: undefined,
minWidth: "50%"
}}
wrapperStyle={{
diff --git a/apps/mobile/app/components/sheets/buy-plan/index.tsx b/apps/mobile/app/components/sheets/buy-plan/index.tsx
index a31c768ba..2f467efd3 100644
--- a/apps/mobile/app/components/sheets/buy-plan/index.tsx
+++ b/apps/mobile/app/components/sheets/buy-plan/index.tsx
@@ -27,7 +27,6 @@ import * as RNIap from "react-native-iap";
import Icon from "react-native-vector-icons/MaterialCommunityIcons";
import { WebView } from "react-native-webview";
import { db } from "../../../common/database";
-import useGlobalSafeAreaInsets from "../../../hooks/use-global-safe-area-insets";
import usePricingPlans from "../../../hooks/use-pricing-plans";
import { openLinkInBrowser } from "../../../utils/functions";
import { AppFontSize, defaultBorderRadius } from "../../../utils/size";
@@ -44,7 +43,6 @@ export const BuyPlan = (props: {
goNext: () => void;
}) => {
const { colors } = useThemeColors();
- const insets = useGlobalSafeAreaInsets();
const [checkoutUrl, setCheckoutUrl] = useState<string>();
const pricingPlans = usePricingPlans({
planId: props.planId,
@@ -66,6 +64,8 @@ export const BuyPlan = (props: {
: (pricingPlans.selectedProduct as RNIap.Product)?.productId
)?.includes("5");
+ console.log(checkoutUrl);
+
return checkoutUrl ? (
<View
style={{
@@ -98,11 +98,12 @@ export const BuyPlan = (props: {
`
}}
onMessage={(message) => {
- const data = JSON.parse(message.nativeEvent.data);
- if (data.success) {
- props.goNext();
- }
- return;
+ try {
+ const data = JSON.parse(message.nativeEvent.data);
+ if (data.success) {
+ props.goNext();
+ }
+ } catch (e) {}
}}
domStorageEnabled
javaScriptEnabled
diff --git a/apps/mobile/app/screens/settings/user-section.jsx b/apps/mobile/app/screens/settings/user-section.jsx
index e45f345d4..ef885850e 100644
--- a/apps/mobile/app/screens/settings/user-section.jsx
+++ b/apps/mobile/app/screens/settings/user-section.jsx
@@ -305,7 +305,8 @@ const SettingsUserSection = ({ item }) => {
style={{
paddingVertical: DefaultAppStyles.GAP_SMALL,
gap: DefaultAppStyles.GAP_VERTICAL,
- borderRadius: 10
+ borderRadius: 10,
+ marginBottom: 10
}}
>
<View
@@ -402,8 +403,7 @@ const SettingsUserSection = ({ item }) => {
</View>
</View>
- {user.subscription.plan === SubscriptionPlan.FREE ||
- user.subscription.type === SubscriptionType.BASIC ? null : (
+ {user.subscription.plan === SubscriptionPlan.FREE ? null : (
<Notice
size="small"
text={getSubscriptionStatus()}
diff --git a/apps/mobile/app/services/premium.ts b/apps/mobile/app/services/premium.ts
index ab623e564..da4fc9c53 100644
--- a/apps/mobile/app/services/premium.ts
+++ b/apps/mobile/app/services/premium.ts
@@ -90,15 +90,6 @@ async function loadProductsAndSubs() {
function get() {
// if (__DEV__ || Config.isTesting === "true") return true;
- if (
- SubscriptionType.BASIC !==
- useUserStore.getState().user?.subscription.type &&
- (!useUserStore.getState().user?.subscription?.plan ||
- useUserStore.getState().user?.subscription?.plan ===
- SubscriptionPlan.FREE)
- )
- return true;
-
return (
useUserStore.getState().user?.subscription?.plan !== undefined &&
useUserStore.getState().user?.subscription?.plan !== SubscriptionPlan.FREE