Desktop, Mobile: Fixes #11317: Fix race condition which may cause dat…

…a loss, particularly before or after pasting text in the note editor (#11334) Co-authored-by: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com>
laurent22 · Nov 13, 2024 · 11b3347 · 11b3347
1 parent 24d02c5
commit 11b3347
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/packages/app-mobile/components/screens/Note.tsx b/packages/app-mobile/components/screens/Note.tsx
@@ -235,7 +235,6 @@ class NoteScreenComponent extends BaseScreenComponent<Props, State> implements B
 				Keyboard.dismiss();
 
 				this.setState({
-					note: { ...this.state.lastSavedNote },
 					mode: 'view',
 				});
 

diff --git a/packages/lib/components/shared/note-screen-shared.ts b/packages/lib/components/shared/note-screen-shared.ts
@@ -153,7 +153,7 @@ shared.saveNoteButton_press = async function(comp: BaseNoteScreenComponent, fold
 
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	const newState: any = {
-		lastSavedNote: { ...note },
+		lastSavedNote: { ...note, ...savedNote },
 		note: note,
 	};