From 642e6d677e28ef1b5cde5d542cf4c29baeffa033 Mon Sep 17 00:00:00 2001
From: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
Date: Wed, 24 Apr 2024 01:14:58 +0700
Subject: [PATCH] android, desktop: updating delivery tab in chat item info
 (#4074)

---
 .../simplex/common/views/chat/ChatView.kt     | 41 +++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
index 0c9a973a69..21a9cfa7b4 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
@@ -1,6 +1,5 @@
 package chat.simplex.common.views.chat
 
-import androidx.compose.animation.core.Animatable
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.*
 import androidx.compose.foundation.gestures.*
@@ -22,7 +21,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.graphics.ImageBitmap
-import androidx.compose.ui.input.pointer.*
 import androidx.compose.ui.text.*
 import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
@@ -398,23 +396,42 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
             }
           },
           showItemDetails = { cInfo, cItem ->
-            withBGApi {
+            suspend fun loadChatItemInfo(): ChatItemInfo? {
               val ciInfo = chatModel.controller.apiGetChatItemInfo(chatRh, cInfo.chatType, cInfo.apiId, cItem.id)
               if (ciInfo != null) {
                 if (chat.chatInfo is ChatInfo.Group) {
                   setGroupMembers(chatRh, chat.chatInfo.groupInfo, chatModel)
                 }
-                ModalManager.end.closeModals()
-                ModalManager.end.showModalCloseable(endButtons = {
-                  ShareButton {
-                    clipboard.shareText(itemInfoShareText(chatModel, cItem, ciInfo, chatModel.controller.appPrefs.developerTools.get()))
-                  }
-                }) { close ->
-                  ChatItemInfoView(chatRh, cItem, ciInfo, devTools = chatModel.controller.appPrefs.developerTools.get())
-                  KeyChangeEffect(chatModel.chatId.value) {
-                    close()
+              }
+              return ciInfo
+            }
+            withBGApi {
+              var initialCiInfo = loadChatItemInfo() ?: return@withBGApi
+              ModalManager.end.closeModals()
+              ModalManager.end.showModalCloseable(endButtons = {
+                ShareButton {
+                  clipboard.shareText(itemInfoShareText(chatModel, cItem, initialCiInfo, chatModel.controller.appPrefs.developerTools.get()))
+                }
+              }) { close ->
+                var ciInfo by remember(cItem.id) { mutableStateOf(initialCiInfo) }
+                ChatItemInfoView(chatRh, cItem, ciInfo, devTools = chatModel.controller.appPrefs.developerTools.get())
+                LaunchedEffect(cItem.id) {
+                  withContext(Dispatchers.Default) {
+                    for (apiResp in controller.messagesChannel) {
+                      val msg = apiResp.resp
+                      if (apiResp.remoteHostId == chatRh &&
+                        msg is CR.ChatItemStatusUpdated &&
+                        msg.chatItem.chatItem.id == cItem.id
+                      ) {
+                        ciInfo = loadChatItemInfo() ?: return@withContext
+                        initialCiInfo = ciInfo
+                      }
+                    }
                   }
                 }
+                KeyChangeEffect(chatModel.chatId.value) {
+                  close()
+                }
               }
             }
           },