Skip to content

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

mobile: cleanup

Ammar Ahmed0f795ff913af
diff --git a/apps/mobile/app/components/list-items/note/wrapper.tsx b/apps/mobile/app/components/list-items/note/wrapper.tsx
index 8de6314dc..20691e48a 100644
--- a/apps/mobile/app/components/list-items/note/wrapper.tsx
+++ b/apps/mobile/app/components/list-items/note/wrapper.tsx
@@ -31,6 +31,7 @@ import {
import { useSelectionStore } from "../../../stores/use-selection-store";
import { eOnLoadNote, eShowMergeDialog } from "../../../utils/events";
import { tabBarRef } from "../../../utils/global-refs";
+
import { NotebooksWithDateEdited, TagsWithDateEdited } from "@notesnook/common";
import NotePreview from "../../note-history/preview";
import SelectionWrapper from "../selection-wrapper";
@@ -62,7 +63,7 @@ export const openNote = async (
return;
}
- if (!note.conflicted) {
+ if (note.conflicted) {
eSendEvent(eShowMergeDialog, note);
return;
}