From e5e7f40220b6fc8e5759a268354dffb35bd993ac Mon Sep 17 00:00:00 2001
From: ggurdin <46800240+ggurdin@users.noreply.github.com>
Date: Mon, 19 May 2025 12:57:20 -0400
Subject: [PATCH] chore: some fixes for activity message overlay not matching
 underlying message (#2834)

---
 lib/pangea/activity_planner/activity_plan_message.dart | 7 -------
 lib/pangea/toolbar/widgets/overlay_message.dart        | 8 +++++---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/pangea/activity_planner/activity_plan_message.dart b/lib/pangea/activity_planner/activity_plan_message.dart
index d4331c4eb..ae8b31471 100644
--- a/lib/pangea/activity_planner/activity_plan_message.dart
+++ b/lib/pangea/activity_planner/activity_plan_message.dart
@@ -130,13 +130,6 @@ class ActivityPlanMessage extends StatelessWidget {
                                         AppConfig.borderRadius,
                                       ),
                                     ),
-                                    padding:
-                                        event.messageType == MessageTypes.Image
-                                            ? EdgeInsets.zero
-                                            : const EdgeInsets.symmetric(
-                                                horizontal: 16,
-                                                vertical: 8,
-                                              ),
                                     constraints: const BoxConstraints(
                                       maxWidth: FluffyThemes.columnWidth * 1.5,
                                     ),
diff --git a/lib/pangea/toolbar/widgets/overlay_message.dart b/lib/pangea/toolbar/widgets/overlay_message.dart
index f492ccb73..21bf0cc07 100644
--- a/lib/pangea/toolbar/widgets/overlay_message.dart
+++ b/lib/pangea/toolbar/widgets/overlay_message.dart
@@ -80,9 +80,11 @@ class OverlayMessage extends StatelessWidget {
         previousEvent!.senderId == event.senderId &&
         previousEvent!.originServerTs.sameEnvironment(event.originServerTs);
 
-    final textColor = ownMessage
-        ? ThemeData.dark().colorScheme.onPrimary
-        : theme.colorScheme.onSurface;
+    final textColor = event.isActivityMessage
+        ? ThemeData.light().colorScheme.onPrimary
+        : ownMessage
+            ? ThemeData.dark().colorScheme.onPrimary
+            : theme.colorScheme.onSurface;
 
     final linkColor = theme.brightness == Brightness.light
         ? theme.colorScheme.primary