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") ? (
) : (
{
{!syncing && (isFailed || isOffline) ? (
) : null}
diff --git a/apps/mobile/app/components/ui/pressable/use-button.ts b/apps/mobile/app/components/ui/pressable/use-button.ts
index e842bc96c..c1d6d4295 100644
--- a/apps/mobile/app/components/ui/pressable/use-button.ts
+++ b/apps/mobile/app/components/ui/pressable/use-button.ts
@@ -134,9 +134,9 @@ const buttonTypes = (
text: colors.selected.buttonForeground,
selected: colors.selected.background,
borderWidth: 0.8,
- borderColor: getColorLinearShade(colors.selected.background, 0.05, isDark),
+ borderColor: colors.selected.border,
borderSelectedColor: getColorLinearShade(
- colors.selected.background,
+ colors.selected.border,
0.05,
isDark
)
diff --git a/apps/mobile/app/screens/settings/components/editor/configure-toolbar.tsx b/apps/mobile/app/screens/settings/components/editor/configure-toolbar.tsx
index 4f1ae427e..0fb6a4d3e 100644
--- a/apps/mobile/app/screens/settings/components/editor/configure-toolbar.tsx
+++ b/apps/mobile/app/screens/settings/components/editor/configure-toolbar.tsx
@@ -52,6 +52,10 @@ export const ConfigureToolbar = () => {
const _data = data ? data.slice() : [];
_data.push([]);
useDragState.getState().setData(_data);
+ ToastManager.show({
+ message: strings.groupCreated(),
+ type: "success"
+ });
};
const renderGroups = () => {
diff --git a/apps/mobile/app/screens/settings/components/editor/group.tsx b/apps/mobile/app/screens/settings/components/editor/group.tsx
index 046565309..384f503a5 100644
--- a/apps/mobile/app/screens/settings/components/editor/group.tsx
+++ b/apps/mobile/app/screens/settings/components/editor/group.tsx
@@ -26,7 +26,6 @@ import { presentDialog } from "../../../../components/dialog/functions";
import AppIcon from "../../../../components/ui/AppIcon";
import { IconButton } from "../../../../components/ui/icon-button";
import Heading from "../../../../components/ui/typography/heading";
-import { getElevationStyle } from "../../../../utils/elevation";
import { renderTool } from "./common";
import { DraggableItem, useDragState } from "./state";
import ToolSheet from "./tool-sheet";
@@ -34,9 +33,9 @@ import ToolSheet from "./tool-sheet";
import { isFeatureAvailable, useIsFeatureAvailable } from "@notesnook/common";
import type { ToolId } from "@notesnook/editor";
import { strings } from "@notesnook/intl";
+import { Radius, Spacing } from "../../../../common/design/spacing";
import { ToastManager } from "../../../../services/event-manager";
import { DefaultAppStyles } from "../../../../utils/styles";
-import { Radius, Spacing } from "../../../../common/design/spacing";
export const Group = ({
item,
@@ -152,16 +151,19 @@ export const Group = ({
}
presentDialog({
context: "global",
+ positiveType: "error-shade-outline",
title: strings.deleteGroup(),
positiveText: strings.delete(),
paragraph: strings.deleteGroupDesc(),
positivePress: async () => {
if (groupIndex === undefined) return;
const _data = useDragState.getState().data.slice();
-
_data.splice(groupIndex, 1);
-
setData(_data);
+ ToastManager.show({
+ type: "success",
+ heading: strings.groupDeleted()
+ });
}
});
}
diff --git a/apps/mobile/app/screens/settings/components/editor/tool-sheet.tsx b/apps/mobile/app/screens/settings/components/editor/tool-sheet.tsx
index d8538a2b9..8284e986a 100644
--- a/apps/mobile/app/screens/settings/components/editor/tool-sheet.tsx
+++ b/apps/mobile/app/screens/settings/components/editor/tool-sheet.tsx
@@ -31,7 +31,6 @@ import { SvgView } from "../../../../components/ui/svg";
import Heading from "../../../../components/ui/typography/heading";
import Paragraph from "../../../../components/ui/typography/paragraph";
import { presentSheet } from "../../../../services/event-manager";
-import { DefaultAppStyles } from "../../../../utils/styles";
import { DraggableItem, useDragState } from "./state";
import {
findToolById,
@@ -210,12 +209,14 @@ function ToolSheet({
)}
-
+ {ungrouped.length === 0 ? null : (
+
+ )}
);
}
diff --git a/apps/mobile/app/screens/settings/components/picker/index.tsx b/apps/mobile/app/screens/settings/components/picker/index.tsx
index 6ea685671..e862144e6 100644
--- a/apps/mobile/app/screens/settings/components/picker/index.tsx
+++ b/apps/mobile/app/screens/settings/components/picker/index.tsx
@@ -104,23 +104,21 @@ export function SettingsPicker({
fontSize={AppFontSize.sm}
fontFamily="REGULAR"
type={
- compareValue(currentValue, item)
- ? "shade-plain"
- : "plain-outline"
+ compareValue(currentValue, item) ? "selected" : "plain-outline"
}
onPress={() => {
onChange(item);
}}
textStyle={{
color: compareValue(currentValue, item)
- ? colors.primary.heading
+ ? colors.selected.heading
: colors.primary.paragraph
}}
style={{
paddingVertical: Spacing.LEVEL_1,
paddingHorizontal: Spacing.LEVEL_1,
borderRadius: Radius.XS,
- borderWidth: 1,
+ borderWidth: compareValue(currentValue, item) ? 0 : 1,
borderColor: compareValue(currentValue, item)
? "transparent"
: colors.primary.border
diff --git a/apps/mobile/app/screens/settings/components/picker/pickers.tsx b/apps/mobile/app/screens/settings/components/picker/pickers.tsx
index a3d9dde2b..0af7267fb 100644
--- a/apps/mobile/app/screens/settings/components/picker/pickers.tsx
+++ b/apps/mobile/app/screens/settings/components/picker/pickers.tsx
@@ -39,7 +39,7 @@ import { strings } from "@notesnook/intl";
import { isFeatureAvailable } from "@notesnook/common";
import PaywallSheet from "../../../../components/sheets/paywall";
-const DAY_FORMATS = ["short", "long"];
+const DAY_FORMATS = ["long", "short"];
const DayFormatFormats = {
short: "ddd",
long: "dddd"
@@ -137,7 +137,7 @@ export const DayFormatPicker = createSettingsPicker({
});
},
formatValue: (item) => {
- return `${strings.dayFormat()} (${dayjs().format(DayFormatFormats[item])})`;
+ return `${strings.dayFormat()} (${item === "long" ? "full" : "short"})`;
},
getItemKey: (item) => item,
options: DAY_FORMATS as DayFormat[],
@@ -178,7 +178,7 @@ export const TimeFormatPicker = createSettingsPicker({
});
},
formatValue: (item) => {
- return `${strings[item]()} (${dayjs().format(TimeFormats[item])})`;
+ return `${strings[item]()}`;
},
getItemKey: (item) => item,
options: TIME_FORMATS as TimeFormat[],
diff --git a/apps/mobile/app/screens/settings/components/theme-selector.tsx b/apps/mobile/app/screens/settings/components/theme-selector.tsx
index 913ba2fba..2ab4a2460 100644
--- a/apps/mobile/app/screens/settings/components/theme-selector.tsx
+++ b/apps/mobile/app/screens/settings/components/theme-selector.tsx
@@ -504,7 +504,7 @@ function ThemeSelector() {
style={{
borderRadius: Radius.XXL,
paddingHorizontal: 14,
- paddingVertical: 10
+ paddingVertical: Spacing.LEVEL_1
}}
type={
colorScheme === "all" || !colorScheme
@@ -527,7 +527,7 @@ function ThemeSelector() {
style={{
borderRadius: Radius.XXL,
paddingHorizontal: 14,
- paddingVertical: 10
+ paddingVertical: Spacing.LEVEL_1
}}
type={colorScheme === "dark" ? "selected" : "plain-outline"}
textStyle={{
@@ -546,7 +546,7 @@ function ThemeSelector() {
style={{
borderRadius: Radius.XXL,
paddingHorizontal: 14,
- paddingVertical: 10
+ paddingVertical: Spacing.LEVEL_1
}}
fontSize={AppFontSize.sm}
type={colorScheme === "light" ? "selected" : "plain-outline"}
@@ -568,7 +568,7 @@ function ThemeSelector() {
style={{
borderRadius: Radius.XS,
paddingHorizontal: Spacing.LEVEL_2,
- paddingVertical: Spacing.LEVEL_2,
+ paddingVertical: Spacing.LEVEL_1,
minWidth: 123
}}
type={"accent-outline"}
diff --git a/apps/mobile/app/services/event-manager.ts b/apps/mobile/app/services/event-manager.ts
index 05f364882..5386cc4e0 100644
--- a/apps/mobile/app/services/event-manager.ts
+++ b/apps/mobile/app/services/event-manager.ts
@@ -151,6 +151,7 @@ export type PresentSheetOptions = {
action: () => void;
actionText: string;
iconColor?: string;
+ iconBackground?: string;
actionsArray: SheetAction[];
learnMore: string;
learnMorePress: () => void;
diff --git a/apps/mobile/app/services/sync.ts b/apps/mobile/app/services/sync.ts
index 555062d68..b4ae8335f 100644
--- a/apps/mobile/app/services/sync.ts
+++ b/apps/mobile/app/services/sync.ts
@@ -108,6 +108,9 @@ const run = async (
false,
error ? SyncStatus.Failed : SyncStatus.Passed
);
+ useUserStore.setState({
+ lastSyncError: error ? error : undefined
+ });
onCompleted?.(error ? SyncStatus.Failed : SyncStatus.Passed);
if (pendingSync)
Sync.run(
diff --git a/apps/mobile/app/stores/use-user-store.ts b/apps/mobile/app/stores/use-user-store.ts
index 217175179..6fa3a5938 100644
--- a/apps/mobile/app/stores/use-user-store.ts
+++ b/apps/mobile/app/stores/use-user-store.ts
@@ -38,6 +38,7 @@ export interface UserStore {
premium: boolean;
lastSynced: string | number;
syncing: boolean;
+ lastSyncError: Error | undefined;
lastSyncStatus: SyncStatus;
setUser: (user: User | null | undefined) => void;
setPremium: (premium: boolean) => void;
@@ -56,6 +57,7 @@ export const useUserStore = create((set) => ({
user: null,
premium: false,
lastSynced: "Never",
+ lastSyncError: undefined,
syncing: false,
appLocked: false,
setUser: (user) => set({ user: user }),
diff --git a/apps/mobile/fonts/notesnook-icons.glyphmap.json b/apps/mobile/fonts/notesnook-icons.glyphmap.json
index c74c4e6cb..388bf8ecc 100644
--- a/apps/mobile/fonts/notesnook-icons.glyphmap.json
+++ b/apps/mobile/fonts/notesnook-icons.glyphmap.json
@@ -1 +1 @@
-{"m":{"f":"notesnook-icons","u":1024,"z":1020,"s":59648,"h":"004df8caa9d5feae86d686b48201a74e7dbed0b9e8ff86321bf8012bacbef745"},"i":{"archive":[1024,[[59648,"#666666"]]],"arrow-back":[1024,[[59649,"rgba(255,255,255,0.7)"]]],"arrow-clockwise":[1024,[[59650,"#181818"]]],"arrow-counter-clockwise":[1024,[[59651,"#181818"]]],"arrow-fat-up":[1024,[[59652,"var(--fill-0, #181818)"]]],"arrow-right":[1024,[[59653,"#008836"]]],"arrow-square-out":[1024,[[59654,"#666666"]]],"arrow-u-up-left":[1024,[[59655,"var(--fill-0, #181818)"]]],"arrows-clockwise":[1024,[[59656,"var(--fill-0, #181818)"]]],"article-ny-times":[1024,[[59657,"#181818"]]],"backspace":[1024,[[59658,"#181818"]]],"bag-simple":[1024,[[59659,"var(--fill-0, #181818)"]]],"bell-z":[1024,[[59660,"#181818"]]],"bell":[1024,[[59661,"#666666"]]],"bomb-off":[1024,[[59662,"currentColor"]]],"bomb":[1024,[[59663,"#666666"]]],"book-open":[1024,[[59664,"#666666"]]],"bookmark":[1024,[[59665,"#666666"]]],"box-empty":[1024,[[59666,"#B0B0B1"]]],"bug-droid":[1024,[[59667,"var(--fill-0, #181818)"]]],"calendar-check":[946,[[59668,"var(--fill-0, #181818)"]]],"calendar-day":[1024,[[59669,"#181818"]]],"calendar-dots":[946,[[59670,"var(--fill-0, #181818)"]]],"calendar":[1024,[[59671,"rgba(102,102,102,0.8)"]]],"chart-donut":[1024,[[59672,"#181818"]]],"chart-line-up":[1024,[[59673,"var(--fill-0, #181818)"]]],"chat":[1024,[[59674,"currentColor"]]],"check-circle":[1024,[[59675,"#008836"]]],"check-small":[951,[[59676,"#008836"]]],"check-square":[1024,[[59677,"#181818"]]],"check":[1024,[[59678,"#008836"]]],"checkbox-intermediate":[1024,[[59679,"currentColor"]]],"checkbox":[1024,[[59680,"#008836"],[59681,"white"]]],"checks":[1024,[[59682,"#181818"]]],"chevron-down":[1024,[[59683,"#181818"]]],"chevron-left":[1024,[[59684,"currentColor"]]],"chevron-right":[1024,[[59685,"currentColor"]]],"chevron-up":[1024,[[59686,"#181818"]]],"clock-counter-clockwise":[1024,[[59687,"var(--fill-0, #181818)"]]],"clock":[1024,[[59688,"currentColor"]]],"close":[1024,[[59689,"#666666"]]],"cloud-check":[1024,[[59690,"var(--fill-0, #181818)"]]],"cloud-upload":[1024,[[59691,"#858585"]]],"cloud":[1024,[[59692,"white"]]],"copy":[1024,[[59693,"#008836"]]],"crown-simple":[1024,[[59694,"#E0B637"]]],"dark-mode-outline":[1024,[[59695,"currentColor"]]],"delete-restore":[1024,[[59696,"currentColor"]]],"device-mobile-camera":[1024,[[59697,"var(--fill-0, #181818)"]]],"discord-logo":[1024,[[59698,"var(--fill-0, #181818)"]]],"dots-six-vertical":[1024,[[59699,"#666666"]]],"dots-three":[1024,[[59700,"#202020"]]],"download-simple":[1024,[[59701,"var(--fill-0, #181818)"]]],"drive-file-move":[1088,[[59702,"#666666"]]],"duplicate":[1024,[[59703,"currentColor"]]],"edit-pencil":[1024,[[59704,"#181818"]]],"ellipse":[1024,[[59705,"#A6A6A6"]]],"envelope-simple":[1024,[[59706,"currentColor"]]],"export":[1024,[[59707,"var(--fill-0, #181818)"]]],"eye-closed":[1024,[[59708,"currentColor"]]],"eye-filled":[1024,[[59709,"#666666"]]],"eye-open":[1024,[[59710,"currentColor"]]],"eye-slash":[1024,[[59711,"var(--fill-0, #181818)"]]],"file-cloud":[1024,[[59712,"#181818"]]],"file-dashed":[1024,[[59713,"var(--fill-0, #181818)"]]],"file-html":[1024,[[59714,"#181818"]]],"file-pdf":[1024,[[59715,"#181818"]]],"file-text":[1024,[[59716,"var(--fill-0, #181818)"]]],"file":[1024,[[59717,"white"]]],"fingerprint-simple":[1024,[[59718,"#181818"]]],"folder-lock":[1024,[[59719,"#181818"]]],"folder":[1024,[[59720,"#181818"]]],"format-arrows-in-simple":[1024,[[59721,"#666666"]]],"format-arrows-out-simple":[1024,[[59722,"#666666"]]],"format-arrows-vertical":[1024,[[59723,"#666666"]]],"format-check-small":[946,[[59724,"white"]]],"format-code-simple":[1024,[[59725,"#666666"]]],"format-font-size":[1024,[[59726,"#181818"]]],"format-frame":[1024,[[59727,"#666666"]]],"format-highlighter":[1024,[[59728,"#666666"]]],"format-link-simple-horizontal":[1024,[[59729,"#666666"]]],"format-link":[1024,[[59730,"#666666"]]],"format-list-dashes":[1024,[[59731,"#666666"]]],"format-list-numbers":[1024,[[59732,"#666666"]]],"format-math-operations":[1024,[[59733,"#666666"]]],"format-palette":[1024,[[59734,"#666666"]]],"format-text-aa":[1024,[[59735,"#666666"]]],"format-text-align-left":[1024,[[59736,"#666666"]]],"format-text-b":[1024,[[59737,"#666666"]]],"format-text-h-one":[1024,[[59738,"#666666"]]],"format-text-italic":[1024,[[59739,"#666666"]]],"format-text-strikethrough":[1024,[[59740,"#666666"]]],"format-text-subscript":[1024,[[59741,"#666666"]]],"format-text-superscript":[1024,[[59742,"#666666"]]],"format-text-t-slash":[1024,[[59743,"#666666"]]],"format-text-underline":[1024,[[59744,"#666666"]]],"funnel":[1024,[[59745,"#666666"]]],"gift":[1024,[[59746,"#181818"]]],"git-pull-request":[1024,[[59747,"var(--fill-0, #181818)"]]],"github-logo":[1024,[[59748,"#181818"]]],"grid-four":[1024,[[59749,"#666666"]]],"hard-drives":[1024,[[59750,"var(--fill-0, #181818)"]]],"home":[1024,[[59751,"#181818"]]],"house":[1024,[[59752,"#6F6F6F"]]],"identifier":[1024,[[59753,"currentColor"]]],"image-outline":[1024,[[59754,"white"]]],"image":[1024,[[59755,"#181818"]]],"key":[1024,[[59756,"var(--fill-0, #181818)"]]],"link-alt":[1024,[[59757,"#666666"]]],"link-simple":[1024,[[59758,"white"]]],"link":[560,[[59759,"#666666"]]],"list":[2190,[[59760,"#181818"]]],"lock-simple":[1024,[[59761,"currentColor"]]],"lock":[1024,[[59762,"#181818"]]],"markdown":[1024,[[59763,"#181818"]]],"mastodon-logo":[1024,[[59764,"var(--fill-0, #181818)"]]],"menu":[1024,[[59765,"#181818"]]],"message-badge-outline":[1024,[[59766,"currentColor"]]],"minus":[1024,[[59767,"#181818"]]],"mode-edit":[1024,[[59768,"#181818"]]],"moon":[1024,[[59769,"var(--fill-0, #181818)"]]],"music-notes":[1024,[[59770,"#181818"]]],"network":[1024,[[59771,"var(--fill-0, #181818)"]]],"note":[1024,[[59772,"#181818"]]],"notification":[1024,[[59773,"var(--fill-0, #181818)"]]],"numpad":[1024,[[59774,"#181818"]]],"nut":[1024,[[59775,"#181818"]]],"paint-brush-household":[1024,[[59776,"#181818"]]],"paint-roller":[1024,[[59777,"var(--fill-0, #181818)"]]],"palette":[1024,[[59778,"#666666"]]],"paperclip":[1024,[[59779,"#666666"]]],"pause":[1024,[[59780,"var(--fill-0, #181818)"]]],"pencil-ruler":[1024,[[59781,"#181818"]]],"pencil-simple-line":[1024,[[59782,"var(--fill-0, #181818)"]]],"pencil-simple-slash":[1024,[[59783,"#858585"]]],"pencil-simple":[1024,[[59784,"#181818"]]],"pin":[939,[[59785,"#666666"]]],"plus":[1024,[[59786,"#181818"]]],"radio-button":[1024,[[59787,"#008836"]]],"recovery-key-cloud-arrow-down":[1024,[[59788,"var(--fill-0, #181818)"]]],"recovery-key-copy":[1024,[[59789,"var(--stroke-0, #008836)"]]],"recovery-key-file":[1024,[[59790,"var(--fill-0, #181818)"]]],"recovery-key-key":[1024,[[59791,"var(--fill-0, #181818)"]]],"recovery-key-qr-code":[1024,[[59792,"var(--fill-0, #181818)"]]],"recovery-key-shield-check":[1024,[[59793,"var(--fill-0, #008836)"]]],"search":[1024,[[59794,"#181818"]]],"share":[1024,[[59795,"#666666"]]],"shield-check":[1024,[[59796,"#181818"]]],"shield-plus":[1024,[[59797,"#181818"]]],"shield":[1024,[[59798,"var(--fill-0, #181818)"]]],"shopping-mode":[1024,[[59799,"#666666"]]],"sliders-horizontal":[1024,[[59800,"var(--fill-0, #181818)"]]],"sliders":[1024,[[59801,"#181818"]]],"sort-ascending":[1024,[[59802,"#666666"]]],"sort-descending":[1024,[[59803,"currentColor"]]],"speaker-high":[1024,[[59804,"#181818"]]],"spellcheck":[1067,[[59805,"currentColor"]]],"square-out":[1024,[[59806,"#181818"]]],"squares-four":[1024,[[59807,"var(--fill-0, #181818)"]]],"star-filled":[1024,[[59808,"#E5C131"]]],"star":[1024,[[59809,"#666666"]]],"sun":[1024,[[59810,"#666666"]]],"swatches":[1024,[[59811,"var(--fill-0, #181818)"]]],"sync-disabled":[911,[[59812,"#858585"]]],"table":[1024,[[59813,"#181818"]]],"telegram-logo":[1024,[[59814,"var(--fill-0, #181818)"]]],"text-aa":[1024,[[59815,"#181818"]]],"toggle-off":[1725,[[59816,"#DADADA"]]],"toggle-on":[1725,[[59817,"#008836"]]],"trash-alt":[1024,[[59818,"#FB2C36"]]],"trash":[1024,[[59819,"#666666"]]],"tray-arrow-down":[1024,[[59820,"#181818"]]],"upload":[1024,[[59821,"#181818"]]],"user-circle-minus":[1024,[[59822,"var(--fill-0, #FF242E)"]]],"user-sheet-docs":[1024,[[59823,"var(--fill-0, #181818)"]]],"user-sheet-logout":[1024,[[59824,"var(--fill-0, #FB2C36)"]]],"user-sheet-settings":[1024,[[59825,"var(--fill-0, #181818)"]]],"user-sheet-support":[1024,[[59826,"var(--fill-0, #181818)"]]],"user-sheet-sync":[1024,[[59827,"var(--fill-0, #181818)"]]],"user":[1024,[[59828,"var(--fill-0, #181818)"]]],"users-three":[1024,[[59829,"var(--fill-0, #181818)"]]],"video-camera":[1024,[[59830,"#181818"]]],"view-list":[1024,[[59831,"#181818"]]],"warning-circle":[1024,[[59832,"currentColor"]]],"warning":[1024,[[59833,"#FF242E"]]],"wifi-slash":[1024,[[59834,"var(--fill-0, #181818)"]]],"wrench":[1024,[[59835,"#181818"]]],"x-logo":[1024,[[59836,"var(--fill-0, #181818)"]]]}}
\ No newline at end of file
+{"m":{"f":"notesnook-icons","u":1024,"z":1020,"s":59648,"h":"302f13bbf52af9c4339c279b4d929f815c71055daaab184bb8628b6cb47722c7"},"i":{"archive":[1024,[[59648,"#666666"]]],"arrow-back":[1024,[[59649,"rgba(255,255,255,0.7)"]]],"arrow-clockwise":[1024,[[59650,"#181818"]]],"arrow-counter-clockwise":[1024,[[59651,"#181818"]]],"arrow-fat-up":[1024,[[59652,"var(--fill-0, #181818)"]]],"arrow-right":[1024,[[59653,"#008836"]]],"arrow-square-out":[1024,[[59654,"#666666"]]],"arrow-u-up-left":[1024,[[59655,"var(--fill-0, #181818)"]]],"arrows-clockwise":[1024,[[59656,"var(--fill-0, #181818)"]]],"article-ny-times":[1024,[[59657,"#181818"]]],"backspace":[1024,[[59658,"#181818"]]],"bag-simple":[1024,[[59659,"var(--fill-0, #181818)"]]],"bell-z":[1024,[[59660,"#181818"]]],"bell":[1024,[[59661,"#666666"]]],"bomb-off":[1024,[[59662,"currentColor"]]],"bomb":[1024,[[59663,"#666666"]]],"book-open":[1024,[[59664,"#666666"]]],"bookmark":[1024,[[59665,"#666666"]]],"box-empty":[1024,[[59666,"#B0B0B1"]]],"bug-droid":[1024,[[59667,"var(--fill-0, #181818)"]]],"calendar-check":[946,[[59668,"var(--fill-0, #181818)"]]],"calendar-day":[1024,[[59669,"#181818"]]],"calendar-dots":[946,[[59670,"var(--fill-0, #181818)"]]],"calendar":[1024,[[59671,"rgba(102,102,102,0.8)"]]],"chart-donut":[1024,[[59672,"#181818"]]],"chart-line-up":[1024,[[59673,"var(--fill-0, #181818)"]]],"chat":[1024,[[59674,"currentColor"]]],"check-circle":[1024,[[59675,"#008836"]]],"check-small":[951,[[59676,"#008836"]]],"check-square":[1024,[[59677,"#181818"]]],"check":[1024,[[59678,"#008836"]]],"checkbox-intermediate":[1024,[[59679,"currentColor"]]],"checkbox":[1024,[[59680,"#008836"],[59681,"white"]]],"checks":[1024,[[59682,"#181818"]]],"chevron-down":[1024,[[59683,"#181818"]]],"chevron-left":[1024,[[59684,"currentColor"]]],"chevron-right":[1024,[[59685,"currentColor"]]],"chevron-up":[1024,[[59686,"#181818"]]],"clock-counter-clockwise":[1024,[[59687,"var(--fill-0, #181818)"]]],"clock":[1024,[[59688,"currentColor"]]],"close":[1024,[[59689,"#666666"]]],"cloud-check":[1024,[[59690,"var(--fill-0, #181818)"]]],"cloud-upload":[1024,[[59691,"#858585"]]],"cloud":[1024,[[59692,"white"]]],"copy":[1024,[[59693,"#008836"]]],"crown-simple":[1024,[[59694,"#E0B637"]]],"dark-mode-outline":[1024,[[59695,"currentColor"]]],"delete-restore":[1024,[[59696,"currentColor"]]],"device-mobile-camera":[1024,[[59697,"var(--fill-0, #181818)"]]],"discord-logo":[1024,[[59698,"var(--fill-0, #181818)"]]],"dots-six-vertical":[1024,[[59699,"#666666"]]],"dots-three":[1024,[[59700,"#202020"]]],"download-simple":[1024,[[59701,"var(--fill-0, #181818)"]]],"drive-file-move":[1088,[[59702,"#666666"]]],"duplicate":[1024,[[59703,"currentColor"]]],"edit-pencil":[1024,[[59704,"#181818"]]],"ellipse":[1024,[[59705,"#A6A6A6"]]],"envelope-simple":[1024,[[59706,"currentColor"]]],"export":[1024,[[59707,"var(--fill-0, #181818)"]]],"eye-closed":[1024,[[59708,"currentColor"]]],"eye-filled":[1024,[[59709,"#666666"]]],"eye-open":[1024,[[59710,"currentColor"]]],"eye-slash":[1024,[[59711,"var(--fill-0, #181818)"]]],"file-cloud":[1024,[[59712,"#181818"]]],"file-dashed":[1024,[[59713,"var(--fill-0, #181818)"]]],"file-html":[1024,[[59714,"#181818"]]],"file-pdf":[1024,[[59715,"#181818"]]],"file-text":[1024,[[59716,"var(--fill-0, #181818)"]]],"file":[1024,[[59717,"white"]]],"fingerprint-simple":[1024,[[59718,"#181818"]]],"folder-lock":[1024,[[59719,"#181818"]]],"folder":[1024,[[59720,"#181818"]]],"format-arrows-in-simple":[1024,[[59721,"#666666"]]],"format-arrows-out-simple":[1024,[[59722,"#666666"]]],"format-arrows-vertical":[1024,[[59723,"#666666"]]],"format-check-small":[946,[[59724,"white"]]],"format-code-simple":[1024,[[59725,"#666666"]]],"format-font-size":[1024,[[59726,"#181818"]]],"format-frame":[1024,[[59727,"#666666"]]],"format-highlighter":[1024,[[59728,"#666666"]]],"format-link-simple-horizontal":[1024,[[59729,"#666666"]]],"format-link":[1024,[[59730,"#666666"]]],"format-list-dashes":[1024,[[59731,"#666666"]]],"format-list-numbers":[1024,[[59732,"#666666"]]],"format-math-operations":[1024,[[59733,"#666666"]]],"format-palette":[1024,[[59734,"#666666"]]],"format-text-aa":[1024,[[59735,"#666666"]]],"format-text-align-left":[1024,[[59736,"#666666"]]],"format-text-b":[1024,[[59737,"#666666"]]],"format-text-h-one":[1024,[[59738,"#666666"]]],"format-text-italic":[1024,[[59739,"#666666"]]],"format-text-strikethrough":[1024,[[59740,"#666666"]]],"format-text-subscript":[1024,[[59741,"#666666"]]],"format-text-superscript":[1024,[[59742,"#666666"]]],"format-text-t-slash":[1024,[[59743,"#666666"]]],"format-text-underline":[1024,[[59744,"#666666"]]],"funnel":[1024,[[59745,"#666666"]]],"gift":[1024,[[59746,"#181818"]]],"git-pull-request":[1024,[[59747,"var(--fill-0, #181818)"]]],"github-logo":[1024,[[59748,"#181818"]]],"grid-four":[1024,[[59749,"#666666"]]],"hard-drives":[1024,[[59750,"var(--fill-0, #181818)"]]],"home":[1024,[[59751,"#181818"]]],"house":[1024,[[59752,"#6F6F6F"]]],"identifier":[1024,[[59753,"currentColor"]]],"image-outline":[1024,[[59754,"white"]]],"image":[1024,[[59755,"#181818"]]],"key":[1024,[[59756,"var(--fill-0, #181818)"]]],"link-alt":[1024,[[59757,"#666666"]]],"link-simple":[1024,[[59758,"white"]]],"link":[560,[[59759,"#666666"]]],"list":[2190,[[59760,"#181818"]]],"lock-simple":[1024,[[59761,"currentColor"]]],"lock":[1024,[[59762,"#181818"]]],"markdown":[1024,[[59763,"#181818"]]],"mastodon-logo":[1024,[[59764,"var(--fill-0, #181818)"]]],"menu":[1024,[[59765,"#181818"]]],"message-badge-outline":[1024,[[59766,"currentColor"]]],"minus":[1024,[[59767,"#181818"]]],"mode-edit":[1024,[[59768,"#181818"]]],"moon":[1024,[[59769,"var(--fill-0, #181818)"]]],"music-notes":[1024,[[59770,"#181818"]]],"network":[1024,[[59771,"var(--fill-0, #181818)"]]],"note":[1024,[[59772,"#181818"]]],"notification":[1024,[[59773,"var(--fill-0, #181818)"]]],"numpad":[1024,[[59774,"#181818"]]],"nut":[1024,[[59775,"#181818"]]],"paint-brush-household":[1024,[[59776,"#181818"]]],"paint-roller":[1024,[[59777,"var(--fill-0, #181818)"]]],"palette":[1024,[[59778,"#666666"]]],"paperclip":[1024,[[59779,"#666666"]]],"pause":[1024,[[59780,"var(--fill-0, #181818)"]]],"pencil-ruler":[1024,[[59781,"#181818"]]],"pencil-simple-line":[1024,[[59782,"var(--fill-0, #181818)"]]],"pencil-simple-slash":[1024,[[59783,"#858585"]]],"pencil-simple":[1024,[[59784,"#181818"]]],"pin":[939,[[59785,"#666666"]]],"plus":[1024,[[59786,"#181818"]]],"radio-button":[1024,[[59787,"#008836"]]],"recovery-key-cloud-arrow-down":[1024,[[59788,"var(--fill-0, #181818)"]]],"recovery-key-copy":[1024,[[59789,"var(--stroke-0, #008836)"]]],"recovery-key-file":[1024,[[59790,"var(--fill-0, #181818)"]]],"recovery-key-key":[1024,[[59791,"var(--fill-0, #181818)"]]],"recovery-key-qr-code":[1024,[[59792,"var(--fill-0, #181818)"]]],"recovery-key-shield-check":[1024,[[59793,"var(--fill-0, #008836)"]]],"search":[1024,[[59794,"#181818"]]],"share":[1024,[[59795,"#666666"]]],"shield-check":[1024,[[59796,"#181818"]]],"shield-plus":[1024,[[59797,"#181818"]]],"shield":[1024,[[59798,"var(--fill-0, #181818)"]]],"shopping-mode":[1024,[[59799,"#666666"]]],"sliders-horizontal":[1024,[[59800,"var(--fill-0, #181818)"]]],"sliders":[1024,[[59801,"#181818"]]],"sort-ascending":[1024,[[59802,"#666666"]]],"sort-descending":[1024,[[59803,"currentColor"]]],"speaker-high":[1024,[[59804,"#181818"]]],"spellcheck":[1067,[[59805,"currentColor"]]],"square-out":[1024,[[59806,"#181818"]]],"squares-four":[1024,[[59807,"var(--fill-0, #181818)"]]],"star-filled":[1024,[[59808,"#E5C131"]]],"star":[1024,[[59809,"#666666"]]],"sun":[1024,[[59810,"#666666"]]],"swatches":[1024,[[59811,"var(--fill-0, #181818)"]]],"sync-disabled":[911,[[59812,"#858585"]]],"table":[1024,[[59813,"#181818"]]],"telegram-logo":[1024,[[59814,"var(--fill-0, #181818)"]]],"text-aa":[1024,[[59815,"#181818"]]],"toggle-off":[1725,[[59816,"#DADADA"]]],"toggle-on":[1725,[[59817,"#008836"]]],"trash-alt":[1024,[[59818,"#FB2C36"]]],"trash":[1024,[[59819,"#666666"]]],"tray-arrow-down":[1024,[[59820,"#181818"]]],"upload":[1024,[[59821,"#181818"]]],"user-circle-minus":[1024,[[59822,"var(--fill-0, #FF242E)"]]],"user-sheet-docs":[1024,[[59823,"var(--fill-0, #181818)"]]],"user-sheet-logout":[1024,[[59824,"var(--fill-0, #FB2C36)"]]],"user-sheet-settings":[1024,[[59825,"var(--fill-0, #181818)"]]],"user-sheet-support":[1024,[[59826,"var(--fill-0, #181818)"]]],"user-sheet-sync":[1024,[[59827,"var(--fill-0, #181818)"]]],"user":[1024,[[59828,"var(--fill-0, #181818)"]]],"users-three":[1024,[[59829,"var(--fill-0, #181818)"]]],"video-camera":[1024,[[59830,"#181818"]]],"view-list":[1024,[[59831,"#181818"]]],"warning-circle-filled":[1024,[[59832,"#F23E46"]]],"warning-circle":[1024,[[59833,"currentColor"]]],"warning":[1024,[[59834,"#FF242E"]]],"wifi-slash":[1024,[[59835,"var(--fill-0, #181818)"]]],"wrench":[1024,[[59836,"#181818"]]],"x-logo":[1024,[[59837,"var(--fill-0, #181818)"]]]}}
\ No newline at end of file
diff --git a/apps/mobile/fonts/notesnook-icons.ttf b/apps/mobile/fonts/notesnook-icons.ttf
index 036bd25a3..d3e0c77e8 100644
Binary files a/apps/mobile/fonts/notesnook-icons.ttf and b/apps/mobile/fonts/notesnook-icons.ttf differ
diff --git a/apps/mobile/ios/nanoicons-fonts/notesnook-icons.ttf b/apps/mobile/ios/nanoicons-fonts/notesnook-icons.ttf
index 036bd25a3..d3e0c77e8 100644
Binary files a/apps/mobile/ios/nanoicons-fonts/notesnook-icons.ttf and b/apps/mobile/ios/nanoicons-fonts/notesnook-icons.ttf differ
diff --git a/packages/icons/svgs/warning-circle-filled.svg b/packages/icons/svgs/warning-circle-filled.svg
new file mode 100644
index 000000000..4a9cb8c8c
--- /dev/null
+++ b/packages/icons/svgs/warning-circle-filled.svg
@@ -0,0 +1,3 @@
+
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index f29e5f013..361132ed1 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -953,6 +953,14 @@ msgstr "Always ask"
msgid "Amount"
msgstr "Amount"
+#: src/strings.ts:3064
+msgid "An error occured"
+msgstr "An error occured"
+
+#: src/strings.ts:3066
+msgid "An error occured during sync. please try again in a moment."
+msgstr "An error occured during sync. please try again in a moment."
+
#: src/strings.ts:249
msgid "An error occurred while migrating your data. You can logout of your account and try to relogin. However this is not recommended as it may result in some data loss if your data was not synced."
msgstr "An error occurred while migrating your data. You can logout of your account and try to relogin. However this is not recommended as it may result in some data loss if your data was not synced."
@@ -3761,6 +3769,14 @@ msgstr "Group added successfully"
msgid "Group by"
msgstr "Group by"
+#: src/strings.ts:3068
+msgid "Group created"
+msgstr "Group created"
+
+#: src/strings.ts:3069
+msgid "Group deleted"
+msgstr "Group deleted"
+
#: src/strings.ts:785
msgid "Hash copied"
msgstr "Hash copied"
@@ -7448,10 +7464,6 @@ msgstr "Tap to deselect"
msgid "Tap to stop reordering"
msgstr "Tap to stop reordering"
-#: src/strings.ts:1408
-msgid "Tap to try again"
-msgstr "Tap to try again"
-
#: src/strings.ts:290
msgid "Tap twice to confirm you have saved the recovery key."
msgstr "Tap twice to confirm you have saved the recovery key."
@@ -7809,6 +7821,7 @@ msgstr "Trusted partners who share our commitment to privacy, transparency, and
msgid "Try {plan} for free"
msgstr "Try {plan} for free"
+#: src/strings.ts:1408
#: src/strings.ts:2996
msgid "Try again"
msgstr "Try again"
@@ -8550,6 +8563,10 @@ msgstr "You are logging into the beta version of Notesnook. Switching between be
msgid "You are not logged in"
msgstr "You are not logged in"
+#: src/strings.ts:3067
+msgid "You are offline"
+msgstr "You are offline"
+
#: src/strings.ts:933
msgid "You are renaming color {color}"
msgstr "You are renaming color {color}"
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index f105affa0..0d9c24c3e 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -953,6 +953,14 @@ msgstr ""
msgid "Amount"
msgstr ""
+#: src/strings.ts:3064
+msgid "An error occured"
+msgstr ""
+
+#: src/strings.ts:3066
+msgid "An error occured during sync. please try again in a moment."
+msgstr ""
+
#: src/strings.ts:249
msgid "An error occurred while migrating your data. You can logout of your account and try to relogin. However this is not recommended as it may result in some data loss if your data was not synced."
msgstr ""
@@ -3743,6 +3751,14 @@ msgstr ""
msgid "Group by"
msgstr ""
+#: src/strings.ts:3068
+msgid "Group created"
+msgstr ""
+
+#: src/strings.ts:3069
+msgid "Group deleted"
+msgstr ""
+
#: src/strings.ts:785
msgid "Hash copied"
msgstr "<<<<<<< HEAD<<<<<<< HEAD<<<<<<< HEAD<<<<<<< HEAD"
@@ -7414,10 +7430,6 @@ msgstr ""
msgid "Tap to stop reordering"
msgstr ""
-#: src/strings.ts:1408
-msgid "Tap to try again"
-msgstr ""
-
#: src/strings.ts:290
msgid "Tap twice to confirm you have saved the recovery key."
msgstr ""
@@ -7768,6 +7780,7 @@ msgstr ""
msgid "Try {plan} for free"
msgstr "<<<<<<< HEAD<<<<<<< HEAD<<<<<<< HEAD<<<<<<< HEAD"
+#: src/strings.ts:1408
#: src/strings.ts:2996
msgid "Try again"
msgstr ""
@@ -8500,6 +8513,10 @@ msgstr ""
msgid "You are not logged in"
msgstr ""
+#: src/strings.ts:3067
+msgid "You are offline"
+msgstr ""
+
#: src/strings.ts:933
msgid "You are renaming color {color}"
msgstr ""
diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.ts
index e6f629692..f59fda815 100644
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@ -1405,7 +1405,7 @@ $day$: Current day (eg. Monday)`,
biometricsAuthFailedDesc: () => t`Wait 30 seconds to try again`,
biometricsAuthCancelled: () => t`Authentication cancelled by user`,
biometricsAuthError: () => t`Authentication failed`,
- tryAgain: () => t`Tap to try again`,
+ tryAgain: () => t`Try again`,
rateAppMessage: () => t`We would love to know what you think!`,
rateAppActionText: (platform: string) =>
platform === "ios"
@@ -3060,5 +3060,11 @@ Continue without attachments?`,
disableSync: () => t`Disable sync`,
disableSyncDesc: () =>
t`Turns off syncing completely on this device. Any changes made will remain local only and new changes from your other devices won't sync to this device.`,
- noNotesToExport: () => t`No notes to export`
+ noNotesToExport: () => t`No notes to export`,
+ anErrorOccured: () => t`An error occured`,
+ anErrorOccuredDuringSync: () =>
+ t`An error occured during sync. please try again in a moment.`,
+ youAreOffline: () => t`You are offline`,
+ groupCreated: () => t`Group created`,
+ groupDeleted: () => t`Group deleted`
};