User verification state indicators (#3793)

* Introduce a `UserIdentityProxy` and have it combine upstream methods into an easy to digest `UserIdentityVerificationState`. Use it in a dedicated `VerificationBadge` UI component * Show a DMs counterpart verification state in the room header * Show a warning on the room details `People` entry when there are identity verification state violations on any of the members. * Show verification badges in the room member list * Show a withdraw verification section on the room member details for users that have pinning violations. * Remove the verification section from the profile screen as there's no reliable way to keep it up to date - the underlying Rust SDK Olm Machine can be rebuilt without notice which would break any existing user identity change streams. * Update preview test snapshots
2026-11-04 10:33:45 +00:00 · 2025-02-18 08:37:34 +02:00
parent b71c93dfaa
commit f77faee981
101 changed files with 722 additions and 305 deletions
@@ -39,7 +39,10 @@ struct RoomDetailsScreenViewState: BindableState {

    var topic: AttributedString?
    var topicSummary: AttributedString?
+    
    var joinedMembersCount: Int
+    var hasMemberIdentityVerificationStateViolations = false
+    
    var isProcessingIgnoreRequest = false
    var canInviteUsers = false
    var canEditRoomName = false
@@ -200,6 +200,12 @@ class RoomDetailsScreenViewModel: RoomDetailsScreenViewModelType, RoomDetailsScr
            .throttle(for: .milliseconds(100), scheduler: DispatchQueue.main, latest: true)
            .weakAssign(to: \.state.knockRequestsCount, on: self)
            .store(in: &cancellables)
+        
+        roomProxy.membersPublisher.combineLatest(roomProxy.identityStatusChangesPublisher)
+            .sink { _ in
+                Task { await self.updateMemberIdentityVerificationStates() }
+            }
+            .store(in: &cancellables)
    }
    
    private func updateRoomInfo(_ roomInfo: RoomInfoProxy) {
@@ -239,6 +245,24 @@ class RoomDetailsScreenViewModel: RoomDetailsScreenViewModelType, RoomDetailsScr
        await roomProxy.updateMembers()
    }
    
+    private func updateMemberIdentityVerificationStates() async {
+        guard roomProxy.isEncrypted else {
+            // We don't care about identity statuses on non-encrypted rooms
+            return
+        }
+        
+        for member in roomProxy.membersPublisher.value {
+            if case let .success(identity) = await clientProxy.userIdentity(for: member.userID) {
+                if identity?.verificationState == .verificationViolation {
+                    state.hasMemberIdentityVerificationStateViolations = true
+                    return
+                }
+            }
+        }
+        
+        state.hasMemberIdentityVerificationStateViolations = false
+    }
+    
    private func updatePowerLevelPermissions() async {
        state.canEditRoomName = await (try? roomProxy.canUser(userID: roomProxy.ownUserID, sendStateEvent: .roomName).get()) == true
        state.canEditRoomTopic = await (try? roomProxy.canUser(userID: roomProxy.ownUserID, sendStateEvent: .roomTopic).get()) == true
@@ -198,14 +198,23 @@ struct RoomDetailsScreen: View {
    
    private var peopleSection: some View {
        Section {
-            ListRow(label: .default(title: L10n.commonPeople,
-                                    icon: \.user),
-                    details: .title(String(context.viewState.joinedMembersCount)),
-                    kind: .navigationLink {
-                        context.send(viewAction: .processTapPeople)
-                    })
-                    .accessibilityIdentifier(A11yIdentifiers.roomDetailsScreen.people)
-            
+            if context.viewState.hasMemberIdentityVerificationStateViolations {
+                ListRow(label: .default(title: L10n.commonPeople, icon: \.user),
+                        details: .icon(CompoundIcon(\.infoSolid).foregroundStyle(.compound.iconCriticalPrimary)),
+                        kind: .navigationLink {
+                            context.send(viewAction: .processTapPeople)
+                        })
+                        .accessibilityIdentifier(A11yIdentifiers.roomDetailsScreen.people)
+                
+            } else {
+                ListRow(label: .default(title: L10n.commonPeople, icon: \.user),
+                        details: .title(String(context.viewState.joinedMembersCount)),
+                        kind: .navigationLink {
+                            context.send(viewAction: .processTapPeople)
+                        })
+                        .accessibilityIdentifier(A11yIdentifiers.roomDetailsScreen.people)
+            }
+        
            if context.viewState.canSeeKnockingRequests {
                ListRow(label: .default(title: L10n.screenRoomDetailsRequestsToJoinTitle,
                                        icon: \.askToJoin),
@@ -17,7 +17,7 @@ enum RoomMemberDetailsScreenViewModelAction {
 struct RoomMemberDetailsScreenViewState: BindableState {
    let userID: String
    var memberDetails: RoomMemberDetails?
-    var isVerified: Bool?
+    var verificationState: UserIdentityVerificationState?
    var isOwnMemberDetails = false
    var isProcessingIgnoreRequest = false
    var dmRoomID: String?
@@ -25,11 +25,15 @@ struct RoomMemberDetailsScreenViewState: BindableState {
    var bindings: RoomMemberDetailsScreenViewStateBindings
    
    var showVerifiedBadge: Bool {
-        isVerified == true // We purposely show the badge on your own account for consistency with Web.
+        verificationState == .verified // We purposely show the badge on your own account for consistency with Web.
    }
    
-    var showVerificationSection: Bool {
-        isVerified == false && !isOwnMemberDetails
+    var showVerifyIdentitySection: Bool {
+        verificationState == .notVerified && !isOwnMemberDetails
+    }
+    
+    var showWithdrawVerificationSection: Bool {
+        verificationState == .verificationViolation && !isOwnMemberDetails
    }
 }

@@ -90,6 +94,7 @@ enum RoomMemberDetailsScreenViewAction {
    case createDirectChat
    case startCall(roomID: String)
    case verifyUser
+    case withdrawVerification
 }

 enum RoomMemberDetailsScreenAlertType: Hashable {
@@ -42,10 +42,20 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
        super.init(initialViewState: initialViewState, mediaProvider: mediaProvider)
        
        showMemberLoadingIndicator()
+        
        Task {
            await loadMember()
            hideMemberLoadingIndicator()
        }
+        
+        roomProxy.identityStatusChangesPublisher
+            .receive(on: DispatchQueue.main)
+            .sink { changes in
+                if changes.map(\.userId).contains(userID) {
+                    Task { await self.loadMember() }
+                }
+            }
+            .store(in: &cancellables)
    }
    
    // MARK: - Public
@@ -77,16 +87,15 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
            actionsSubject.send(.startCall(roomID: roomID))
        case .verifyUser:
            actionsSubject.send(.verifyUser(userID: state.userID))
+        case .withdrawVerification:
+            Task { await clientProxy.withdrawUserIdentityVerification(state.userID) }
        }
    }

    // MARK: - Private
    
    private func loadMember() async {
-        async let memberResult = roomProxy.getMember(userID: state.userID)
-        async let identityResult = clientProxy.userIdentity(for: state.userID)
-        
-        switch await memberResult {
+        switch await roomProxy.getMember(userID: state.userID) {
        case .success(let member):
            roomMemberProxy = member
            state.memberDetails = RoomMemberDetails(withProxy: member)
@@ -105,8 +114,8 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
            actionsSubject.send(.openUserProfile)
        }
        
-        if case let .success(.some(identity)) = await identityResult {
-            state.isVerified = identity.isVerified()
+        if case let .success(.some(identity)) = await clientProxy.userIdentity(for: state.userID) {
+            state.verificationState = identity.verificationState
        } else {
            MXLog.error("Failed to find the member's identity.")
        }
@@ -15,7 +15,9 @@ struct RoomMemberDetailsScreen: View {
        Form {
            headerSection
            
-            verificationSection
+            if context.viewState.showVerifyIdentitySection {
+                verificationSection
+            }
            
            if context.viewState.memberDetails != nil, !context.viewState.isOwnMemberDetails {
                blockUserSection
@@ -46,7 +48,14 @@ struct RoomMemberDetailsScreen: View {
                             mediaProvider: context.mediaProvider) { url in
                context.send(viewAction: .displayAvatar(url))
            } footer: {
-                otherUserFooter
+                VStack(spacing: 24) {
+                    if context.viewState.showWithdrawVerificationSection {
+                        withdrawVerificationSection
+                    }
+                    
+                    otherUserFooter
+                }
+                .padding(.top, 24)
            }
        } else {
            AvatarHeaderView(user: UserProfileProxy(userID: context.viewState.userID),
@@ -56,6 +65,26 @@ struct RoomMemberDetailsScreen: View {
        }
    }
    
+    private var withdrawVerificationSection: some View {
+        VStack(spacing: 16) {
+            if let memberDetails = context.viewState.memberDetails {
+                Text(L10n.cryptoIdentityChangeProfilePinViolation(memberDetails.name ?? memberDetails.id))
+                    .foregroundStyle(.compound.textCriticalPrimary)
+                    .font(.compound.bodyMDSemibold)
+            } else {
+                Text(L10n.cryptoIdentityChangeProfilePinViolation(context.viewState.userID))
+                    .foregroundStyle(.compound.textCriticalPrimary)
+                    .font(.compound.bodyMDSemibold)
+            }
+            
+            Button(L10n.cryptoIdentityChangeWithdrawVerificationAction) {
+                context.send(viewAction: .withdrawVerification)
+            }
+            .buttonStyle(.compound(.secondary, size: .medium))
+        }
+        .padding(.horizontal, 16)
+    }
+    
    private var otherUserFooter: some View {
        HStack(spacing: 8) {
            if context.viewState.memberDetails != nil, !context.viewState.isOwnMemberDetails {
@@ -84,18 +113,13 @@ struct RoomMemberDetailsScreen: View {
                .buttonStyle(FormActionButtonStyle(title: L10n.actionShare))
            }
        }
-        .padding(.top, 32)
    }
    
-    @ViewBuilder
    var verificationSection: some View {
-        if context.viewState.showVerificationSection {
-            Section {
-                ListRow(label: .default(title: L10n.commonVerifyUser, icon: \.lock),
-                        kind: .button {
-                            context.send(viewAction: .verifyUser)
-                        })
-            }
+        Section {
+            ListRow(label: .default(title: L10n.commonVerifyUser, icon: \.lock), kind: .button {
+                context.send(viewAction: .verifyUser)
+            })
        }
    }
    
@@ -138,6 +162,7 @@ struct RoomMemberDetailsScreen: View {

 struct RoomMemberDetailsScreen_Previews: PreviewProvider, TestablePreview {
    static let verifiedUserViewModel = makeViewModel(member: .mockDan)
+    static let verificationViolationUserViewModel = makeViewModel(member: .mockBob)
    static let otherUserViewModel = makeViewModel(member: .mockAlice)
    static let accountOwnerViewModel = makeViewModel(member: .mockMe)
    static let ignoredUserViewModel = makeViewModel(member: .mockIgnored)
@@ -145,9 +170,15 @@ struct RoomMemberDetailsScreen_Previews: PreviewProvider, TestablePreview {
    static var previews: some View {
        RoomMemberDetailsScreen(context: verifiedUserViewModel.context)
            .snapshotPreferences(expect: verifiedUserViewModel.context.$viewState.map { state in
-                state.isVerified == true
+                state.verificationState == .verified
            })
            .previewDisplayName("Verified User")
+        
+        RoomMemberDetailsScreen(context: verificationViolationUserViewModel.context)
+            .snapshotPreferences(expect: verificationViolationUserViewModel.context.$viewState.map { state in
+                state.verificationState == .verificationViolation
+            })
+            .previewDisplayName("Verification Violation User")
            
        RoomMemberDetailsScreen(context: otherUserViewModel.context)
            .snapshotPreferences(expect: otherUserViewModel.context.$viewState.map { state in
@@ -171,12 +202,22 @@ struct RoomMemberDetailsScreen_Previews: PreviewProvider, TestablePreview {
    static func makeViewModel(member: RoomMemberProxyMock) -> RoomMemberDetailsScreenViewModel {
        let roomProxyMock = JoinedRoomProxyMock(.init(name: ""))
        roomProxyMock.getMemberUserIDReturnValue = .success(member)
+        
        let clientProxyMock = ClientProxyMock(.init())
        
        clientProxyMock.userIdentityForClosure = { userID in
-            let isVerified = userID == RoomMemberProxyMock.mockDan.userID
-            return .success(UserIdentitySDKMock(configuration: .init(isVerified: isVerified)))
+            let identity = switch userID {
+            case RoomMemberProxyMock.mockDan.userID:
+                UserIdentityProxyMock(configuration: .init(verificationState: .verified))
+            case RoomMemberProxyMock.mockBob.userID:
+                UserIdentityProxyMock(configuration: .init(verificationState: .verificationViolation))
+            default:
+                UserIdentityProxyMock(configuration: .init())
+            }
+            
+            return .success(identity)
        }
+        
        // to avoid mock the call state for the account owner test case
        if member.userID != RoomMemberProxyMock.mockMe.userID {
            clientProxyMock.directRoomForUserIDReturnValue = .success("roomID")
@@ -9,8 +9,9 @@ import Combine
 import SwiftUI

 struct RoomMembersListScreenCoordinatorParameters {
-    let mediaProvider: MediaProviderProtocol
+    let clientProxy: ClientProxyProtocol
    let roomProxy: JoinedRoomProxyProtocol
+    let mediaProvider: MediaProviderProtocol
    let userIndicatorController: UserIndicatorControllerProtocol
    let analytics: AnalyticsService
 }
@@ -31,7 +32,8 @@ final class RoomMembersListScreenCoordinator: CoordinatorProtocol {
    }
    
    init(parameters: RoomMembersListScreenCoordinatorParameters) {
-        viewModel = RoomMembersListScreenViewModel(roomProxy: parameters.roomProxy,
+        viewModel = RoomMembersListScreenViewModel(clientProxy: parameters.clientProxy,
+                                                   roomProxy: parameters.roomProxy,
                                                   mediaProvider: parameters.mediaProvider,
                                                   userIndicatorController: parameters.userIndicatorController,
                                                   analytics: parameters.analytics)
@@ -29,10 +29,15 @@ enum RoomMembersListScreenMode {
    case banned
 }

+struct RoomMemberListScreenEntry: Equatable {
+    let member: RoomMemberDetails
+    let verificationState: UserIdentityVerificationState
+}
+
 struct RoomMembersListScreenViewState: BindableState {
-    private var joinedMembers: [RoomMemberDetails]
-    private var invitedMembers: [RoomMemberDetails]
-    private var bannedMembers: [RoomMemberDetails]
+    private var joinedMembers: [RoomMemberListScreenEntry]
+    private var invitedMembers: [RoomMemberListScreenEntry]
+    private var bannedMembers: [RoomMemberListScreenEntry]
    
    let joinedMembersCount: Int
    var bannedMembersCount: Int { bannedMembers.count }
@@ -44,9 +49,9 @@ struct RoomMembersListScreenViewState: BindableState {
    var bindings: RoomMembersListScreenViewStateBindings
    
    init(joinedMembersCount: Int,
-         joinedMembers: [RoomMemberDetails] = [],
-         invitedMembers: [RoomMemberDetails] = [],
-         bannedMembers: [RoomMemberDetails] = [],
+         joinedMembers: [RoomMemberListScreenEntry] = [],
+         invitedMembers: [RoomMemberListScreenEntry] = [],
+         bannedMembers: [RoomMemberListScreenEntry] = [],
         bindings: RoomMembersListScreenViewStateBindings) {
        self.joinedMembersCount = joinedMembersCount
        self.joinedMembers = joinedMembers
@@ -55,19 +60,19 @@ struct RoomMembersListScreenViewState: BindableState {
        self.bindings = bindings
    }
    
-    var visibleJoinedMembers: [RoomMemberDetails] {
+    var visibleJoinedMembers: [RoomMemberListScreenEntry] {
        joinedMembers
-            .filter { $0.matches(searchQuery: bindings.searchQuery) }
+            .filter { $0.member.matches(searchQuery: bindings.searchQuery) }
    }
    
-    var visibleInvitedMembers: [RoomMemberDetails] {
+    var visibleInvitedMembers: [RoomMemberListScreenEntry] {
        invitedMembers
-            .filter { $0.matches(searchQuery: bindings.searchQuery) }
+            .filter { $0.member.matches(searchQuery: bindings.searchQuery) }
    }
    
-    var visibleBannedMembers: [RoomMemberDetails] {
+    var visibleBannedMembers: [RoomMemberListScreenEntry] {
        bannedMembers
-            .filter { $0.matches(searchQuery: bindings.searchQuery) }
+            .filter { $0.member.matches(searchQuery: bindings.searchQuery) }
    }
 }

@@ -11,6 +11,7 @@ import SwiftUI
 typealias RoomMembersListScreenViewModelType = StateStoreViewModel<RoomMembersListScreenViewState, RoomMembersListScreenViewAction>

 class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMembersListScreenViewModelProtocol {
+    private let clientProxy: ClientProxyProtocol
    private let roomProxy: JoinedRoomProxyProtocol
    private let userIndicatorController: UserIndicatorControllerProtocol
    private let analytics: AnalyticsService
@@ -24,10 +25,12 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
    }

    init(initialMode: RoomMembersListScreenMode = .members,
+         clientProxy: ClientProxyProtocol,
         roomProxy: JoinedRoomProxyProtocol,
         mediaProvider: MediaProviderProtocol,
         userIndicatorController: UserIndicatorControllerProtocol,
         analytics: AnalyticsService) {
+        self.clientProxy = clientProxy
        self.roomProxy = roomProxy
        self.userIndicatorController = userIndicatorController
        self.analytics = analytics
@@ -59,22 +62,23 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
    }
    
    func stop() {
-        hideLoader()
+        hideLoadingIndicator(Self.setupMembersLoadingIndicatorIdentifier)
+        hideLoadingIndicator(Self.updateStateLoadingIndicatorIdentifier)
    }
    
    // MARK: - Members
    
    private func setupMembers() {
        Task {
-            showLoader()
+            showLoadingIndicator(Self.setupMembersLoadingIndicatorIdentifier)
            await roomProxy.updateMembers()
-            hideLoader()
+            hideLoadingIndicator(Self.setupMembersLoadingIndicatorIdentifier)
        }
        
-        roomProxy.membersPublisher
-            .filter { !$0.isEmpty }
+        roomProxy.membersPublisher.combineLatest(roomProxy.identityStatusChangesPublisher)
+            .filter { !$0.0.isEmpty }
            .receive(on: DispatchQueue.main)
-            .sink { [weak self] members in
+            .sink { [weak self] members, _ in
                self?.updateState(members: members)
            }
            .store(in: &cancellables)
@@ -87,11 +91,12 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
    
    private func updateState(members: [RoomMemberProxyProtocol]) {
        Task {
-            showLoader()
+            showLoadingIndicator(Self.updateStateLoadingIndicatorIdentifier)
            
            let members = members.sorted()
            let roomMembersDetails = await buildMembersDetails(members: members)
            self.members = members
+            
            self.state = .init(joinedMembersCount: roomProxy.infoPublisher.value.joinedMembersCount,
                               joinedMembers: roomMembersDetails.joinedMembers,
                               invitedMembers: roomMembersDetails.invitedMembers,
@@ -102,25 +107,32 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
            self.state.canKickUsers = await (try? roomProxy.canUserKick(userID: roomProxy.ownUserID).get()) == true
            self.state.canBanUsers = await (try? roomProxy.canUserBan(userID: roomProxy.ownUserID).get()) == true
            
-            hideLoader()
+            hideLoadingIndicator(Self.updateStateLoadingIndicatorIdentifier)
        }
    }
    
    private func buildMembersDetails(members: [RoomMemberProxyProtocol]) async -> RoomMembersDetails {
-        await Task.detached {
+        await Task.detached { [clientProxy, roomProxy] in
            // accessing RoomMember's properties is very slow. We need to do it in a background thread.
-            var invitedMembers: [RoomMemberDetails] = .init()
-            var joinedMembers: [RoomMemberDetails] = .init()
-            var bannedMembers: [RoomMemberDetails] = .init()
+            var invitedMembers: [RoomMemberListScreenEntry] = .init()
+            var joinedMembers: [RoomMemberListScreenEntry] = .init()
+            var bannedMembers: [RoomMemberListScreenEntry] = .init()
            
            for member in members {
+                var verificationState: UserIdentityVerificationState = .notVerified
+                if roomProxy.isEncrypted, // We don't care about identity statuses on non-encrypted rooms
+                   case let .success(userIdentity) = await clientProxy.userIdentity(for: member.userID),
+                   let userIdentity {
+                    verificationState = userIdentity.verificationState
+                }
+                
                switch member.membership {
                case .invite:
-                    invitedMembers.append(.init(withProxy: member))
+                    invitedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState))
                case .join:
-                    joinedMembers.append(.init(withProxy: member))
+                    joinedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState))
                case .ban:
-                    bannedMembers.append(.init(withProxy: member))
+                    bannedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState))
                default:
                    continue
                }
@@ -128,7 +140,7 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
            
            return .init(invitedMembers: invitedMembers,
                         joinedMembers: joinedMembers,
-                         bannedMembers: bannedMembers.sorted { $0.id.localizedStandardCompare($1.id) == .orderedAscending }) // Re-sort ignoring display name.
+                         bannedMembers: bannedMembers.sorted { $0.member.id.localizedStandardCompare($1.member.id) == .orderedAscending }) // Re-sort ignoring display name.
        }
        .value
    }
@@ -215,18 +227,19 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
    
    // MARK: - Indicators
    
-    private let userIndicatorID = UUID().uuidString
+    private static let setupMembersLoadingIndicatorIdentifier = "\(RoomMembersListScreenViewModel.self)-SetupMembers"
+    private static let updateStateLoadingIndicatorIdentifier = "\(RoomMembersListScreenViewModel.self)-UpdateState"
    
-    private func showLoader() {
-        userIndicatorController.submitIndicator(UserIndicator(id: userIndicatorID,
+    private func showLoadingIndicator(_ identifier: String) {
+        userIndicatorController.submitIndicator(UserIndicator(id: identifier,
                                                              type: .modal(progress: .indeterminate, interactiveDismissDisabled: false, allowsInteraction: true),
                                                              title: L10n.commonLoading,
                                                              persistent: true),
                                                delay: .milliseconds(200))
    }
    
-    private func hideLoader() {
-        userIndicatorController.retractIndicatorWithId(userIndicatorID)
+    private func hideLoadingIndicator(_ identifier: String) {
+        userIndicatorController.retractIndicatorWithId(identifier)
    }
    
    private func showManageMemberIndicator(title: String) {
@@ -247,7 +260,7 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
 }

 private struct RoomMembersDetails {
-    var invitedMembers: [RoomMemberDetails]
-    var joinedMembers: [RoomMemberDetails]
-    var bannedMembers: [RoomMemberDetails]
+    var invitedMembers: [RoomMemberListScreenEntry]
+    var joinedMembers: [RoomMemberListScreenEntry]
+    var bannedMembers: [RoomMemberListScreenEntry]
 }
@@ -97,6 +97,7 @@ struct RoomMembersListManageMemberSheetLive_Previews: PreviewProvider {
 private extension RoomMembersListScreenViewModel {
    static var mock: RoomMembersListScreenViewModel {
        RoomMembersListScreenViewModel(initialMode: .members,
+                                       clientProxy: ClientProxyMock(.init()),
                                       roomProxy: JoinedRoomProxyMock(.init(members: .allMembersAsAdmin)),
                                       mediaProvider: MediaProviderMock(configuration: .init()),
                                       userIndicatorController: ServiceLocator.shared.userIndicatorController,
@@ -59,23 +59,23 @@ struct RoomMembersListScreen: View {
    
    var roomMembers: some View {
        LazyVStack(alignment: .leading, spacing: 12) {
-            membersSection(data: context.viewState.visibleInvitedMembers, sectionTitle: L10n.screenRoomMemberListPendingHeaderTitle)
-            membersSection(data: context.viewState.visibleJoinedMembers, sectionTitle: L10n.screenRoomMemberListHeaderTitle(Int(context.viewState.joinedMembersCount)))
+            membersSection(entries: context.viewState.visibleInvitedMembers, sectionTitle: L10n.screenRoomMemberListPendingHeaderTitle)
+            membersSection(entries: context.viewState.visibleJoinedMembers, sectionTitle: L10n.screenRoomMemberListHeaderTitle(Int(context.viewState.joinedMembersCount)))
        }
    }
    
    var bannedUsers: some View {
        LazyVStack(alignment: .leading, spacing: 12) {
-            membersSection(data: context.viewState.visibleBannedMembers)
+            membersSection(entries: context.viewState.visibleBannedMembers)
        }
    }
    
    @ViewBuilder
-    private func membersSection(data: [RoomMemberDetails], sectionTitle: String? = nil) -> some View {
-        if !data.isEmpty {
+    private func membersSection(entries: [RoomMemberListScreenEntry], sectionTitle: String? = nil) -> some View {
+        if !entries.isEmpty {
            Section {
-                ForEach(data, id: \.id) { member in
-                    RoomMembersListScreenMemberCell(member: member, context: context)
+                ForEach(entries, id: \.member.id) { entry in
+                    RoomMembersListScreenMemberCell(listEntry: entry, context: context)
                }
            } header: {
                if let sectionTitle {
@@ -179,7 +179,22 @@ struct RoomMembersListScreen_Previews: PreviewProvider, TestablePreview {
            members.append(.mockInvited)
        }
        
+        let clientProxyMock = ClientProxyMock(.init())
+        clientProxyMock.userIdentityForClosure = { userID in
+            let identity = switch userID {
+            case RoomMemberProxyMock.mockAlice.userID:
+                UserIdentityProxyMock(configuration: .init(verificationState: .verified))
+            case RoomMemberProxyMock.mockBob.userID:
+                UserIdentityProxyMock(configuration: .init(verificationState: .verificationViolation))
+            default:
+                UserIdentityProxyMock(configuration: .init())
+            }
+            
+            return .success(identity)
+        }
+        
        return RoomMembersListScreenViewModel(initialMode: initialMode,
+                                              clientProxy: clientProxyMock,
                                              roomProxy: JoinedRoomProxyMock(.init(name: "Some room",
                                                                                   members: members,
                                                                                   ownUserID: ownUserID,
@@ -8,22 +8,22 @@
 import SwiftUI

 struct RoomMembersListScreenMemberCell: View {
-    let member: RoomMemberDetails
+    let listEntry: RoomMemberListScreenEntry
    let context: RoomMembersListScreenViewModel.Context

    var body: some View {
        Button {
-            context.send(viewAction: .selectMember(member))
+            context.send(viewAction: .selectMember(listEntry.member))
        } label: {
            HStack(spacing: 8) {
                LoadableAvatarImage(url: avatarURL,
                                    name: avatarName,
-                                    contentID: member.id,
+                                    contentID: listEntry.member.id,
                                    avatarSize: .user(on: .roomDetails),
                                    mediaProvider: context.mediaProvider)
                    .accessibilityHidden(true)
                
-                HStack(alignment: .firstTextBaseline, spacing: 4) {
+                HStack(alignment: .center, spacing: 4) {
                    VStack(alignment: .leading, spacing: 0) {
                        Text(title)
                            .font(.compound.bodyMDSemibold)
@@ -39,6 +39,8 @@ struct RoomMembersListScreenMemberCell: View {
                    }
                    .frame(maxWidth: .infinity, alignment: .leading)
                    
+                    VerificationBadge(verificationState: listEntry.verificationState)
+                    
                    if let role {
                        Text(role)
                            .font(.compound.bodyXS)
@@ -52,7 +54,7 @@ struct RoomMembersListScreenMemberCell: View {
    }
    
    var role: String? {
-        switch member.role {
+        switch listEntry.member.role {
        case .administrator:
            L10n.screenRoomMemberListRoleAdministrator
        case .moderator:
@@ -65,55 +67,72 @@ struct RoomMembersListScreenMemberCell: View {
    // Computed properties to hide the user's profile when banned.
    
    var title: String {
-        guard !member.isBanned else { return member.id }
-        return member.name ?? member.id
+        guard !listEntry.member.isBanned else { return listEntry.member.id }
+        return listEntry.member.name ?? listEntry.member.id
    }
    
    var subtitle: String? {
-        member.isBanned ? nil : member.id
+        listEntry.member.isBanned ? nil : listEntry.member.id
    }
    
    var avatarName: String? {
-        member.isBanned ? nil : member.name
+        listEntry.member.isBanned ? nil : listEntry.member.name
    }
    
    var avatarURL: URL? {
-        member.isBanned ? nil : member.avatarURL
+        listEntry.member.isBanned ? nil : listEntry.member.avatarURL
    }
 }

 struct RoomMembersListMemberCell_Previews: PreviewProvider, TestablePreview {
-    static let members: [RoomMemberProxyMock] = [
-        .mockAlice,
-        .mockAdmin,
-        .mockModerator,
-        .init(with: .init(userID: "@nodisplayname:matrix.org", membership: .join)),
-        .init(with: .init(userID: "@avatar:matrix.org", displayName: "Avatar", avatarURL: .mockMXCUserAvatar, membership: .join))
+    static let members: [RoomMemberListScreenEntry] = [
+        .init(member: .init(withProxy: RoomMemberProxyMock.mockAlice),
+              verificationState: .notVerified),
+        .init(member: .init(withProxy: RoomMemberProxyMock.mockAdmin),
+              verificationState: .verified),
+        .init(member: .init(withProxy: RoomMemberProxyMock.mockModerator),
+              verificationState: .verificationViolation),
+        .init(member: .init(withProxy: RoomMemberProxyMock(with: .init(userID: "@nodisplayname:matrix.org",
+                                                                       membership: .join))),
+        verificationState: .notVerified),
+        .init(member: .init(withProxy: RoomMemberProxyMock(with: .init(userID: "@avatar:matrix.org",
+                                                                       displayName: "Avatar",
+                                                                       avatarURL: .mockMXCUserAvatar,
+                                                                       membership: .join))),
+        verificationState: .notVerified)
    ]
    
-    static let bannedMembers: [RoomMemberProxyMock] = [
-        .init(with: .init(userID: "@nodisplayname:matrix.org", membership: .ban)),
-        .init(with: .init(userID: "@fake:matrix.org", displayName: "President", membership: .ban)),
-        .init(with: .init(userID: "@badavatar:matrix.org", avatarURL: .mockMXCUserAvatar, membership: .ban))
+    static let bannedMembers: [RoomMemberListScreenEntry] = [
+        .init(member: .init(withProxy: RoomMemberProxyMock(with: .init(userID: "@nodisplayname:matrix.org",
+                                                                       membership: .ban))),
+        verificationState: .notVerified),
+        .init(member: .init(withProxy: RoomMemberProxyMock(with: .init(userID: "@fake:matrix.org",
+                                                                       displayName: "President",
+                                                                       membership: .ban))),
+        verificationState: .verified),
+        .init(member: .init(withProxy: RoomMemberProxyMock(with: .init(userID: "@badavatar:matrix.org",
+                                                                       avatarURL: .mockMXCUserAvatar,
+                                                                       membership: .ban))),
+        verificationState: .verificationViolation)
    ]
    
-    static let viewModel = RoomMembersListScreenViewModel(roomProxy: JoinedRoomProxyMock(.init(name: "Some room",
-                                                                                               members: members)),
+    static let viewModel = RoomMembersListScreenViewModel(clientProxy: ClientProxyMock(.init()),
+                                                          roomProxy: JoinedRoomProxyMock(.init(name: "Some room", members: [])),
                                                          mediaProvider: MediaProviderMock(configuration: .init()),
                                                          userIndicatorController: ServiceLocator.shared.userIndicatorController,
                                                          analytics: ServiceLocator.shared.analytics)
    static var previews: some View {
        VStack(spacing: 12) {
            Section("Invited/Joined") {
-                ForEach(members, id: \.userID) { member in
-                    RoomMembersListScreenMemberCell(member: .init(withProxy: member), context: viewModel.context)
+                ForEach(members, id: \.member.id) { entry in
+                    RoomMembersListScreenMemberCell(listEntry: entry, context: viewModel.context)
                }
            }
            
            // Banned members should have their profiles hidden and the avatar should use the first letter from their user ID.
            Section("Banned") {
-                ForEach(bannedMembers, id: \.userID) { member in
-                    RoomMembersListScreenMemberCell(member: .init(withProxy: member), context: viewModel.context)
+                ForEach(bannedMembers, id: \.member.id) { entry in
+                    RoomMembersListScreenMemberCell(listEntry: entry, context: viewModel.context)
                }
            }
        }
@@ -31,6 +31,7 @@ enum RoomScreenViewAction {
 struct RoomScreenViewState: BindableState {
    var roomTitle = ""
    var roomAvatar: RoomAvatar
+    var dmRecipientVerificationState: UserIdentityVerificationState?
    
    var lastScrollDirection: ScrollDirection?
    // This is used to control the banner
@@ -77,6 +77,8 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
        
        Task {
            await handleRoomInfoUpdate(roomProxy.infoPublisher.value)
+            
+            await updateVerificationBadge()
        }
        
        setupSubscriptions(ongoingCallRoomIDPublisher: ongoingCallRoomIDPublisher)
@@ -182,6 +184,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
                }
                
                await self?.processIdentityStatusChanges(changes)
+                await self?.updateVerificationBadge()
            }
        }
        .store(in: &cancellables)
@@ -262,6 +265,23 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
        }
    }
    
+    private func updateVerificationBadge() async {
+        guard roomProxy.isDirectOneToOneRoom,
+              let dmRecipient = roomProxy.membersPublisher.value.first(where: { $0.userID != roomProxy.ownUserID }),
+              case let .success(userIdentity) = await clientProxy.userIdentity(for: dmRecipient.userID) else {
+            state.dmRecipientVerificationState = .notVerified
+            return
+        }
+        
+        guard let userIdentity else {
+            MXLog.failure("User identity should be known at this point")
+            state.dmRecipientVerificationState = .notVerified
+            return
+        }
+        
+        state.dmRecipientVerificationState = userIdentity.verificationState
+    }
+    
    private func resolveIdentityPinningViolation(_ userID: String) async {
        defer {
            hideLoadingIndicator()
@@ -204,6 +204,7 @@ struct RoomScreen: View {
        ToolbarItem(placement: .principal) {
            RoomHeaderView(roomName: roomContext.viewState.roomTitle,
                           roomAvatar: roomContext.viewState.roomAvatar,
+                           dmRecipientVerificationState: roomContext.viewState.dmRecipientVerificationState,
                           mediaProvider: roomContext.mediaProvider)
                // Using a button stops it from getting truncated in the navigation bar
                .contentShape(.rect)
@@ -20,7 +20,6 @@ struct UserProfileScreenCoordinatorParameters {
 enum UserProfileScreenCoordinatorAction {
    case openDirectChat(roomID: String)
    case startCall(roomID: String)
-    case verifyUser(userID: String)
    case dismiss
 }

@@ -52,8 +51,6 @@ final class UserProfileScreenCoordinator: CoordinatorProtocol {
                actionsSubject.send(.openDirectChat(roomID: roomID))
            case .startCall(let roomID):
                actionsSubject.send(.startCall(roomID: roomID))
-            case .verifyUser(let userID):
-                actionsSubject.send(.verifyUser(userID: userID))
            case .dismiss:
                actionsSubject.send(.dismiss)
            }
@@ -10,7 +10,6 @@ import Foundation
 enum UserProfileScreenViewModelAction {
    case openDirectChat(roomID: String)
    case startCall(roomID: String)
-    case verifyUser(userID: String)
    case dismiss
 }

@@ -29,10 +28,6 @@ struct UserProfileScreenViewState: BindableState {
    var showVerifiedBadge: Bool {
        isVerified == true // We purposely show the badge on your own account for consistency with Web.
    }
-    
-    var showVerificationSection: Bool {
-        isVerified == false && !isOwnUser
-    }
 }

 struct UserProfileScreenViewStateBindings {
@@ -48,7 +43,6 @@ enum UserProfileScreenViewAction {
    case openDirectChat
    case createDirectChat
    case startCall(roomID: String)
-    case verifyUser
    case dismiss
 }

@@ -66,8 +66,6 @@ class UserProfileScreenViewModel: UserProfileScreenViewModelType, UserProfileScr
            Task { await createDirectChat() }
        case .startCall(let roomID):
            actionsSubject.send(.startCall(roomID: roomID))
-        case .verifyUser:
-            actionsSubject.send(.verifyUser(userID: state.userID))
        case .dismiss:
            actionsSubject.send(.dismiss)
        }
@@ -95,7 +93,7 @@ class UserProfileScreenViewModel: UserProfileScreenViewModelType, UserProfileScr
        }
        
        if case let .success(.some(identity)) = await identityResult {
-            state.isVerified = identity.isVerified()
+            state.isVerified = identity.verificationState == .verified
        } else {
            MXLog.error("Failed to find the user's identity.")
        }
@@ -14,8 +14,6 @@ struct UserProfileScreen: View {
    var body: some View {
        Form {
            headerSection
-            
-            verificationSection
        }
        .compoundList()
        .navigationTitle(L10n.screenRoomMemberDetailsTitle)
@@ -83,19 +81,7 @@ struct UserProfileScreen: View {
        }
        .padding(.top, 32)
    }
-    
-    @ViewBuilder
-    var verificationSection: some View {
-        if context.viewState.showVerificationSection {
-            Section {
-                ListRow(label: .default(title: L10n.commonVerifyUser, icon: \.lock),
-                        kind: .button {
-                            context.send(viewAction: .verifyUser)
-                        })
-            }
-        }
-    }
-    
+        
    @ToolbarContentBuilder
    private var toolbar: some ToolbarContent {
        if context.viewState.isPresentedModally {
@@ -137,13 +123,22 @@ struct UserProfileScreen_Previews: PreviewProvider, TestablePreview {
    
    static func makeViewModel(userID: String) -> UserProfileScreenViewModel {
        let clientProxyMock = ClientProxyMock(.init())
+        
        clientProxyMock.userIdentityForClosure = { userID in
-            let isVerified = userID == RoomMemberProxyMock.mockDan.userID
-            return .success(UserIdentitySDKMock(configuration: .init(isVerified: isVerified)))
+            let identity = switch userID {
+            case RoomMemberProxyMock.mockDan.userID:
+                UserIdentityProxyMock(configuration: .init(verificationState: .verified))
+            default:
+                UserIdentityProxyMock(configuration: .init())
+            }
+            
+            return .success(identity)
        }
+
        if userID != RoomMemberProxyMock.mockMe.userID {
            clientProxyMock.directRoomForUserIDReturnValue = .success("roomID")
        }
+        
        return UserProfileScreenViewModel(userID: userID,
                                          isPresentedModally: false,
                                          clientProxy: clientProxyMock,