Skip to content

Commit 8bdb9e2

Browse files
Fixed an issue with thread replies
1 parent ebd00f3 commit 8bdb9e2

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,7 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
2929
}
3030
}
3131

32-
private var isActive = true {
33-
didSet {
34-
if oldValue == false && isActive == true {
35-
messages = channelDataSource.messages
36-
}
37-
}
38-
}
32+
private var isActive = true
3933

4034
private let messageListDateOverlay: DateFormatter = {
4135
let df = DateFormatter()
@@ -195,9 +189,7 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
195189
didUpdateChannel channel: EntityChange<ChatChannel>,
196190
channelController: ChatChannelController
197191
) {
198-
if isActive {
199-
messages = channelController.messages
200-
}
192+
messages = channelController.messages
201193
checkHeaderType()
202194
}
203195

@@ -222,6 +214,7 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
222214
public func onViewAppear() {
223215
reactionsShown = false
224216
isActive = true
217+
messages = channelDataSource.messages
225218
}
226219

227220
public func onViewDissappear() {
@@ -231,7 +224,7 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
231224
// MARK: - private
232225

233226
private func checkForNewMessages(index: Int) {
234-
if index < messages.count - 20 {
227+
if index < channelDataSource.messages.count - 20 {
235228
return
236229
}
237230

@@ -242,8 +235,6 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
242235
completion: { [weak self] _ in
243236
guard let self = self else { return }
244237
self.loadingPreviousMessages = false
245-
self.messages = self.channelDataSource.messages
246-
self.maybeRefreshMessageList()
247238
}
248239
)
249240
}

0 commit comments

Comments
 (0)