From 161a9d2f13c108d9ac5c3725ba8effa64d2563ed Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Sun, 17 May 2026 21:25:04 -0400
Subject: [PATCH] Displaying something now

Just Event IDs so far
---
 lib/controllers/room_chat_controller.dart          |  5 +++--
 lib/widgets/chat_page/event_text.dart              |  2 +-
 .../chat_page/lazy_loading/message_avatar.dart     | 14 ++++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart
index 5fada80..9f4796b 100644
--- a/lib/controllers/room_chat_controller.dart
+++ b/lib/controllers/room_chat_controller.dart
@@ -23,8 +23,6 @@ class RoomChatController extends AsyncNotifier<IList<Event>> {
   @override
   Future<IList<Event>> build() async {
     final client = ref.watch(ClientController.provider.notifier);
-    final room = ref.watch(RoomsController.provider)[roomId];
-    if (room == null) return const IList.empty();
 
     final state = await client.getRoomState(
       GetRoomStateRequest(roomId: roomId),
@@ -53,6 +51,9 @@ class RoomChatController extends AsyncNotifier<IList<Event>> {
           const ISet.empty(),
         );
 
+    final room = ref.watch(RoomsController.provider)[roomId];
+    if (room == null) return const IList.empty();
+
     // While there are under 20 messages, try up to load more messages until there's no more or we have 20 messages.
     if (room.hasMore && room.events.length < 20) {
       loadOlder();
diff --git a/lib/widgets/chat_page/event_text.dart b/lib/widgets/chat_page/event_text.dart
index ca24584..bc9e984 100644
--- a/lib/widgets/chat_page/event_text.dart
+++ b/lib/widgets/chat_page/event_text.dart
@@ -19,6 +19,6 @@ class EventText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    throw UnimplementedError(); // NEXT TODO
+    return Text(event.eventId); // NEXT TODO
   }
 }
diff --git a/lib/widgets/chat_page/lazy_loading/message_avatar.dart b/lib/widgets/chat_page/lazy_loading/message_avatar.dart
index 7615be0..da6ecec 100644
--- a/lib/widgets/chat_page/lazy_loading/message_avatar.dart
+++ b/lib/widgets/chat_page/lazy_loading/message_avatar.dart
@@ -18,13 +18,11 @@ class MessageAvatar extends ConsumerWidget {
       .betterWhen(
         data: (membership) => InkWell(
           onTapUp: (details) {
-            if (event.content is MembershipContent) {
-              context.showUserPopover(
-                event.content as MembershipContent,
-                event.stateKey!,
-                globalPosition: details.globalPosition,
-              );
-            }
+            context.showUserPopover(
+              membership,
+              event.sender,
+              globalPosition: details.globalPosition,
+            );
           },
           child: AvatarOrHash(
             membership.avatarUrl,
@@ -33,6 +31,6 @@ class MessageAvatar extends ConsumerWidget {
           ),
         ),
         loading: () =>
-            AvatarOrHash(null, event.stateKey!.substring(1), height: height),
+            AvatarOrHash(null, event.sender.substring(1), height: height),
       );
 }