From 7502b3e9359fdaf8f0c2ffb48e5b5031dd78257f Mon Sep 17 00:00:00 2001
From: kanat <unknown>
Date: Wed, 26 Jul 2023 16:57:00 -0700
Subject: [PATCH] [i103] ChannelViewHolder shows invalid last message

(cherry picked from commit 9c642a720156c7e5a9391447aa0d0ee02a35ec86)
---
 .../list/adapter/viewholder/internal/ChannelViewHolder.kt  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/stream-chat-android-ui-components/src/main/kotlin/io/getstream/chat/android/ui/feature/channels/list/adapter/viewholder/internal/ChannelViewHolder.kt b/stream-chat-android-ui-components/src/main/kotlin/io/getstream/chat/android/ui/feature/channels/list/adapter/viewholder/internal/ChannelViewHolder.kt
index 63544f0ee2b..c94d853f8d1 100644
--- a/stream-chat-android-ui-components/src/main/kotlin/io/getstream/chat/android/ui/feature/channels/list/adapter/viewholder/internal/ChannelViewHolder.kt
+++ b/stream-chat-android-ui-components/src/main/kotlin/io/getstream/chat/android/ui/feature/channels/list/adapter/viewholder/internal/ChannelViewHolder.kt
@@ -229,7 +229,7 @@ internal class ChannelViewHolder @JvmOverloads constructor(
 
                 if (typingUsersChanged) {
                     typingIndicatorView.setTypingUsers(channelItem.typingUsers)
-                    lastMessageLabel.isVisible = channelItem.typingUsers.isEmpty()
+                    lastMessageLabel.isVisible = channelItem.typingUsers.isEmpty() && lastMessage.isNotNull()
                 }
 
                 muteIcon.isVisible = channelItem.channel.isMuted
@@ -254,7 +254,10 @@ internal class ChannelViewHolder @JvmOverloads constructor(
         lastMessageLabel.isVisible = lastMessage.isNotNull()
         lastMessageTimeLabel.isVisible = lastMessage.isNotNull()
 
-        lastMessage ?: return
+        lastMessage ?: return run {
+            lastMessageLabel.text = ""
+            lastMessageTimeLabel.text = ""
+        }
 
         lastMessageLabel.text = ChatUI.messagePreviewFormatter.formatMessagePreview(
             channel = channel,