diff --git a/apps/ios/Shared/Model/ChatModel.swift b/apps/ios/Shared/Model/ChatModel.swift index 51c7d6d182..7a46c8764f 100644 --- a/apps/ios/Shared/Model/ChatModel.swift +++ b/apps/ios/Shared/Model/ChatModel.swift @@ -664,7 +664,7 @@ final class ChatModel: ObservableObject { // Pending invitee: surface the latest support message (broker vs local itemTs // aren't comparable); don't let a no-content event re-cover an already-shown message. if cInfo.groupInfo?.membership.memberPending ?? false { - (cItem.content.hasMsgContent || !currentPreviewItem.content.hasMsgContent) ? [cItem] : [currentPreviewItem] + (cItem.content.msgContent != nil || currentPreviewItem.content.msgContent == nil) ? [cItem] : [currentPreviewItem] } else if cItem.meta.itemTs >= currentPreviewItem.meta.itemTs { [cItem] } else { diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt index 2a5bd29e31..8a953ca4f0 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt @@ -548,7 +548,7 @@ object ChatModel { // Pending invitee: surface the latest support message (broker vs local itemTs aren't // comparable); don't let a no-content event re-cover an already-shown message. if (cInfo.groupInfo_?.membership?.memberPending == true) { - if (cItem.content.hasMsgContent || !currentPreviewItem.content.hasMsgContent) cItem else currentPreviewItem + if (cItem.content.msgContent != null || currentPreviewItem.content.msgContent == null) cItem else currentPreviewItem } else if (cItem.meta.itemTs >= currentPreviewItem.meta.itemTs) { cItem } else {