From 524cbc514d6e32405e14fd615e7e0b9c85d1fa3e Mon Sep 17 00:00:00 2001
From: DS Boyce <260543580+ds-boyce@users.noreply.github.com>
Date: Thu, 16 Apr 2026 13:06:09 -0700
Subject: [PATCH] Don't toggle the date divider when tapping a reaction
 (#10274)

---
 src/components/dms/MessageItem.tsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/dms/MessageItem.tsx b/src/components/dms/MessageItem.tsx
index d8ffa2debf..b1c288de78 100644
--- a/src/components/dms/MessageItem.tsx
+++ b/src/components/dms/MessageItem.tsx
@@ -1,4 +1,4 @@
-import {memo, useCallback, useEffect, useMemo} from 'react'
+import {memo, useCallback, useEffect, useMemo, useRef} from 'react'
 import {
   type GestureResponderEvent,
   LayoutAnimation,
@@ -106,6 +106,7 @@ let MessageItem = ({
   const queryClient = useQueryClient()
 
   const reactionsControl = useDialogControl()
+  const reactionTapRef = useRef(false)
 
   const {message, nextMessage, prevMessage} = item
   const isPending = item.type === 'pending-message'
@@ -328,6 +329,16 @@ let MessageItem = ({
                 transform: [{translateY: -8}],
               },
             ]}
+            onPressIn={() => {
+              // Don't toggle the date divider when tapping a reaction.
+              reactionTapRef.current = true
+            }}
+            onPressOut={() => {
+              // Include a delay here to account for tap-and-drag before release.
+              setTimeout(() => {
+                reactionTapRef.current = false
+              }, 100)
+            }}
             onPress={() => (isGroupChat ? reactionsControl.open() : undefined)}>
             {groupedReactions.map(group => (
               <Animated.View
@@ -427,6 +438,7 @@ let MessageItem = ({
               isFromSelf={isFromSelf}
               message={message}
               onTap={() => {
+                if (reactionTapRef.current) return
                 if (!hasLargeGapFromPrev) {
                   LayoutAnimation.configureNext(
                     LayoutAnimation.Presets.easeInEaseOut,