From f0b3946d5298f49f4c0bf41f28938f1bbb1e2b40 Mon Sep 17 00:00:00 2001
From: Kelrap <99418823+Kelrap@users.noreply.github.com>
Date: Wed, 6 Aug 2025 16:00:15 -0400
Subject: [PATCH] Move ActivityPinnedMessage to AppBar (#3643)

---
 lib/pages/chat/chat_view.dart | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index f1914204a..7e5d89038 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -202,6 +202,11 @@ class ChatView extends StatelessWidget {
             if (scrollUpBannerEventId != null) {
               appbarBottomHeight += ChatAppBarListTile.fixedHeight;
             }
+            // #Pangea
+            if (controller.room.isActiveInActivity) {
+              appbarBottomHeight += ChatAppBarListTile.fixedHeight;
+            }
+            // Pangea#
             return Scaffold(
               appBar: AppBar(
                 // #Pangea
@@ -276,6 +281,9 @@ class ChatView extends StatelessWidget {
                             child: Text(L10n.of(context).jump),
                           ),
                         ),
+                      // #Pangea
+                      ActivityPinnedMessage(controller),
+                      // Pangea#
                     ],
                   ),
                 ),
@@ -466,7 +474,6 @@ class ChatView extends StatelessWidget {
                               ],
                             ),
                           ),
-                        ActivityPinnedMessage(controller),
                         // Pangea#
                       ],
                     ),