show "Room" for unresolved event permalinks

element-hq · Feb 28, 2025 · 14fa7d8 · 14fa7d8
1 parent 8906875
commit 14fa7d8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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))
     }
 }