From 86b00d0a2bd8668b2852eb61263ff07856e6a9cb Mon Sep 17 00:00:00 2001
From: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com>
Date: Tue, 31 Oct 2023 07:57:26 -0700
Subject: [PATCH] Mobile: Resolves #9134: Image editor: Allow loading from save
 when the image editor is reloaded in the background (#9135)

---
 .../components/NoteEditor/ImageEditor/ImageEditor.tsx      | 4 +++-
 packages/app-mobile/components/screens/Note.tsx            | 7 +------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/app-mobile/components/NoteEditor/ImageEditor/ImageEditor.tsx b/packages/app-mobile/components/NoteEditor/ImageEditor/ImageEditor.tsx
index b337e3dc5f..3742cf9ed6 100644
--- a/packages/app-mobile/components/NoteEditor/ImageEditor/ImageEditor.tsx
+++ b/packages/app-mobile/components/NoteEditor/ImageEditor/ImageEditor.tsx
@@ -16,11 +16,13 @@ const logger = Logger.create('ImageEditor');
 
 type OnSaveCallback = (svgData: string)=> void;
 type OnCancelCallback = ()=> void;
+
+// Returns the empty string to load from a template.
 type LoadInitialSVGCallback = ()=> Promise<string>;
 
 interface Props {
 	themeId: number;
-	loadInitialSVGData: LoadInitialSVGCallback|null;
+	loadInitialSVGData: LoadInitialSVGCallback;
 	onSave: OnSaveCallback;
 	onExit: OnCancelCallback;
 }
diff --git a/packages/app-mobile/components/screens/Note.tsx b/packages/app-mobile/components/screens/Note.tsx
index 7b10a4964c..ac6a3ea354 100644
--- a/packages/app-mobile/components/screens/Note.tsx
+++ b/packages/app-mobile/components/screens/Note.tsx
@@ -815,12 +815,7 @@ class NoteScreenComponent extends BaseScreenComponent {
 	private drawPicture_onPress = async () => {
 		// Create a new empty drawing and attach it now.
 		const resource = await this.attachNewDrawing('');
-
-		this.setState({
-			showImageEditor: true,
-			loadImageEditorData: null,
-			imageEditorResource: resource,
-		});
+		await this.editDrawing(resource);
 	};
 
 	private async updateDrawing(svgData: string) {