Change the order of the latest votes so that the first one is the mos…

…t recent one
GetStream · Sep 29, 2024 · 12aa799 · 12aa799
1 parent f698986
commit 12aa799
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Sources/StreamChat/Database/DTOs/PollDTO.swift b/Sources/StreamChat/Database/DTOs/PollDTO.swift
@@ -101,14 +101,14 @@ extension PollDTO {
             latestAnswers: latestVotes
                 .filter { $0.isAnswer }
                 .map { try $0.asModel() }
-                .sorted(by: { $0.createdAt < $1.createdAt }),
+                .sorted(by: { $0.createdAt > $1.createdAt }),
             options: optionsArray.map { try $0.asModel() },
             latestVotesByOption: latestVotesByOption.map { try $0.asModel() },
             latestVotes: latestVotesByOption
                 .map(\.latestVotes)
                 .joined()
                 .map { try $0.asModel() }
-                .sorted(by: { $0.createdAt < $1.createdAt }),
+                .sorted(by: { $0.createdAt > $1.createdAt }),
             ownVotes: latestVotes
                 .filter { !$0.isAnswer && $0.user?.id == currentUserId }
                 .map { try $0.asModel() }

diff --git a/Sources/StreamChat/Database/DTOs/PollOptionDTO.swift b/Sources/StreamChat/Database/DTOs/PollOptionDTO.swift
@@ -62,7 +62,7 @@ extension PollOptionDTO {
             text: text,
             latestVotes: try latestVotes
                 .map { try $0.asModel() }
-                .sorted(by: { $0.createdAt < $1.createdAt }),
+                .sorted(by: { $0.createdAt > $1.createdAt }),
             extraData: extraData
         )
     }

diff --git a/Sources/StreamChatUI/ChatChannelList/ChatChannelListItemView.swift b/Sources/StreamChatUI/ChatChannelList/ChatChannelListItemView.swift
@@ -475,7 +475,7 @@ open class ChatChannelListItemView: _View, ThemeProvider, SwiftUIRepresentable {
     open func pollAttachmentPreviewText(for previewMessage: ChatMessage) -> String? {
         guard let poll = previewMessage.poll, !previewMessage.isDeleted else { return nil }
         var components = ["📊"]
-        if let latestVoter = poll.latestVotes.last?.user {
+        if let latestVoter = poll.latestVotes.first?.user {
             if latestVoter.id == content?.currentUserId {
                 components.append(L10n.Message.Preview.pollYouVoted)
             } else {

diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/ChatChannelListItemView_Tests.swift b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/ChatChannelListItemView_Tests.swift
@@ -758,9 +758,9 @@ final class ChatChannelListItemView_Tests: XCTestCase {
             poll: .mock(
                 name: "Poll",
                 latestVotes: [
+                    .mock(user: currentUser),
                     .mock(user: .unique),
-                    .mock(user: .unique),
-                    .mock(user: currentUser)
+                    .mock(user: .unique)
                 ]
             ),
             messageAuthor: currentUser,
@@ -782,9 +782,9 @@ final class ChatChannelListItemView_Tests: XCTestCase {
             poll: .mock(
                 name: "Poll",
                 latestVotes: [
-                    .mock(user: .unique),
+                    .mock(user: .mock(id: .unique, name: "Someone")),
                     .mock(user: currentUser),
-                    .mock(user: .mock(id: .unique, name: "Someone"))
+                    .mock(user: .unique)
                 ]
             ),
             messageAuthor: currentUser,