From 14fa7d87fcce8ce3d85c2c12d21a2be56f66397f Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 28 Feb 2025 11:31:25 +0100 Subject: [PATCH] show "Room" for unresolved event permalinks --- ElementX/Sources/Other/Pills/PillTextAttachmentData.swift | 7 ------- ElementX/Sources/Screens/Timeline/TimelineViewModel.swift | 2 +- UnitTests/Sources/PillContextTests.swift | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/ElementX/Sources/Other/Pills/PillTextAttachmentData.swift b/ElementX/Sources/Other/Pills/PillTextAttachmentData.swift index 25d84a7608..0f867cf779 100644 --- a/ElementX/Sources/Other/Pills/PillTextAttachmentData.swift +++ b/ElementX/Sources/Other/Pills/PillTextAttachmentData.swift @@ -12,13 +12,6 @@ enum PillType: Codable, Equatable { enum EventRoom: Codable, Equatable { case roomAlias(String) case roomID(String) - - var value: String { - switch self { - case .roomAlias(let value), .roomID(let value): - return value - } - } } case event(room: EventRoom) diff --git a/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift b/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift index 6fd76358d8..fb833e11dc 100644 --- a/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift +++ b/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift @@ -866,7 +866,7 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol { case .allUsers: pillContext.viewState = .mention(isOwnMention: true, displayText: PillConstants.atRoom) case .event(let room): - var pillViewState: PillViewState = .reference(avatar: .link, displayText: L10n.screenRoomEventPill(room.value)) + var pillViewState: PillViewState = .reference(avatar: .link, displayText: L10n.screenRoomEventPill(L10n.commonRoom)) defer { pillContext.viewState = pillViewState } diff --git a/UnitTests/Sources/PillContextTests.swift b/UnitTests/Sources/PillContextTests.swift index bb925cc18f..4fb576868b 100644 --- a/UnitTests/Sources/PillContextTests.swift +++ b/UnitTests/Sources/PillContextTests.swift @@ -242,7 +242,7 @@ class PillContextTests: XCTestCase { XCTAssertFalse(context.viewState.isOwnMention) XCTAssertFalse(context.viewState.isUndefined) XCTAssertEqual(context.viewState.image, .link) - XCTAssertEqual(context.viewState.displayText, L10n.screenRoomEventPill("1")) + XCTAssertEqual(context.viewState.displayText, L10n.screenRoomEventPill(L10n.commonRoom)) } func testEventOnRoomAliasMention() async throws { @@ -294,6 +294,6 @@ class PillContextTests: XCTestCase { XCTAssertFalse(context.viewState.isOwnMention) XCTAssertFalse(context.viewState.isUndefined) XCTAssertEqual(context.viewState.image, .link) - XCTAssertEqual(context.viewState.displayText, L10n.screenRoomEventPill("#foundation-and-empire:matrix.org")) + XCTAssertEqual(context.viewState.displayText, L10n.screenRoomEventPill(L10n.commonRoom)) } }