[i288] fix message footer displaying wrong date

GetStream · May 6, 2024 · fa62521 · fa62521
1 parent cec5306
commit fa62521
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/...e/src/main/java/io/getstream/chat/android/compose/ui/components/messages/MessageFooter.kt b/...e/src/main/java/io/getstream/chat/android/compose/ui/components/messages/MessageFooter.kt
@@ -96,7 +96,16 @@ public fun MessageFooter(
                     )
                 }
 
-                val date = message.updatedAt ?: message.createdAt ?: message.createdLocallyAt
+                val updatedAt = message.updatedAt
+                val createdAt = message.createdAt ?: message.createdLocallyAt
+                val date = when {
+                    createdAt == null -> updatedAt
+                    updatedAt == null -> createdAt
+                    else -> when (updatedAt.after(createdAt)) {
+                        true -> updatedAt
+                        else -> createdAt
+                    }
+                }
                 if (date != null) {
                     Timestamp(date = date, formatType = DateFormatType.TIME)
                 }