ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the new strings for send failures when the unsigned devices are your own. (#3299)

Browse Source
This commit is contained in:
Doug
2024-09-18 10:48:16 +01:00
committed by GitHub
parent 16812e21ea
commit 63a0a99dbd
12 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/Timeline/View/ItemMenu/TimelineItemMenu.swift
+17 -3
View File
@@ -93,7 +93,9 @@ struct TimelineItemMenu: View {
Divider()
.padding(.horizontal, -16)
VerifiedUserSendFailureView(failure: failure, members: context.viewState.members) {
VerifiedUserSendFailureView(failure: failure,
members: context.viewState.members,
ownUserID: context.viewState.ownUserID) {
send(.itemSendInfoTapped(itemID: item.id))
}
.padding(.bottom, 8)
@@ -186,21 +188,26 @@ private struct VerifiedUserSendFailureView: View {
let action: () -> Void
private let memberDisplayName: String
private let isYou: Bool
init(failure: TimelineItemSendFailure.VerifiedUser,
members: [String: RoomMemberState],
ownUserID: String,
action: @escaping () -> Void) {
self.failure = failure
self.action = action
let userIDs = failure.affectedUserIDs
memberDisplayName = userIDs.first.map { members[$0]?.displayName ?? $0 } ?? ""
isYou = ownUserID == userIDs.first
}
var title: String {
switch failure {
case .hasUnsignedDevice: L10n.screenTimelineItemMenuSendFailureUnsignedDevice(memberDisplayName)
case .changedIdentity: L10n.screenTimelineItemMenuSendFailureChangedIdentity(memberDisplayName)
case .hasUnsignedDevice:
isYou ? L10n.screenTimelineItemMenuSendFailureYouUnsignedDevice : L10n.screenTimelineItemMenuSendFailureUnsignedDevice(memberDisplayName)
case .changedIdentity:
L10n.screenTimelineItemMenuSendFailureChangedIdentity(memberDisplayName)
}
}
@@ -241,6 +248,9 @@ struct TimelineItemMenu_Previews: PreviewProvider, TestablePreview {
static let (unsignedDevicesItem, _) = makeItem(deliveryStatus: .sendingFailed(.verifiedUser(.hasUnsignedDevice(devices: [
"@alice:matrix.org": ["DEVICE1", "DEVICE2"]
]))))
static let (ownUnsignedDevicesItem, _) = makeItem(deliveryStatus: .sendingFailed(.verifiedUser(.hasUnsignedDevice(devices: [
RoomMemberProxyMock.mockMe.userID: ["DEVICE1"]
]))))
static var previews: some View {
TimelineItemMenu(item: item, actions: actions)
@@ -272,6 +282,10 @@ struct TimelineItemMenu_Previews: PreviewProvider, TestablePreview {
.environmentObject(viewModel.context)
.previewDisplayName("Unsigned Devices")
TimelineItemMenu(item: ownUnsignedDevicesItem, actions: actions)
.environmentObject(viewModel.context)
.previewDisplayName("Own Unsigned Devices")
TimelineItemMenu(item: identityChangedItem, actions: actions)
.environmentObject(viewModel.context)
.previewDisplayName("Identity Changed")