From 1801dc321b9143c91c44f3b86657a89aa4c3808c Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 2 Dec 2022 15:27:30 +0100
Subject: [PATCH] Send: reset composer directly

---
 .../x/features/messages/MessagesViewModel.kt  | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt
index bfc430e2b3..18570f1581 100644
--- a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt
+++ b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt
@@ -68,22 +68,21 @@ class MessagesViewModel(
     }
 
     fun sendMessage(text: String) {
-        withState { state ->
-            viewModelScope.launch {
-                when (state.composerMode) {
-                    is MessageComposerMode.Normal -> timeline.sendMessage(text)
-                    is MessageComposerMode.Edit -> timeline.editMessage(
-                        state.composerMode.eventId,
-                        text
-                    )
-                    is MessageComposerMode.Quote -> TODO()
-                    is MessageComposerMode.Reply -> timeline.replyMessage(
-                        state.composerMode.eventId,
-                        text
-                    )
-                }
-                // Reset composer
-                setNormalMode()
+        viewModelScope.launch {
+            val state = awaitState()
+            // Reset composer right away
+            setNormalMode()
+            when (state.composerMode) {
+                is MessageComposerMode.Normal -> timeline.sendMessage(text)
+                is MessageComposerMode.Edit -> timeline.editMessage(
+                    state.composerMode.eventId,
+                    text
+                )
+                is MessageComposerMode.Quote -> TODO()
+                is MessageComposerMode.Reply -> timeline.replyMessage(
+                    state.composerMode.eventId,
+                    text
+                )
             }
         }
     }