From 394226d46be607bca4dda6bddb3f5eb14cad7128 Mon Sep 17 00:00:00 2001 From: Ammar Ahmed Date: Wed, 5 Aug 2026 11:08:39 +0500 Subject: [PATCH] mobile: fix settings module related issues --- .../app/components/sheet-provider/index.jsx | 9 +-- .../sheets/app-lock-timeout/index.tsx | 4 +- .../sheets/lock-vault-timer/index.tsx | 4 +- .../sheets/trash-interval/index.tsx | 4 +- .../app/components/side-menu/menu-item.tsx | 1 + .../components/side-menu/side-menu-header.tsx | 4 +- .../components/side-menu/side-menu-home.tsx | 34 ++++++----- .../side-menu/sync-status-button.tsx | 56 ++++++++++++++++-- .../app/components/ui/pressable/use-button.ts | 4 +- .../components/editor/configure-toolbar.tsx | 4 ++ .../settings/components/editor/group.tsx | 10 ++-- .../settings/components/editor/tool-sheet.tsx | 15 ++--- .../settings/components/picker/index.tsx | 8 +-- .../settings/components/picker/pickers.tsx | 6 +- .../settings/components/theme-selector.tsx | 8 +-- apps/mobile/app/services/event-manager.ts | 1 + apps/mobile/app/services/sync.ts | 3 + apps/mobile/app/stores/use-user-store.ts | 2 + .../fonts/notesnook-icons.glyphmap.json | 2 +- apps/mobile/fonts/notesnook-icons.ttf | Bin 42348 -> 42492 bytes .../ios/nanoicons-fonts/notesnook-icons.ttf | Bin 42348 -> 42492 bytes packages/icons/svgs/warning-circle-filled.svg | 3 + packages/intl/locale/en.po | 25 ++++++-- packages/intl/locale/pseudo-LOCALE.po | 25 ++++++-- packages/intl/src/strings.ts | 10 +++- 25 files changed, 175 insertions(+), 67 deletions(-) create mode 100644 packages/icons/svgs/warning-circle-filled.svg diff --git a/apps/mobile/app/components/sheet-provider/index.jsx b/apps/mobile/app/components/sheet-provider/index.jsx index 1c5ba4a6c..ae6fac815 100644 --- a/apps/mobile/app/components/sheet-provider/index.jsx +++ b/apps/mobile/app/components/sheet-provider/index.jsx @@ -143,15 +143,16 @@ const SheetProvider = ({ context = "global" }) => { borderRadius: Radius.XS, alignItems: "center", justifyContent: "center", - backgroundColor: colors.secondary.background + backgroundColor: + data.iconBackground || colors.secondary.background }} > {data.icon ? ( ) : ( { {data.title ? ( diff --git a/apps/mobile/app/components/sheets/app-lock-timeout/index.tsx b/apps/mobile/app/components/sheets/app-lock-timeout/index.tsx index eb36cf77c..7df3285a1 100644 --- a/apps/mobile/app/components/sheets/app-lock-timeout/index.tsx +++ b/apps/mobile/app/components/sheets/app-lock-timeout/index.tsx @@ -139,7 +139,9 @@ function AppLockTimeout({ close }: AppLockTimeoutProps) { padding: Spacing.LEVEL_2, borderRadius: Radius.XS, borderWidth: selected ? 0 : 1, - borderColor: colors.primary.border + borderColor: selected + ? colors.selected.border + : colors.secondary.border }} > { flexDirection: "row", justifyContent: "space-between", alignItems: "center", - paddingHorizontal: Spacing.LEVEL_3, + paddingHorizontal: Spacing.LEVEL_3 }} > { style={{ flexDirection: "row", alignItems: "center", - gap: DefaultAppStyles.GAP_SMALL + gap: Spacing.LEVEL_2 }} > {props.rightButtons?.map((button, index) => ( diff --git a/apps/mobile/app/components/side-menu/side-menu-home.tsx b/apps/mobile/app/components/side-menu/side-menu-home.tsx index 59f171c72..ed329bc18 100644 --- a/apps/mobile/app/components/side-menu/side-menu-home.tsx +++ b/apps/mobile/app/components/side-menu/side-menu-home.tsx @@ -30,7 +30,6 @@ import { useMenuStore } from "../../stores/use-menu-store"; import { useSettingStore } from "../../stores/use-setting-store"; import { useUserStore } from "../../stores/use-user-store"; import { MenuItemsList } from "../../utils/menu-items"; -import { DefaultAppStyles } from "../../utils/styles"; import ReorderableList from "../list/reorderable-list"; import { MenuItemProperties } from "../sheets/menu-item-properties"; import { Button } from "../ui/button"; @@ -68,7 +67,6 @@ export function SideMenuHome() { const colorNotes = useMenuStore((state) => state.colorNotes); const menuPins = useMenuStore((state) => state.menuPins); - return ( {colorNotes.length > 0 && ( - + )} {menuPins.length > 0 && ( - + )} {menuPins.length > 0 && } @@ -167,7 +169,7 @@ export function SideMenuHome() { {(subscriptionType === SubscriptionPlan.FREE || !subscriptionType || !user) && - !SettingsService.getProperty("serverUrls") ? ( + !SettingsService.getProperty("serverUrls") ? (