@@ -29,13 +29,7 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
29
29
}
30
30
}
31
31
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
39
33
40
34
private let messageListDateOverlay : DateFormatter = {
41
35
let df = DateFormatter ( )
@@ -195,9 +189,7 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
195
189
didUpdateChannel channel: EntityChange < ChatChannel > ,
196
190
channelController: ChatChannelController
197
191
) {
198
- if isActive {
199
- messages = channelController. messages
200
- }
192
+ messages = channelController. messages
201
193
checkHeaderType ( )
202
194
}
203
195
@@ -222,6 +214,7 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
222
214
public func onViewAppear( ) {
223
215
reactionsShown = false
224
216
isActive = true
217
+ messages = channelDataSource. messages
225
218
}
226
219
227
220
public func onViewDissappear( ) {
@@ -231,7 +224,7 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
231
224
// MARK: - private
232
225
233
226
private func checkForNewMessages( index: Int ) {
234
- if index < messages. count - 20 {
227
+ if index < channelDataSource . messages. count - 20 {
235
228
return
236
229
}
237
230
@@ -242,8 +235,6 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
242
235
completion: { [ weak self] _ in
243
236
guard let self = self else { return }
244
237
self . loadingPreviousMessages = false
245
- self . messages = self . channelDataSource. messages
246
- self . maybeRefreshMessageList ( )
247
238
}
248
239
)
249
240
}
0 commit comments