swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 13:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

show "Room" for unresolved event permalinks

Browse Source
This commit is contained in:
Mauro Romito 2025-02-28 11:31:25 +01:00 committed by Mauro
parent 890687512f
commit 14fa7d87fc
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ElementX/Sources/Other/Pills/PillTextAttachmentData.swift
View File

@ -12,13 +12,6 @@ enum PillType: Codable, Equatable {
enum EventRoom: Codable, Equatable { enum EventRoom: Codable, Equatable {
case roomAlias(String) case roomAlias(String)
case roomID(String) case roomID(String)
var value: String {
switch self {
case .roomAlias(let value), .roomID(let value):
return value
}
}
} }
case event(room: EventRoom) case event(room: EventRoom)

2
ElementX/Sources/Screens/Timeline/TimelineViewModel.swift
View File

@ -866,7 +866,7 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
case .allUsers: case .allUsers:
pillContext.viewState = .mention(isOwnMention: true, displayText: PillConstants.atRoom) pillContext.viewState = .mention(isOwnMention: true, displayText: PillConstants.atRoom)
case .event(let room): 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 { defer {
pillContext.viewState = pillViewState pillContext.viewState = pillViewState
} }

4
UnitTests/Sources/PillContextTests.swift
View File

@ -242,7 +242,7 @@ class PillContextTests: XCTestCase {
XCTAssertFalse(context.viewState.isOwnMention) XCTAssertFalse(context.viewState.isOwnMention)
XCTAssertFalse(context.viewState.isUndefined) XCTAssertFalse(context.viewState.isUndefined)
XCTAssertEqual(context.viewState.image, .link) XCTAssertEqual(context.viewState.image, .link)
XCTAssertEqual(context.viewState.displayText, L10n.screenRoomEventPill("1")) XCTAssertEqual(context.viewState.displayText, L10n.screenRoomEventPill(L10n.commonRoom))
} }
func testEventOnRoomAliasMention() async throws { func testEventOnRoomAliasMention() async throws {
@ -294,6 +294,6 @@ class PillContextTests: XCTestCase {
XCTAssertFalse(context.viewState.isOwnMention) XCTAssertFalse(context.viewState.isOwnMention)
XCTAssertFalse(context.viewState.isUndefined) XCTAssertFalse(context.viewState.isUndefined)
XCTAssertEqual(context.viewState.image, .link) XCTAssertEqual(context.viewState.image, .link)
XCTAssertEqual(context.viewState.displayText, L10n.screenRoomEventPill("#foundation-and-empire:matrix.org")) XCTAssertEqual(context.viewState.displayText, L10n.screenRoomEventPill(L10n.commonRoom))
} }
} }