[Feature] Add support for showing current poll comment on alert (#891)

sheep-q · web-flow · commit 07e5e97bcbd3 · 2025-07-24T10:36:58.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 # Upcoming
 
+### ✅ Added
+- Add support for showing current poll comment on alert [#891](https://github.com/GetStream/stream-chat-swiftui/pull/891)
+
 ### 🔄 Changed
 
 # [4.82.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.82.0)
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/Polls/PollCommentsView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/Polls/PollCommentsView.swift
@@ -77,6 +77,7 @@ struct PollCommentsView<Factory: ViewFactory>: View {
                 }
                 .padding()
             }
+            .background(Color(colors.background).ignoresSafeArea())
             .alertBanner(
                 isPresented: $viewModel.errorShown,
                 action: viewModel.refresh
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/Polls/PollCommentsViewModel.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/Polls/PollCommentsViewModel.swift
@@ -76,7 +76,6 @@ class PollCommentsViewModel: ObservableObject, PollVoteListControllerDelegate {
                 self?.errorShown = true
             }
         }
-        newCommentText = ""
     }
     
     func onAppear(comment: PollVote) {
@@ -93,13 +92,18 @@ class PollCommentsViewModel: ObservableObject, PollVoteListControllerDelegate {
     ) {
         if animateChanges {
             withAnimation {
-                self.comments = Array(self.commentsController.votes)
+                self.updateCommentList()
             }
         } else {
-            comments = Array(commentsController.votes)
+            updateCommentList()
         }
     }
     
+    private func updateCommentList() {
+        comments = Array(commentsController.votes)
+        newCommentText = comments.first(where: { $0.user?.id == chatClient.currentUserId })?.answerText ?? ""
+    }
+    
     private func loadComments() {
         guard !loadingComments, !commentsController.hasLoadedAllVotes else { return }
         loadingComments = true
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/PollCommentsViewModel_Tests.swift b/StreamChatSwiftUITests/Tests/ChatChannel/PollCommentsViewModel_Tests.swift
@@ -52,7 +52,7 @@ final class PollCommentsViewModel_Tests: StreamChatTestCase {
         XCTAssertFalse(viewModel.showsAddCommentButton)
     }
     
-    func test_addComment_whenSuccess_thenCommentTextReset() {
+    func test_addComment_whenSuccess() {
         // Given
         let pollController = makePollController()
         
@@ -66,7 +66,7 @@ final class PollCommentsViewModel_Tests: StreamChatTestCase {
         
         // Then
         XCTAssertTrue(pollController.castPollVote_called)
-        XCTAssertEqual("", viewModel.newCommentText)
+        XCTAssertEqual("A", viewModel.newCommentText)
     }
     
     // MARK: - Test Data
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/PollAttachmentView_Tests/test_pollAttachmentView_resultsSnapshot.default-dark.png b/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/PollAttachmentView_Tests/test_pollAttachmentView_resultsSnapshot.default-dark.png

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ struct PollCommentsView<Factory: ViewFactory>: View {`
`77`	`77`	`}`
`78`	`78`	`.padding()`
`79`	`79`	`}`
	`80`	`+ .background(Color(colors.background).ignoresSafeArea())`
`80`	`81`	`.alertBanner(`
`81`	`82`	`isPresented: $viewModel.errorShown,`
`82`	`83`	`action: viewModel.refresh`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ class PollCommentsViewModel: ObservableObject, PollVoteListControllerDelegate {`
`76`	`76`	`self?.errorShown = true`
`77`	`77`	`}`
`78`	`78`	`}`
`79`		`- newCommentText = ""`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`func onAppear(comment: PollVote) {`
`@@ -93,13 +92,18 @@ class PollCommentsViewModel: ObservableObject, PollVoteListControllerDelegate {`
`93`	`92`	`) {`
`94`	`93`	`if animateChanges {`
`95`	`94`	`withAnimation {`
`96`		`- self.comments = Array(self.commentsController.votes)`
	`95`	`+ self.updateCommentList()`
`97`	`96`	`}`
`98`	`97`	`} else {`
`99`		`- comments = Array(commentsController.votes)`
	`98`	`+ updateCommentList()`
`100`	`99`	`}`
`101`	`100`	`}`
`102`	`101`
	`102`	`+ private func updateCommentList() {`
	`103`	`+ comments = Array(commentsController.votes)`
	`104`	`+ newCommentText = comments.first(where: { $0.user?.id == chatClient.currentUserId })?.answerText ?? ""`
	`105`	`+ }`
	`106`	`+`
`103`	`107`	`private func loadComments() {`
`104`	`108`	`guard !loadingComments, !commentsController.hasLoadedAllVotes else { return }`
`105`	`109`	`loadingComments = true`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ final class PollCommentsViewModel_Tests: StreamChatTestCase {`
`52`	`52`	`XCTAssertFalse(viewModel.showsAddCommentButton)`
`53`	`53`	`}`
`54`	`54`
`55`		`- func test_addComment_whenSuccess_thenCommentTextReset() {`
	`55`	`+ func test_addComment_whenSuccess() {`
`56`	`56`	`// Given`
`57`	`57`	`let pollController = makePollController()`
`58`	`58`
`@@ -66,7 +66,7 @@ final class PollCommentsViewModel_Tests: StreamChatTestCase {`
`66`	`66`
`67`	`67`	`// Then`
`68`	`68`	`XCTAssertTrue(pollController.castPollVote_called)`
`69`		`- XCTAssertEqual("", viewModel.newCommentText)`
	`69`	`+ XCTAssertEqual("A", viewModel.newCommentText)`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`// MARK: - Test Data`