From 2ec442b35b5638890d4882c49f07aaf0fbaaa7be Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Tue, 26 May 2026 20:56:32 -0400
Subject: [PATCH] fix conditional rendering of popover actions

---
 lib/helpers/extensions/show_user_popover.dart     | 3 ++-
 lib/widgets/html/mention_chip.dart                | 1 +
 lib/widgets/lazy_loading/message_avatar.dart      | 1 +
 lib/widgets/lazy_loading/message_displayname.dart | 1 +
 lib/widgets/member_list.dart                      | 1 +
 lib/widgets/renderers/membership.dart             | 1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/helpers/extensions/show_user_popover.dart b/lib/helpers/extensions/show_user_popover.dart
index 1826037..1a5e7cb 100644
--- a/lib/helpers/extensions/show_user_popover.dart
+++ b/lib/helpers/extensions/show_user_popover.dart
@@ -7,6 +7,7 @@ extension ShowUserPopover on BuildContext {
   void showUserPopover(
     MembershipContent member,
     String userId, {
+    String? roomId,
     required Offset globalPosition,
   }) => showContextMenu(
     globalPosition: globalPosition,
@@ -16,7 +17,7 @@ extension ShowUserPopover on BuildContext {
         padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
         child: IconTheme(
           data: IconThemeData(),
-          child: UserPopover(member, userId),
+          child: UserPopover(member, userId, roomId: roomId),
         ),
       ),
     ],
diff --git a/lib/widgets/html/mention_chip.dart b/lib/widgets/html/mention_chip.dart
index 4791ed8..28caa65 100644
--- a/lib/widgets/html/mention_chip.dart
+++ b/lib/widgets/html/mention_chip.dart
@@ -31,6 +31,7 @@ class MentionChip extends ConsumerWidget {
                 context.showUserPopover(
                   membership,
                   mention,
+                  roomId: roomId,
                   globalPosition: details.globalPosition,
                 );
               }
diff --git a/lib/widgets/lazy_loading/message_avatar.dart b/lib/widgets/lazy_loading/message_avatar.dart
index b4c8d7c..e7c7a77 100644
--- a/lib/widgets/lazy_loading/message_avatar.dart
+++ b/lib/widgets/lazy_loading/message_avatar.dart
@@ -18,6 +18,7 @@ class MessageAvatar extends ConsumerWidget {
           onTapUp: (details) => context.showUserPopover(
             value,
             event.sender,
+            roomId: event.roomId,
             globalPosition: details.globalPosition,
           ),
           child: AvatarOrHash(
diff --git a/lib/widgets/lazy_loading/message_displayname.dart b/lib/widgets/lazy_loading/message_displayname.dart
index 6f8cfaa..ff1eb93 100644
--- a/lib/widgets/lazy_loading/message_displayname.dart
+++ b/lib/widgets/lazy_loading/message_displayname.dart
@@ -25,6 +25,7 @@ class MessageDisplayname extends ConsumerWidget {
               ? (details) => context.showUserPopover(
                   value,
                   event.sender,
+                  roomId: event.roomId,
                   globalPosition: details.globalPosition,
                 )
               : null,
diff --git a/lib/widgets/member_list.dart b/lib/widgets/member_list.dart
index e5d41d7..7bce48d 100644
--- a/lib/widgets/member_list.dart
+++ b/lib/widgets/member_list.dart
@@ -83,6 +83,7 @@ class MemberList extends HookConsumerWidget {
                             onTapUp: (details) => context.showUserPopover(
                               member.content as MembershipContent,
                               member.stateKey!,
+                              roomId: roomId,
                               globalPosition: details.globalPosition,
                             ),
                             child: ListTile(
diff --git a/lib/widgets/renderers/membership.dart b/lib/widgets/renderers/membership.dart
index 9012ba2..c109aed 100644
--- a/lib/widgets/renderers/membership.dart
+++ b/lib/widgets/renderers/membership.dart
@@ -25,6 +25,7 @@ class MembershipRenderer extends StatelessWidget {
           onTapUp: (details) => context.showUserPopover(
             content,
             event.stateKey!,
+            roomId: event.roomId,
             globalPosition: details.globalPosition,
           ),
           child: Text(