fix(@desktop/chat): show message which was sent during group chat cre…

…ation
status-im · Jan 10, 2023 · 3994f8b · 3994f8b
1 parent 5e8f3e6
commit 3994f8b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/ui/app/AppLayouts/Chat/stores/RootStore.qml b/ui/app/AppLayouts/Chat/stores/RootStore.qml
@@ -100,8 +100,9 @@ QtObject {
         return msg
     }
 
-    function sendMessage(event, text, replyMessageId, fileUrlsAndSources) {
-        var chatContentModule = currentChatContentModule()
+    function sendMessage(chatId, event, text, replyMessageId, fileUrlsAndSources) {
+        chatCommunitySectionModule.prepareChatContentModuleForChatId(chatId)
+        const chatContentModule = chatCommunitySectionModule.getChatContentModule()
         if (fileUrlsAndSources.length > 0){
             chatContentModule.inputAreaModule.sendImages(JSON.stringify(fileUrlsAndSources));
         }

diff --git a/ui/app/AppLayouts/Chat/views/ChatColumnView.qml b/ui/app/AppLayouts/Chat/views/ChatColumnView.qml
@@ -90,7 +90,8 @@ Item {
         else if (root.rootStore.createChatInitMessage !== "" ||
                  root.rootStore.createChatFileUrls.length > 0) {
 
-            root.rootStore.sendMessage(Qt.Key_Enter,
+            root.rootStore.sendMessage(chatId,
+                                       Qt.Key_Enter,
                                        root.rootStore.createChatInitMessage,
                                        "",
                                        root.rootStore.createChatFileUrls

diff --git a/ui/app/AppLayouts/Chat/views/ChatContentView.qml b/ui/app/AppLayouts/Chat/views/ChatContentView.qml
@@ -236,7 +236,8 @@ ColumnLayout {
                         return
                     }
 
-                    if(root.rootStore.sendMessage(event,
+                    if(root.rootStore.sendMessage(chatContentModule.getMyChatId(),
+                                                  event,
                                                   chatInput.getTextWithPublicKeys(),
                                                   chatInput.isReply? chatInput.replyMessageId : "",
                                                   chatInput.fileUrlsAndSources

diff --git a/ui/app/AppLayouts/Chat/views/CreateChatView.qml b/ui/app/AppLayouts/Chat/views/CreateChatView.qml
@@ -25,7 +25,7 @@ Page {
 
         function createChat() {
             root.rootStore.createChatInitMessage = chatInput.textInput.text
-            root.rootStore.createChatFileUrls = chatInput.fileUrls
+            root.rootStore.createChatFileUrls = chatInput.fileUrlsAndSources
             membersSelector.createChat()
 
             membersSelector.cleanup()