diff --git a/apps/mobile/app/components/sheets/paywall/index.tsx b/apps/mobile/app/components/sheets/paywall/index.tsx index f8d080100..a077760ae 100644 --- a/apps/mobile/app/components/sheets/paywall/index.tsx +++ b/apps/mobile/app/components/sheets/paywall/index.tsx @@ -157,7 +157,7 @@ export default function PaywallSheet(props: { style={{ width: "100%", paddingHorizontal: Spacing.LEVEL_3, - paddingVertical: Spacing.LEVEL_4, + paddingTop: Spacing.LEVEL_4, gap: Spacing.LEVEL_3 }} > diff --git a/apps/mobile/app/components/ui/sheet/index.jsx b/apps/mobile/app/components/ui/sheet/index.jsx index cad3ac349..b4e6dec0b 100644 --- a/apps/mobile/app/components/ui/sheet/index.jsx +++ b/apps/mobile/app/components/ui/sheet/index.jsx @@ -19,7 +19,7 @@ along with this program. If not, see . import { ScopedThemeProvider, useThemeColors } from "@notesnook/theme"; import React, { useEffect, useRef } from "react"; -import { Platform, View } from "react-native"; +import { Platform } from "react-native"; import ActionSheet from "react-native-actions-sheet"; import useGlobalSafeAreaInsets from "../../../hooks/use-global-safe-area-insets"; import { useSettingStore } from "../../../stores/use-setting-store"; @@ -161,14 +161,6 @@ const SheetWrapper = ({ onClose={_onClose} > {children} - - {bottomPadding ? ( - - ) : null} ); diff --git a/apps/mobile/app/screens/settings/section-item.tsx b/apps/mobile/app/screens/settings/section-item.tsx index 3a6f84254..e0c0a26f6 100644 --- a/apps/mobile/app/screens/settings/section-item.tsx +++ b/apps/mobile/app/screens/settings/section-item.tsx @@ -166,11 +166,12 @@ const _SectionItem = ({ item }: { item: SettingSection }) => { justifyContent: "space-between", paddingHorizontal: Spacing.LEVEL_3, paddingVertical: item.component && !item.name ? 0 : Spacing.LEVEL_1, - borderRadius: Radius.S, - backgroundColor: colors.primary.background, + borderRadius: 0, marginBottom: Spacing.LEVEL_0, overflow: "hidden" }} + type="transparent" + noborder onPress={async () => { if (!checkIsFeatureAvailable()) return; if (isDisabled) return; @@ -267,7 +268,7 @@ const _SectionItem = ({ item }: { item: SettingSection }) => { {!isFeatureAvailable?.isAllowed ? ( { > {isFeatureAvailable?.availableOn ? ( { fontSize="XXS" fontFamily="MEDIUM" > - {planToDisplayNameShort(isFeatureAvailable?.availableOn)} + Pro ) : null} @@ -299,7 +301,7 @@ const _SectionItem = ({ item }: { item: SettingSection }) => { {typeof item.description === "function" ? item.description(current) @@ -308,31 +310,41 @@ const _SectionItem = ({ item }: { item: SettingSection }) => { ) : null} - {item.type === "switch" && !loading && ( - - )} + {loading || item.type === "switch" ? ( + + {item.type === "switch" && !loading && ( + + )} + {loading ? ( + + ) : null} + + ) : null} {item.type === "screen" ? ( ) : null} - - {loading ? ( - - ) : null} - - - - - - + +