From 03ea20aa6ad1356e4b0eddbe9ef31147abd504e9 Mon Sep 17 00:00:00 2001
From: Kiril Tijsma <kiril@live.nl>
Date: Tue, 11 Mar 2025 13:43:21 +0100
Subject: [PATCH] fix(chat-service): sort combined streams

---
 .../lib/src/services/chat_service.dart                        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/chat_repository_interface/lib/src/services/chat_service.dart b/packages/chat_repository_interface/lib/src/services/chat_service.dart
index 1e9dc18..1710b92 100644
--- a/packages/chat_repository_interface/lib/src/services/chat_service.dart
+++ b/packages/chat_repository_interface/lib/src/services/chat_service.dart
@@ -157,7 +157,9 @@ class ChatService {
           ...Map.fromEntries(
             messages.map((message) => MapEntry(message.id, message)),
           ),
-        }.values.toList();
+        }.values.toList().sorted(
+              (a, b) => a.timestamp.compareTo(b.timestamp),
+            );
 
     return Rx.combineLatest2(
       chatRepository.getMessages(userId: userId, chatId: chatId),