From 33f8ce27597f1ea5cb4a61ac5a118988fec80c8b Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Thu, 30 Jul 2026 10:33:11 +0100 Subject: [PATCH] Fix a couple of missing `UserStatus` values. (#5944) * Fix the missing UserStatus in RoomMemberProxy. * Use the hero's status for a room's AvatarHeaderView. --- ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift | 4 +++- .../Sources/Services/Room/RoomMember/RoomMemberProxy.swift | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift b/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift index fd706b054..cdeac87c9 100644 --- a/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift +++ b/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift @@ -41,14 +41,16 @@ struct AvatarHeaderView: View { @ViewBuilder footer: @escaping () -> Footer) { avatarInfo = .room(room.avatar) title = room.name ?? room.id - status = nil if let roomAlias = room.canonicalAlias { subtitle = roomAlias + status = nil } else if room.isDirect, case let .heroes(heroes) = room.avatar, heroes.count == 1 { subtitle = heroes[0].id + status = heroes[0].status } else { subtitle = nil + status = nil } self.avatarSize = avatarSize diff --git a/ElementX/Sources/Services/Room/RoomMember/RoomMemberProxy.swift b/ElementX/Sources/Services/Room/RoomMember/RoomMemberProxy.swift index 4dfbd276f..875b6aad2 100644 --- a/ElementX/Sources/Services/Room/RoomMember/RoomMemberProxy.swift +++ b/ElementX/Sources/Services/Room/RoomMember/RoomMemberProxy.swift @@ -37,7 +37,7 @@ final nonisolated class RoomMemberProxy: RoomMemberProxyProtocol { } var status: UserStatus { - UserStatus() + UserStatus(rustStatus: member.status, rustCall: member.call) } var membership: MembershipState {