From a181ace577b195d7736bb90ac571f7f3236fee46 Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Tue, 27 Aug 2024 14:09:06 -0400
Subject: [PATCH] select message on showToolbar and ensure message is
 deselected on dismiss

---
 lib/pages/chat/chat.dart                    | 3 +++
 lib/pages/chat/events/message.dart          | 2 +-
 lib/pangea/widgets/chat/overlay_header.dart | 6 +-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index d16957134..bd449ade5 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -1579,6 +1579,9 @@ class ChatController extends State<ChatPageWithRoom>
     PangeaMessageEvent pangeaMessageEvent, {
     MessageMode? mode,
   }) {
+    // select the message
+    onSelectMessage(pangeaMessageEvent.event);
+
     // Close keyboard, if open
     if (inputFocus.hasFocus && PlatformInfos.isMobile) {
       inputFocus.unfocus();
diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index cedd9d3c8..a4c7aa283 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -215,7 +215,7 @@ class Message extends StatelessWidget {
                         right: 0,
                         child: InkWell(
                           // #Pangea
-                          onTap: () => MatrixState.pAnyState.closeOverlay(),
+                          onTap: controller.clearSelectedEvents,
                           // onTap: () => onSelect(event),
                           // onLongPress: () => onSelect(event),
                           // Pangea#
diff --git a/lib/pangea/widgets/chat/overlay_header.dart b/lib/pangea/widgets/chat/overlay_header.dart
index c8f5b2a62..cce47adcc 100644
--- a/lib/pangea/widgets/chat/overlay_header.dart
+++ b/lib/pangea/widgets/chat/overlay_header.dart
@@ -1,6 +1,5 @@
 import 'package:fluffychat/pages/chat/chat.dart';
 import 'package:fluffychat/pages/chat/chat_app_bar_title.dart';
-import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
@@ -24,10 +23,7 @@ class OverlayHeader extends StatelessWidget {
           ),
           leading: IconButton(
             icon: const Icon(Icons.close),
-            onPressed: () {
-              controller.clearSelectedEvents();
-              MatrixState.pAnyState.closeAllOverlays();
-            },
+            onPressed: controller.clearSelectedEvents,
             tooltip: L10n.of(context)!.close,
             color: Theme.of(context).colorScheme.primary,
           ),