From d9dcb0a562cf6def85fdf9b4c54cceed54cdf781 Mon Sep 17 00:00:00 2001
From: Gabby Gurdin <ggurdin@gmail.com>
Date: Wed, 28 Feb 2024 11:28:34 -0500
Subject: [PATCH] small fixes

---
 lib/pages/chat/events/message.dart           |  6 ++++--
 lib/pangea/widgets/chat/message_toolbar.dart |  4 ++--
 lib/pangea/widgets/igc/word_data_card.dart   | 11 +++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index 20574ac2d..c4b8b9c46 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -143,8 +143,10 @@ class Message extends StatelessWidget {
     // #Pangea
     final PangeaMessageEvent? pangeaMessageEvent =
         controller.getPangeaMessageEvent(event.eventId);
-    final ToolbarDisplayController? toolbarController =
-        controller.getToolbarDisplayController(event.eventId);
+    ToolbarDisplayController? toolbarController;
+    if (event.messageType == MessageTypes.Text) {
+      toolbarController = controller.getToolbarDisplayController(event.eventId);
+    }
     // Pangea#
 
     final resetAnimateIn = this.resetAnimateIn;
diff --git a/lib/pangea/widgets/chat/message_toolbar.dart b/lib/pangea/widgets/chat/message_toolbar.dart
index 92f217f88..9d22c9b33 100644
--- a/lib/pangea/widgets/chat/message_toolbar.dart
+++ b/lib/pangea/widgets/chat/message_toolbar.dart
@@ -24,6 +24,7 @@ class ToolbarDisplayController {
   final String targetId;
   final bool immersionMode;
   final ChatController controller;
+  final FocusNode focusNode = FocusNode();
 
   MessageToolbar? toolbar;
   String? overlayId;
@@ -54,8 +55,7 @@ class ToolbarDisplayController {
     if (controller.selectMode) {
       controller.clearSelectedEvents();
     }
-    // focusNode.unfocus();
-    FocusScope.of(context).unfocus();
+    focusNode.requestFocus();
 
     final LayerLinkAndKey layerLinkAndKey =
         MatrixState.pAnyState.layerLinkAndKey(targetId);
diff --git a/lib/pangea/widgets/igc/word_data_card.dart b/lib/pangea/widgets/igc/word_data_card.dart
index 4b567be03..2e77ef880 100644
--- a/lib/pangea/widgets/igc/word_data_card.dart
+++ b/lib/pangea/widgets/igc/word_data_card.dart
@@ -121,7 +121,12 @@ class WordDataCardController extends State<WordDataCard> {
   }
 
   Future<void> getWordNet() async {
-    if (mounted) setState(() => isLoadingWordNet = true);
+    if (mounted) {
+      setState(() {
+        wordData = null;
+        isLoadingWordNet = true;
+      });
+    }
     try {
       wordData = await controller.wordNet.getWordDataGlobal(
         word: widget.word,
@@ -137,9 +142,7 @@ class WordDataCardController extends State<WordDataCard> {
       );
       wordNetError = err;
     } finally {
-      if (mounted) {
-        setState(() => isLoadingWordNet = false);
-      }
+      if (mounted) setState(() => isLoadingWordNet = false);
     }
   }