fix(llc): fix incorrect message order (#2132)

* fix(llc, persistence): prefer remoteCreatedAt over localCreatedAt while sorting messages.

* chore: update CHANGELOG.md

---------

Co-authored-by: Sahil Kumar <sahil@getstream.io>

Author: VladShturma

packages/stream_chat/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Upcoming
+
+🐞 Fixed
+
+- [[#1775]](https://github.com/GetStream/stream-chat-flutter/issues/1775) Fix incorrect message order.
+
 ## 9.5.0
 
 ✅ Added

packages/stream_chat/lib/src/core/models/message.dart

@@ -165,7 +165,7 @@ class Message extends Equatable {
   /// Returns the latest between [localCreatedAt] and [remoteCreatedAt].
   /// If both are null, returns [DateTime.now].
   @JsonKey(includeToJson: false)
-  DateTime get createdAt => localCreatedAt ?? remoteCreatedAt ?? DateTime.now();
+  DateTime get createdAt => remoteCreatedAt ?? localCreatedAt ?? DateTime.now();
 
   /// Indicates when the message was created locally.
   @JsonKey(includeToJson: false, includeFromJson: false)
@@ -180,7 +180,7 @@ class Message extends Equatable {
   /// Returns the latest between [localUpdatedAt] and [remoteUpdatedAt].
   /// If both are null, returns [createdAt].
   @JsonKey(includeToJson: false)
-  DateTime get updatedAt => localUpdatedAt ?? remoteUpdatedAt ?? createdAt;
+  DateTime get updatedAt => remoteUpdatedAt ?? localUpdatedAt ?? createdAt;
 
   /// Indicates when the message was updated locally.
   @JsonKey(includeToJson: false, includeFromJson: false)
@@ -194,7 +194,7 @@ class Message extends Equatable {
   ///
   /// Returns the latest between [localDeletedAt] and [remoteDeletedAt].
   @JsonKey(includeToJson: false)
-  DateTime? get deletedAt => localDeletedAt ?? remoteDeletedAt;
+  DateTime? get deletedAt => remoteDeletedAt ?? localDeletedAt;
 
   /// Reserved field indicating when the message text was edited.
   @JsonKey(includeToJson: false)

packages/stream_chat_persistence/lib/src/db/drift_chat_database.dart

@@ -53,7 +53,7 @@ class DriftChatDatabase extends _$DriftChatDatabase {
 
   // you should bump this number whenever you change or add a table definition.
   @override
-  int get schemaVersion => 17;
+  int get schemaVersion => 18;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(

packages/stream_chat_persistence/lib/src/db/drift_chat_database.g.dart

@@ -59,7 +59,7 @@ class Messages extends Table {
   /// If both are null, returns [currentDateAndTime].
   Expression<DateTime> get createdAt {
     return coalesce<DateTime>(
-      [localCreatedAt, remoteCreatedAt, currentDateAndTime],
+      [remoteCreatedAt, localCreatedAt, currentDateAndTime],
     );
   }
 
@@ -75,7 +75,7 @@ class Messages extends Table {
   /// If both are null, returns [createdAt].
   Expression<DateTime> get updatedAt {
     return coalesce<DateTime>(
-      [localUpdatedAt, remoteUpdatedAt, createdAt],
+      [remoteUpdatedAt, localUpdatedAt, createdAt],
     );
   }
 
@@ -90,7 +90,7 @@ class Messages extends Table {
   /// Returns the latest between [localDeletedAt] and [remoteDeletedAt].
   Expression<DateTime> get deletedAt {
     return coalesce<DateTime>(
-      [localDeletedAt, remoteDeletedAt],
+      [remoteDeletedAt, localDeletedAt],
     );
   }