diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index f61b2ddf2..aba45e7b5 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -8767,7 +8767,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 25.07.02; + version = 25.07.03; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index d7f6ebe1e..b934895fd 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -158,8 +158,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "80331b4b86ef6805e5b268721ab5559f764845f2", - "version" : "25.7.2" + "revision" : "ab5a18fc12ff4b66a523edacecb8371b1d6fe86f", + "version" : "25.7.3" } }, { diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift index 02847fada..7019b7b0d 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift @@ -674,7 +674,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { return .notLoaded case .pending: return .loading - case .ready(let content, let senderID, let senderProfile): + case .ready(let content, let senderID, let senderProfile, _, _): let sender = buildTimelineItemSender(senderID: senderID, senderProfile: senderProfile) let latestEventContent: TimelineEventContent = switch content { @@ -810,7 +810,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { return .init(details: .notLoaded(eventID: details.eventId()), isThreaded: isThreaded) case .pending: return .init(details: .loading(eventID: details.eventId()), isThreaded: isThreaded) - case let .ready(timelineItem, senderID, senderProfile): + case let .ready(timelineItem, senderID, senderProfile, _, _): let sender = buildTimelineItemSender(senderID: senderID, senderProfile: senderProfile) let replyContent: TimelineEventContent @@ -897,11 +897,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { private extension EmbeddedEventDetails { var isThreaded: Bool { switch self { - case .ready(let content, _, _): - guard case let .msgLike(messageLikeContent) = content else { - return false - } - + case .ready(.msgLike(let messageLikeContent), _, _, _, _): return messageLikeContent.threadRoot != nil default: return false diff --git a/project.yml b/project.yml index 3f60523ea..9cc958b81 100644 --- a/project.yml +++ b/project.yml @@ -65,7 +65,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/element-hq/matrix-rust-components-swift - exactVersion: 25.07.02 + exactVersion: 25.07.03 # path: ../matrix-rust-sdk Compound: url: https://github.com/element-hq/compound-ios