From 3e50a81d967a190de040efd3cc4a0cf51a99a5e9 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 29 Apr 2023 00:15:51 +0200
Subject: [PATCH] DEV: potential flakey fixes (#21309)

---
 .../javascripts/discourse/components/chat-composer.js       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer.js b/plugins/chat/assets/javascripts/discourse/components/chat-composer.js
index 86142c3bc4b..77875c8ce6c 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer.js
@@ -184,7 +184,7 @@ export default class ChatComposer extends Component {
       this.currentMessage.uploads = cloneJSON(uploads);
     }
 
-    this.textareaInteractor.focus();
+    this.textareaInteractor?.focus();
     this.reportReplyingPresence();
     this.persistDraft();
   }
@@ -212,6 +212,10 @@ export default class ChatComposer extends Component {
   }
 
   reportReplyingPresence() {
+    if (!this.args.channel) {
+      return;
+    }
+
     if (this.args.channel.isDraft) {
       return;
     }