From ac07a2242b18e870cde05a89d722bed3c268754b Mon Sep 17 00:00:00 2001
From: zubiden <19638254+zubiden@users.noreply.github.com>
Date: Tue, 14 Apr 2026 14:36:15 +0200
Subject: [PATCH] Message: Fix appearance order (#6835)

---
 src/components/middle/message/ActionMessage.tsx        | 6 ++----
 src/components/middle/message/Message.tsx              | 6 ++----
 src/components/middle/message/SenderGroupContainer.tsx | 3 ++-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/middle/message/ActionMessage.tsx b/src/components/middle/message/ActionMessage.tsx
index 006a8de3d..8bd5f0870 100644
--- a/src/components/middle/message/ActionMessage.tsx
+++ b/src/components/middle/message/ActionMessage.tsx
@@ -309,10 +309,8 @@ const ActionMessage = ({
       return;
     }
 
-    const timeout = setTimeout(markShown, appearanceOrder * MESSAGE_APPEARANCE_DELAY);
-    return () => {
-      clearTimeout(timeout);
-    };
+    // Keep as is for now to avoid breaking appearance order
+    setTimeout(markShown, appearanceOrder * MESSAGE_APPEARANCE_DELAY);
   }, [appearanceOrder, noAppearanceAnimation]);
 
   const { ref: refWithTransition } = useShowTransition({
diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index ce42bab2e..e021e5570 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -530,10 +530,8 @@ const Message = ({
       return;
     }
 
-    const timeout = setTimeout(markShown, appearanceOrder * MESSAGE_APPEARANCE_DELAY);
-    return () => {
-      clearTimeout(timeout);
-    };
+    // Keep as is for now to avoid breaking appearance order
+    setTimeout(markShown, appearanceOrder * MESSAGE_APPEARANCE_DELAY);
   }, [appearanceOrder, noAppearanceAnimation]);
 
   useShowTransition({
diff --git a/src/components/middle/message/SenderGroupContainer.tsx b/src/components/middle/message/SenderGroupContainer.tsx
index 27d881149..89c82d733 100644
--- a/src/components/middle/message/SenderGroupContainer.tsx
+++ b/src/components/middle/message/SenderGroupContainer.tsx
@@ -92,8 +92,9 @@ const SenderGroupContainer: FC<OwnProps & StateProps> = ({
       return;
     }
 
+    // Keep as is for now to avoid breaking appearance order
     setTimeout(markShown, appearanceOrder * MESSAGE_APPEARANCE_DELAY);
-  }, [appearanceOrder, markShown, noAppearanceAnimation]);
+  }, [appearanceOrder, noAppearanceAnimation]);
 
   const shouldPreferOriginSender = forwardInfo
     && (isChatWithSelf || isRepliesChat || isAnonymousForwards || !messageSender);