@@ -120,8 +120,6 @@ func chatHistoryEntriesForView(
120120 }
121121 }
122122
123- //var existingGroupStableIds: [UInt32] = []
124- //var groupBucket: [(Message, Bool, ChatHistoryMessageSelection, ChatMessageEntryAttributes, MessageHistoryEntryLocation?)] = []
125123 var count = 0
126124 loop: for entry in view. entries {
127125 var message = entry. message
@@ -198,7 +196,7 @@ func chatHistoryEntriesForView(
198196 }
199197
200198 if groupMessages || reverseGroupedMessages {
201- if let messageGroupingKey = message. groupingKey, ( groupMessages || reverseGroupedMessages ) {
199+ if let messageGroupingKey = message. groupingKey {
202200 let selection : ChatHistoryMessageSelection
203201 if let selectedMessages = selectedMessages {
204202 selection = . selectable( selected: selectedMessages. contains ( message. id) )
@@ -271,6 +269,22 @@ func chatHistoryEntriesForView(
271269 }
272270 }
273271
272+ if !groupMessages && reverseGroupedMessages {
273+ var flatEntries : [ ChatHistoryEntry ] = [ ]
274+
275+ for entry in entries {
276+ switch entry {
277+ case let . MessageGroupEntry( _, messages, presentationData) :
278+ for (message, isRead, selection, attributes, location) in messages {
279+ flatEntries. append ( . MessageEntry( message, presentationData, isRead, location, selection, attributes) )
280+ }
281+ default :
282+ flatEntries. append ( entry)
283+ }
284+ }
285+ entries = flatEntries
286+ }
287+
274288 let insertPendingProcessingMessage : ( [ Message ] , Int ) -> Void = { messages, index in
275289 let serviceMessage = Message (
276290 stableId: UInt32 . max - messages[ 0 ] . stableId,
0 commit comments