From 116646b547ff58f188ef0c96ed3f9b77f1dcadd9 Mon Sep 17 00:00:00 2001
From: Simon Laux <Simon-Laux@users.noreply.github.com>
Date: Tue, 21 Nov 2023 15:28:43 +0100
Subject: [PATCH] focus after loading draft fixes 2 issues (#3548)

fixes #3493
fixes #3495
---
 CHANGELOG.md                                  | 3 +++
 src/renderer/components/composer/Composer.tsx | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 316e6774c8..4690ea8988 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@
 - fix displaying sticker that has wrong mimetype
 - fix bug where composer was locked after joining a group via qr code
 - fix double message context menu #3550
+- focus after loading draft fixes:
+  - fix composer / draft-area not getting focus after click in command #3493
+  - fix composer does not get focused when selecting a chat with a draft #3495
 
 <a id="1_41_3"></a>
 
diff --git a/src/renderer/components/composer/Composer.tsx b/src/renderer/components/composer/Composer.tsx
index b445e1e140..70942dc691 100644
--- a/src/renderer/components/composer/Composer.tsx
+++ b/src/renderer/components/composer/Composer.tsx
@@ -459,6 +459,9 @@ export function useDraft(
           inputRef.current?.setText(newDraft.text)
         }
         inputRef.current?.setState({ loadingDraft: false })
+        setTimeout(() => {
+          inputRef.current?.focus()
+        })
       })
     },
     [clearDraft, inputRef]