From 0e92428327da1909e7ca815b7ce4731f72af0ec8 Mon Sep 17 00:00:00 2001 From: Ava Shilling <165050625+avashilling@users.noreply.github.com> Date: Tue, 20 Jan 2026 12:22:33 -0500 Subject: [PATCH 1/2] chore: only show shimmer on most recent message --- lib/pages/chat/events/message.dart | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index d3ac2306b..6344caa36 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -606,9 +606,10 @@ class Message extends StatelessWidget { // #Pangea child: ShimmerBackground( enabled: controller - .showMessageShimmer( - event, - ), + .showMessageShimmer( + event, + ) && + isButton, // Pangea# child: Container( decoration: From bf5b75a2560d4dd5c0fd5142604a16f81f9fba70 Mon Sep 17 00:00:00 2001 From: Ava Shilling <165050625+avashilling@users.noreply.github.com> Date: Tue, 20 Jan 2026 14:54:58 -0500 Subject: [PATCH 2/2] chore: check for button in showMessageShimmer --- lib/pages/chat/chat.dart | 1 + lib/pages/chat/events/message.dart | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index 18a21f926..045344fcf 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -2010,6 +2010,7 @@ class ChatController extends State bool showMessageShimmer(Event event) { if (event.type != EventTypes.Message) return false; + if (!(event.eventId == buttonEventID)) return false; if (event.messageType == MessageTypes.Text) { return !InstructionsEnum.clickTextMessages.isToggledOff; } diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index 6344caa36..d3ac2306b 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -606,10 +606,9 @@ class Message extends StatelessWidget { // #Pangea child: ShimmerBackground( enabled: controller - .showMessageShimmer( - event, - ) && - isButton, + .showMessageShimmer( + event, + ), // Pangea# child: Container( decoration: