Skip to content

Commit

Permalink
fix: remove E2EI indication(shield) from conversations list (WPB-6070) (
Browse files Browse the repository at this point in the history
  • Loading branch information
ohassine authored Jan 10, 2024
1 parent 0358f12 commit 3dad9eb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ import com.wire.android.R
import com.wire.android.model.Clickable
import com.wire.android.model.UserAvatarData
import com.wire.android.ui.calling.controlbuttons.JoinButton
import com.wire.android.ui.common.MLSVerifiedIcon
import com.wire.android.ui.common.ProteusVerifiedIcon
import com.wire.android.ui.common.RowItemTemplate
import com.wire.android.ui.common.WireRadioButton
import com.wire.android.ui.common.colorsScheme
Expand Down Expand Up @@ -144,15 +142,7 @@ private fun GeneralConversationItem(
ConversationTitle(
name = groupName.ifEmpty { stringResource(id = R.string.member_name_deleted_label) },
isLegalHold = conversation.isLegalHold,
searchQuery = searchQuery,
badges = {
if (proteusVerificationStatus == Conversation.VerificationStatus.VERIFIED) {
ProteusVerifiedIcon(contentDescriptionId = R.string.content_description_proteus_certificate_valid)
}
if (mlsVerificationStatus == Conversation.VerificationStatus.VERIFIED) {
MLSVerifiedIcon(contentDescriptionId = R.string.content_description_mls_certificate_valid)
}
}
searchQuery = searchQuery
)
},
subTitle = subTitle,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.wire.android.R
import com.wire.android.ui.common.MLSVerifiedIcon
import com.wire.android.ui.common.MembershipQualifierLabel
import com.wire.android.ui.common.ProteusVerifiedIcon
import com.wire.android.ui.home.conversationslist.model.Membership
import com.wire.android.ui.home.conversationslist.model.hasLabel
import com.wire.kalium.logic.data.conversation.Conversation
Expand All @@ -48,12 +46,6 @@ fun UserLabel(
Spacer(modifier = Modifier.width(6.dp))
MembershipQualifierLabel(membership)
}
if (proteusVerificationStatus == Conversation.VerificationStatus.VERIFIED) {
ProteusVerifiedIcon(contentDescriptionId = R.string.content_description_proteus_certificate_valid)
}
if (mlsVerificationStatus == Conversation.VerificationStatus.VERIFIED) {
MLSVerifiedIcon(contentDescriptionId = R.string.content_description_mls_certificate_valid)
}
},
searchQuery = searchQuery
)
Expand Down

0 comments on commit 3dad9eb

Please sign in to comment.