From 21446b43af822ada23cd08ee525b455b9f47d3c8 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Wed, 20 May 2026 19:26:24 +0300
Subject: [PATCH] [Chat] `MessageItem` tweaks (#10562)

---
 src/components/dms/MessageItem.tsx | 67 ++++++++++++++----------------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/components/dms/MessageItem.tsx b/src/components/dms/MessageItem.tsx
index fbf755fc03..d5451348b5 100644
--- a/src/components/dms/MessageItem.tsx
+++ b/src/components/dms/MessageItem.tsx
@@ -8,8 +8,6 @@ import {
   type ViewStyle,
 } from 'react-native'
 import Animated, {
-  FadeIn,
-  FadeOut,
   LayoutAnimationConfig,
   LinearTransition,
   useAnimatedStyle,
@@ -380,20 +378,14 @@ let MessageItem = ({
   )
 
   const messageInset = platform<ViewStyle | undefined>({
-    ios: isFromSelf ? a.mr_md : isGroupChat ? a.ml_md : a.ml_sm,
-    android: isFromSelf ? a.mr_sm : isGroupChat ? a.ml_sm : undefined,
-    web: isFromSelf ? a.mr_lg : isGroupChat ? a.ml_lg : undefined,
+    android: a.mx_sm,
+    ios: a.mx_md,
+    web: a.mx_lg,
   })
 
   return (
     <>
-      <LayoutAnimationConfig skipExiting skipEntering>
-        {hasLargeGapFromPrev && (
-          <Animated.View entering={native(FadeIn)} exiting={native(FadeOut)}>
-            <DateDivider date={message.sentAt} />
-          </Animated.View>
-        )}
-      </LayoutAnimationConfig>
+      {hasLargeGapFromPrev && <DateDivider date={message.sentAt} />}
       <View style={[messageInset, isFirstInCluster && a.mt_md]}>
         <View style={[a.relative]}>
           {showAvatar ? (
@@ -402,8 +394,15 @@ let MessageItem = ({
                 a.absolute,
                 a.bottom_0,
                 a.z_50,
-                {
-                  transform: [{translateY: hasReactions ? -24 : 0}],
+                hasReactions && {
+                  transform: [
+                    {
+                      translateY: platform({
+                        ios: -29,
+                        default: -27,
+                      }),
+                    },
+                  ],
                 },
               ]}>
               {avatar}
@@ -445,27 +444,25 @@ let MessageItem = ({
                 <Animated.View
                   accessibilityHint={l`Double tap or long press the message to add a reaction`}
                   style={[
-                    !isFromSelf && a.ml_sm,
-                    ...(isOnlyEmoji(message.text)
-                      ? []
-                      : [
-                          a.rounded_xl,
-                          a.py_sm,
-                          a.px_md,
-                          {
-                            marginTop:
-                              hasEmbedAndText || !isFirstInCluster
-                                ? CLUSTERED_MESSAGE_GAP
-                                : 0,
-                            backgroundColor: isFromSelf
-                              ? isPending
-                                ? pendingColor
-                                : t.palette.primary_500
-                              : t.palette.contrast_50,
-                          },
-                          isFromSelf ? a.self_end : a.self_start,
-                          borderRadiusStyle,
-                        ]),
+                    !isFromSelf && isGroupChat && a.ml_sm,
+                    !isOnlyEmoji(message.text) && [
+                      a.rounded_xl,
+                      a.py_sm,
+                      a.px_md,
+                      {
+                        marginTop:
+                          hasEmbedAndText || !isFirstInCluster
+                            ? CLUSTERED_MESSAGE_GAP
+                            : 0,
+                        backgroundColor: isFromSelf
+                          ? isPending
+                            ? pendingColor
+                            : t.palette.primary_500
+                          : t.palette.contrast_50,
+                      },
+                      isFromSelf ? a.self_end : a.self_start,
+                      borderRadiusStyle,
+                    ],
                   ]}>
                   <RichText
                     value={rt}