From 5b9f4765f1e57682534cc2335111335f8f6d923b Mon Sep 17 00:00:00 2001
From: Xare123 <57245242+Xare123@users.noreply.github.com>
Date: Sat, 15 Aug 2026 17:31:59 -0700
Subject: [PATCH] Avoid stale reply gesture context

---
 .../widgets/message/message_holder.dart                | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/app/layouts/conversation_view/widgets/message/message_holder.dart b/lib/app/layouts/conversation_view/widgets/message/message_holder.dart
index 1710febcea..067f4fff40 100644
--- a/lib/app/layouts/conversation_view/widgets/message/message_holder.dart
+++ b/lib/app/layouts/conversation_view/widgets/message/message_holder.dart
@@ -174,6 +174,10 @@ class _MessageHolderState extends CustomState<MessageHolder, void, MessageWidget
   @override
   Widget build(BuildContext context) {
     controller.built = true;
+    // Gesture callbacks can run while their element is being deactivated.
+    // Cache this inherited-state lookup during build instead of consulting a
+    // stale BuildContext from drag update/end/cancel callbacks.
+    final isInReplyScope = ReplyScope.maybeOf(context) != null;
     final stickers = message.associatedMessages.where((e) => e.associatedMessageType == "sticker");
     final reactions = message.associatedMessages.where((e) => ReactionTypes.toList().contains(e.associatedMessageType?.replaceAll("-", "")));
     Iterable<Message> stickersForPart(int part) {
@@ -440,7 +444,7 @@ class _MessageHolderState extends CustomState<MessageHolder, void, MessageWidget
                                                           child: GestureDetector(
                                                             behavior: HitTestBehavior.deferToChild,
                                                             onHorizontalDragUpdate: !canSwipeToReply || isEditing(e.part) ? null : (details) {
-                                                              if (ReplyScope.maybeOf(context) != null) return;
+                                                              if (isInReplyScope) return;
                                                               final offset = replyOffsets[index];
                                                               offset.value += details.delta.dx * 0.5;
                                                               if (message.isFromMe!) {
@@ -456,7 +460,7 @@ class _MessageHolderState extends CustomState<MessageHolder, void, MessageWidget
                                                               }
                                                             },
                                                             onHorizontalDragEnd: !canSwipeToReply || isEditing(e.part) ? null : (details) {
-                                                              if (ReplyScope.maybeOf(context) != null) return;
+                                                              if (isInReplyScope) return;
                                                               final offset = replyOffsets[index];
                                                               if (offset.value.abs() >= SlideToReply.replyThreshold) {
                                                                 widget.cvController.replyToMessage = Tuple2(message, index);
@@ -464,7 +468,7 @@ class _MessageHolderState extends CustomState<MessageHolder, void, MessageWidget
                                                               offset.value = 0;
                                                             },
                                                             onHorizontalDragCancel: !canSwipeToReply || isEditing(e.part) ? null : () {
-                                                              if (ReplyScope.maybeOf(context) != null) return;
+                                                              if (isInReplyScope) return;
                                                               replyOffsets[index].value = 0;
                                                             },
                                                             child: Builder(builder: (context) {