diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt index 19d470dd8c..f523c8ca30 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt @@ -636,7 +636,7 @@ fun ChatItemView( CIEventView(eventItemViewText(reversedChatItems)) } - @Composable fun UserPendingReviewEventItemView() { + @Composable fun PendingReviewEventItemView() { Text( buildAnnotatedString { withStyle(chatEventStyle.copy(fontWeight = FontWeight.Bold)) { append(cItem.content.text) } @@ -721,14 +721,14 @@ fun ChatItemView( is CIContent.RcvGroupEventContent -> { when (c.rcvGroupEvent) { is RcvGroupEvent.MemberCreatedContact -> CIMemberCreatedContactView(cItem, openDirectChat) - is RcvGroupEvent.NewMemberPendingReview -> UserPendingReviewEventItemView() + is RcvGroupEvent.NewMemberPendingReview -> PendingReviewEventItemView() else -> EventItemView() } MsgContentItemDropdownMenu() } is CIContent.SndGroupEventContent -> { when (c.sndGroupEvent) { - is SndGroupEvent.UserPendingReview -> UserPendingReviewEventItemView() + is SndGroupEvent.UserPendingReview -> PendingReviewEventItemView() else -> EventItemView() } MsgContentItemDropdownMenu() diff --git a/src/Simplex/Chat/Library/Internal.hs b/src/Simplex/Chat/Library/Internal.hs index 46e8177e8e..2c751c4847 100644 --- a/src/Simplex/Chat/Library/Internal.hs +++ b/src/Simplex/Chat/Library/Internal.hs @@ -975,7 +975,7 @@ introduceToModerators vr user gInfo@GroupInfo {groupId} m@GroupMember {memberRol else XMsgNew $ MCSimple $ extMsgContent (MCText pendingReviewMessage) Nothing void $ sendDirectMemberMessage mConn msg groupId modMs <- withStore' $ \db -> getGroupModerators db vr user gInfo - let rcpModMs = filter memberCurrent modMs + let rcpModMs = filter (\mem -> memberCurrent mem && maxVersion (memberChatVRange mem) >= groupKnockingVersion) modMs introduceMember vr user gInfo m rcpModMs (Just $ MSMember $ memberId' m) introduceToAll :: VersionRangeChat -> User -> GroupInfo -> GroupMember -> CM ()