From a60d74a3c02d4d35bf9f9c3a59c7a2edf46af714 Mon Sep 17 00:00:00 2001
From: Vihar Kurama <vihar.kurama@gmail.com>
Date: Fri, 24 Oct 2025 11:47:51 +0100
Subject: [PATCH] [WEB-5235] Fix activity timeline ordering for edited comments
 #8002

---
 apps/web/ce/store/issue/issue-details/activity.store.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/web/ce/store/issue/issue-details/activity.store.ts b/apps/web/ce/store/issue/issue-details/activity.store.ts
index ab86bc1c1..b9a70b772 100644
--- a/apps/web/ce/store/issue/issue-details/activity.store.ts
+++ b/apps/web/ce/store/issue/issue-details/activity.store.ts
@@ -112,10 +112,11 @@ export class IssueActivityStore implements IIssueActivityStore {
     comments.forEach((commentId) => {
       const comment = currentStore.comment.getCommentById(commentId);
       if (!comment) return;
+      const commentTimestamp = comment.edited_at ?? comment.updated_at ?? comment.created_at;
       activityComments.push({
         id: comment.id,
         activity_type: EActivityFilterType.COMMENT,
-        created_at: comment.created_at,
+        created_at: commentTimestamp,
       });
     });