Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2026-07-10 04:21:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9752 from streetwriters/mobile/fix-locked-note-merge-conflict

Browse Source 
mobile: fix saving incoming note in merge conflict dialog does not work
This commit is contained in:
Ammar Ahmed
2026-04-29 16:16:38 +05:00
committed by GitHub
parent 3f6fcbacbc 04f6e1068b
commit cd62d51e45
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/mobile/app/components/merge-conflicts/index.tsx
View File

@@ -76,7 +76,9 @@ const MergeConflicts = () => {
const applyChanges = async () => {
const contentToSave = selectedContent;
if (!contentToSave) return;
const note = await db.notes.note(contentToSave.noteId);
const note = await db.notes.note(
(content.current as UnencryptedContentItem).noteId
);
if (!note) return;
await db.notes.add({
id: note.id,