diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ChatView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ChatView.kt index d728f47a7e..ca64f5c8d4 100644 --- a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ChatView.kt +++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ChatView.kt @@ -713,19 +713,14 @@ fun BoxWithConstraintsScope.ChatItemsList( val showMember = showMemberImage(member, prevItem) Row(Modifier.padding(start = 8.dp, end = if (voiceWithTransparentBack) 12.dp else 66.dp).then(swipeableModifier)) { if (showMember) { - val contactId = member.memberContactId - if (contactId == null) { + Box( + Modifier + .clip(CircleShape) + .clickable { + showMemberInfo(chat.chatInfo.groupInfo, member) + } + ) { MemberImage(member) - } else { - Box( - Modifier - .clip(CircleShape) - .clickable { - showMemberInfo(chat.chatInfo.groupInfo, member) - } - ) { - MemberImage(member) - } } Spacer(Modifier.size(4.dp)) } else { diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt index 995262d62c..b1b69e40a0 100644 --- a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt +++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt @@ -242,22 +242,22 @@ fun GroupMemberInfoLayout( val contactId = member.memberContactId if (member.memberActive) { - if (contactId != null) { - SectionView { + SectionView { + if (contactId != null) { if (knownDirectChat(contactId) != null || groupInfo.fullGroupPreferences.directMessages.on) { OpenChatButton(onClick = { openDirectChat(contactId) }) } - if (connectionCode != null) { - VerifyCodeButton(member.verified, verifyClicked) - } - if (cStats != null && cStats.ratchetSyncAllowed) { - SynchronizeConnectionButton(syncMemberConnection) - } else if (developerTools) { - SynchronizeConnectionButtonForce(syncMemberConnectionForce) - } } - SectionDividerSpaced() + if (connectionCode != null) { + VerifyCodeButton(member.verified, verifyClicked) + } + if (cStats != null && cStats.ratchetSyncAllowed) { + SynchronizeConnectionButton(syncMemberConnection) + } else if (developerTools) { + SynchronizeConnectionButtonForce(syncMemberConnectionForce) + } } + SectionDividerSpaced() } if (member.contactLink != null) {