Merge branch 'v7' into fix/info-screen-online-indicator

Author: aleksandar-apostolov

stream-chat-android-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/feature/messages/composer/MessageComposerController.kt

@@ -791,7 +791,7 @@ public class MessageComposerController(
         }
         val trimmedMessage = fullText.trim()
         val activeMessage = activeAction?.message ?: Message()
-        val replyMessageId = (activeAction as? Reply)?.message?.id
+        val replyMessage = (activeAction as? Reply)?.message
         val mentions = filterMentions(selectedMentions, trimmedMessage)
 
         return if (isInEditMode && !activeMessage.isModerationError(currentUserId)) {
@@ -805,7 +805,8 @@ public class MessageComposerController(
                 cid = channelCid,
                 text = trimmedMessage,
                 parentId = parentMessageId,
-                replyMessageId = replyMessageId,
+                replyMessageId = replyMessage?.id,
+                replyTo = replyMessage,
                 attachments = attachments.toMutableList(),
                 mentionedUsersIds = mentions,
             )