Sort reactions on the timeline by count and then timestamp and show the date on the summary view

ElementX/Sources/Mocks/AggregatedReactionMock.swift

@@ -23,42 +23,50 @@ extension AggregatedReaction {
         }
     }
 
+    private static func mockReaction(key: String, senderIDs: [String]) -> AggregatedReaction {
+        let senders = senderIDs
+            .map { id in
+                ReactionSender(senderId: id, timestamp: Date())
+            }
+        return AggregatedReaction(accountOwnerID: alice, key: key, senders: senders)
+    }
+
     private static var alice: String {
         RoomMemberProxyMock.mockAlice.userID
     }
 
     static var mockThumbsUpHighlighted: AggregatedReaction {
-        AggregatedReaction(accountOwnerID: alice, key: "👍", senders: [alice] + mockIds(4))
+        mockReaction(key: "👍", senderIDs: [alice] + mockIds(4))
     }
 
     static var mockClap: AggregatedReaction {
-        AggregatedReaction(accountOwnerID: alice, key: "👏", senders: mockIds(1))
+        mockReaction(key: "👏", senderIDs: mockIds(1))
     }
 
     static var mockParty: AggregatedReaction {
-        AggregatedReaction(accountOwnerID: alice, key: "🎉", senders: mockIds(20))
+        mockReaction(key: "🎉", senderIDs: mockIds(20))
     }
 
     static var mockReactions: [AggregatedReaction] {
         [
-            AggregatedReaction(accountOwnerID: alice, key: "😅", senders: [alice]),
-            AggregatedReaction(accountOwnerID: alice, key: "🤷‍♂️", senders: mockIds(1)),
-            AggregatedReaction(accountOwnerID: alice, key: "🎨", senders: [alice] + mockIds(5)),
-            AggregatedReaction(accountOwnerID: alice, key: "🎉", senders: mockIds(8)),
-            AggregatedReaction(accountOwnerID: alice, key: "🤯", senders: [alice] + mockIds(14)),
-            AggregatedReaction(accountOwnerID: alice, key: "🫣", senders: mockIds(1)),
-            AggregatedReaction(accountOwnerID: alice, key: "🚀", senders: [alice] + mockIds(3)),
-            AggregatedReaction(accountOwnerID: alice, key: "😇", senders: mockIds(2)),
-            AggregatedReaction(accountOwnerID: alice, key: "🤭", senders: [alice] + mockIds(8)),
-            AggregatedReaction(accountOwnerID: alice, key: "🫤", senders: mockIds(10)),
-            AggregatedReaction(accountOwnerID: alice, key: "🐶", senders: mockIds(1)),
-            AggregatedReaction(accountOwnerID: alice, key: "🐱", senders: mockIds(1)),
-            AggregatedReaction(accountOwnerID: alice, key: "🐭", senders: mockIds(1)),
-            AggregatedReaction(accountOwnerID: alice, key: "🐹", senders: mockIds(1)),
-            AggregatedReaction(accountOwnerID: alice, key: "🐰", senders: mockIds(1)),
-            AggregatedReaction(accountOwnerID: alice, key: "🦊", senders: mockIds(1)),
-            AggregatedReaction(accountOwnerID: alice, key: "🐻", senders: mockIds(1)),
-            AggregatedReaction(accountOwnerID: alice, key: "🐼", senders: mockIds(1))
+            mockReaction(key: "😅", senderIDs: [alice]),
+            mockReaction(key: "🤷‍♂️", senderIDs: mockIds(1)),
+            mockReaction(key: "🎨", senderIDs: [alice] + mockIds(5)),
+            mockReaction(key: "🎉", senderIDs: mockIds(8)),
+            mockReaction(key: "🤯", senderIDs: [alice] + mockIds(14)),
+            mockReaction(key: "🫣", senderIDs: mockIds(1)),
+            mockReaction(key: "🚀", senderIDs: [alice] + mockIds(3)),
+            mockReaction(key: "😇", senderIDs: mockIds(2)),
+            mockReaction(key: "🤭", senderIDs: [alice] + mockIds(8)),
+            mockReaction(key: "🫤", senderIDs: mockIds(10)),
+            mockReaction(key: "🐶", senderIDs: mockIds(1)),
+            mockReaction(key: "🐱", senderIDs: mockIds(1)),
+            mockReaction(key: "🐭", senderIDs: mockIds(1)),
+            mockReaction(key: "🐹", senderIDs: mockIds(1)),
+            mockReaction(key: "🐰", senderIDs: mockIds(1)),
+            mockReaction(key: "🦊", senderIDs: mockIds(1)),
+            mockReaction(key: "🐻", senderIDs: mockIds(1)),
+            mockReaction(key: "🐼", senderIDs: mockIds(1))
         ]
     }
 }

ElementX/Sources/Screens/RoomScreen/View/Supplementary/ReactionsSummaryView.swift

@@ -67,7 +67,7 @@ struct ReactionsSummaryView: View {
                 ScrollView {
                     VStack(alignment: .leading) {
                         ForEach(reaction.senders, id: \.self) { sender in
-                            ReactionSummarySenderView(sender: sender, member: members[sender], imageProvider: imageProvider)
+                            ReactionSummarySenderView(sender: sender, member: members[sender.senderId], imageProvider: imageProvider)
                                 .padding(.horizontal, 16)
                         }
                     }
@@ -107,28 +107,32 @@ private struct ReactionSummaryButton: View {
 }
 
 private struct ReactionSummarySenderView: View {
-    var sender: String
+    var sender: ReactionSender
     var member: RoomMemberState?
     let imageProvider: ImageProviderProtocol?
 
     var displayName: String {
-        member?.displayName ?? sender
+        member?.displayName ?? sender.senderId
     }
 
     var body: some View {
         HStack {
             LoadableAvatarImage(url: member?.avatarURL,
                                 name: displayName,
-                                contentID: sender,
+                                contentID: sender.senderId,
                                 avatarSize: .user(on: .timeline),
                                 imageProvider: imageProvider)
             VStack(alignment: .leading) {
                 Text(displayName)
                     .font(.compound.bodyMDSemibold)
-                Text(sender)
+                Text(sender.senderId)
                     .font(.compound.bodySM)
                     .foregroundColor(.compound.textSecondary)
             }
+            .frame(maxWidth: .infinity, alignment: .leading)
+            Text(sender.timestamp.formattedMinimal())
+                .font(.compound.bodyXS)
+                .foregroundColor(.compound.textSecondary)
         }
         .frame(maxWidth: .infinity, alignment: .leading)
         .padding(.vertical, 8)

ElementX/Sources/Services/Timeline/Fixtures/RoomTimelineItemFixtures.swift

@@ -34,7 +34,7 @@ enum RoomTimelineItemFixtures {
                              sender: .init(id: "", displayName: "Helena"),
                              content: .init(body: "Let’s get lunch soon! New salad place opened up 🥗. When are y’all free? 🤗"),
                              properties: RoomTimelineItemProperties(reactions: [
-                                 AggregatedReaction(accountOwnerID: "me", key: "🙌", senders: ["me"])
+                                 AggregatedReaction(accountOwnerID: "me", key: "🙌", senders: [ReactionSender(senderId: "me", timestamp: Date())])
                              ])),
         TextRoomTimelineItem(id: .init(timelineID: UUID().uuidString),
                              timestamp: "10:11 AM",
@@ -43,8 +43,14 @@ enum RoomTimelineItemFixtures {
                              sender: .init(id: "", displayName: "Helena"),
                              content: .init(body: "I can be around on Wednesday. How about some 🌮 instead? Like https://www.tortilla.co.uk/"),
                              properties: RoomTimelineItemProperties(reactions: [
-                                 AggregatedReaction(accountOwnerID: "me", key: "🙏", senders: ["helena"]),
-                                 AggregatedReaction(accountOwnerID: "me", key: "🙌", senders: ["me", "helena", "jacob"])
+                                 AggregatedReaction(accountOwnerID: "me", key: "🙏", senders: [ReactionSender(senderId: "helena", timestamp: Date())]),
+                                 AggregatedReaction(accountOwnerID: "me",
+                                                    key: "🙌",
+                                                    senders: [
+                                                        ReactionSender(senderId: "me", timestamp: Date()),
+                                                        ReactionSender(senderId: "helena", timestamp: Date()),
+                                                        ReactionSender(senderId: "jacob", timestamp: Date())
+                                                    ])
                              ])),
         SeparatorRoomTimelineItem(id: .init(timelineID: "Today"), text: "Today"),
         TextRoomTimelineItem(id: .init(timelineID: UUID().uuidString),

ElementX/Sources/Services/Timeline/TimelineItemContent/AggregratedReaction.swift

@@ -23,7 +23,15 @@ struct AggregatedReaction: Hashable {
     /// The reaction that was sent.
     let key: String
     /// The user ids of those who sent the reactions
-    let senders: [String]
+    let senders: [ReactionSender]
+}
+
+/// Details of who sent the reaction
+struct ReactionSender: Hashable {
+    /// The id of the user who sent the reaction
+    let senderId: String
+    /// The time that the reaction was received on the original homeserver
+    let timestamp: Date
 }
 
 extension AggregatedReaction {
@@ -34,6 +42,6 @@ extension AggregatedReaction {
 
     /// Whether to highlight the reaction, indicating that the current user sent this reaction.
     var isHighlighted: Bool {
-        senders.contains(where: { $0 == accountOwnerID })
+        senders.contains(where: { $0.senderId == accountOwnerID })
     }
 }

ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift

@@ -313,13 +313,22 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
 
     private func aggregateReactions(_ reactions: [Reaction]) -> [AggregatedReaction] {
         reactions.map { reaction in
-            AggregatedReaction(accountOwnerID: userID, key: reaction.key, senders: reaction.senders.map(\.senderId))
+            let senders = reaction.senders
+                .map { senderData in
+                    ReactionSender(senderId: senderData.senderId, timestamp: Date(timeIntervalSince1970: TimeInterval(senderData.timestamp / 1000)))
+                }
+                .sorted { a, b in
+                    // Sort reactions most recent first
+                    a.timestamp > b.timestamp
+                }
+            return AggregatedReaction(accountOwnerID: userID, key: reaction.key, senders: senders)
         }
         .sorted { a, b in
-            // Sort by count and then by key for a consistence experience.
-            // Otherwise emojis can switch around. We can replace
-            // with timestamp as a secondary sort when it is available.
-            (a.count, a.key) > (b.count, b.key)
+            // Sort aggregated reactions by count and then by most recent reaction
+            if a.count == b.count {
+                return a.senders[0].timestamp < b.senders[0].timestamp
+            }
+            return a.count > b.count
         }
     }
 

UnitTests/Sources/RoomScreenViewModelTests.swift

@@ -375,7 +375,7 @@ class RoomScreenViewModelTests: XCTestCase {
 
 private extension TextRoomTimelineItem {
     init(text: String, sender: String, addReactions: Bool = false) {
-        let reactions = addReactions ? [AggregatedReaction(accountOwnerID: "bob", key: "🦄", senders: [sender])] : []
+        let reactions = addReactions ? [AggregatedReaction(accountOwnerID: "bob", key: "🦄", senders: [ReactionSender(senderId: sender, timestamp: Date())])] : []
         self.init(id: .init(timelineID: UUID().uuidString),
                   timestamp: "10:47 am",
                   isOutgoing: sender == "bob",