Skip to content

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

mobile: fix ts errors

Ammar Ahmed33d69480ebd8
diff --git a/apps/mobile/app/components/list-items/note/index.tsx b/apps/mobile/app/components/list-items/note/index.tsx
index 4ea00e6f1..60cb08205 100644
--- a/apps/mobile/app/components/list-items/note/index.tsx
+++ b/apps/mobile/app/components/list-items/note/index.tsx
@@ -76,7 +76,8 @@ const NoteItem = ({
}: NoteItemProps) => {
const isEditingNote = useTabStore(
(state) =>
- state.tabs.find((t) => t.id === state.currentTab)?.noteId === item.id
+ state.tabs.find((t) => t.id === state.currentTab)?.session?.noteId ===
+ item.id
);
const { colors } = useThemeColors();
const compactMode = useIsCompactModeEnabled(
diff --git a/apps/mobile/app/components/list-items/selection-wrapper/back-fill.tsx b/apps/mobile/app/components/list-items/selection-wrapper/back-fill.tsx
index 5a1d3bc31..c926d5151 100644
--- a/apps/mobile/app/components/list-items/selection-wrapper/back-fill.tsx
+++ b/apps/mobile/app/components/list-items/selection-wrapper/back-fill.tsx
@@ -28,7 +28,8 @@ export const Filler = ({ item, color }: { item: Item; color?: string }) => {
const { colors } = useThemeColors();
const isEditingNote = useTabStore(
(state) =>
- state.tabs.find((t) => t.id === state.currentTab)?.noteId === item.id
+ state.tabs.find((t) => t.id === state.currentTab)?.session?.noteId ===
+ item.id
);
const [selected] = useIsSelected(item);
diff --git a/apps/mobile/app/navigation/tabs-holder.js b/apps/mobile/app/navigation/tabs-holder.js
index 158a51688..c00e54d7f 100644
--- a/apps/mobile/app/navigation/tabs-holder.js
+++ b/apps/mobile/app/navigation/tabs-holder.js
@@ -509,7 +509,8 @@ const onChangeTab = async (event) => {
});
} else {
if (
- useTabStore.getState().getTab(useTabStore.getState().currentTab).locked
+ useTabStore.getState().getTab(useTabStore.getState().currentTab).session
+ ?.locked
) {
eSendEvent(eUnlockNote);
}
@@ -523,7 +524,7 @@ const onChangeTab = async (event) => {
// Lock all tabs with locked notes...
for (const tab of useTabStore.getState().tabs) {
- const noteId = useTabStore.getState().getTab(tab.id)?.noteId;
+ const noteId = useTabStore.getState().getTab(tab.id)?.session?.noteId;
if (!noteId) continue;
const note = await db.notes.note(noteId);
const locked = note && (await db.vaults.itemExists(note));
diff --git a/apps/mobile/app/screens/editor/tiptap/commands.ts b/apps/mobile/app/screens/editor/tiptap/commands.ts
index 5119c8232..ae5eada47 100644
--- a/apps/mobile/app/screens/editor/tiptap/commands.ts
+++ b/apps/mobile/app/screens/editor/tiptap/commands.ts
@@ -176,13 +176,13 @@ class Commands {
await this.sendCommand("clearTags", tabId);
};
- insertAttachment = async (attachment: Attachment, tabId: number) => {
+ insertAttachment = async (attachment: Attachment, tabId: string) => {
await this.sendCommand("insertAttachment", attachment, tabId);
};
setAttachmentProgress = async (
attachmentProgress: Partial<Attachment>,
- tabId: number
+ tabId: string
) => {
await this.sendCommand("setAttachmentProgress", attachmentProgress, tabId);
};
@@ -191,7 +191,7 @@ class Commands {
image: Omit<ImageAttributes, "bloburl"> & {
dataurl: string;
},
- tabId: number
+ tabId: string
) => {
await this.sendCommand("insertImage", image, tabId);
};
diff --git a/apps/mobile/app/screens/editor/tiptap/picker.ts b/apps/mobile/app/screens/editor/tiptap/picker.ts
index c1dfce4bd..e1436aa9b 100644
--- a/apps/mobile/app/screens/editor/tiptap/picker.ts
+++ b/apps/mobile/app/screens/editor/tiptap/picker.ts
@@ -61,7 +61,7 @@ const santizeUri = (uri: string) => {
type PickerOptions = {
noteId?: string;
- tabId?: number;
+ tabId?: string;
type: "image" | "camera" | "file";
reupload: boolean;
hash?: string;
diff --git a/apps/mobile/app/screens/editor/tiptap/use-tab-store.ts b/apps/mobile/app/screens/editor/tiptap/use-tab-store.ts
index 3166eedba..2ee363cc6 100644
--- a/apps/mobile/app/screens/editor/tiptap/use-tab-store.ts
+++ b/apps/mobile/app/screens/editor/tiptap/use-tab-store.ts
@@ -105,7 +105,7 @@ class TabSessionStorage {
}
static update(id: string, session: Partial<TabSessionItem>) {
- if (!id) throw new Error("Session ID is required");
+ if (!id) return;
const currentSession = TabSessionStorage.get(id);
const newSession = {
...currentSession,
@@ -267,6 +267,7 @@ export const useTabStore = create<TabStore>(
TabSessionStorage.set(sessionId, session as TabSessionItem);
} else {
session = {
+ id: sessionId,
...TabSessionStorage.get(oldSessionId),
...options
};
diff --git a/apps/mobile/app/services/backup.ts b/apps/mobile/app/services/backup.ts
index 2a0e35692..5153834f6 100644
--- a/apps/mobile/app/services/backup.ts
+++ b/apps/mobile/app/services/backup.ts
@@ -169,7 +169,11 @@ async function run(
progress = false,
context?: string,
backupType: "full" | "partial" = "partial"
-) {
+): Promise<{
+ path?: string;
+ error?: Error;
+ report?: boolean;
+}> {
if (backupRunning) {
if (progress) {
startProgress({
@@ -179,7 +183,7 @@ async function run(
canHideProgress: true
});
}
- return;
+ return {};
}
backupRunning = true;
const androidBackupDirectory = (await checkBackupDirExists(
@@ -343,7 +347,7 @@ async function run(
endProgress();
}
return {
- error: e,
+ error: e as Error,
report: true
};
}