From aa6b0f692c6b175939f7b8565fd0d8eba09551c6 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Sun, 14 Dec 2025 16:30:19 -0500
Subject: [PATCH] minor changes

---
 lib/helpers/extensions/room_to_children.dart |  5 +++--
 lib/pages/login_page.dart                    | 10 ++++------
 lib/widgets/chat_page/top_widget.dart        | 19 +++++--------------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/lib/helpers/extensions/room_to_children.dart b/lib/helpers/extensions/room_to_children.dart
index 039a064..afdc99e 100644
--- a/lib/helpers/extensions/room_to_children.dart
+++ b/lib/helpers/extensions/room_to_children.dart
@@ -1,10 +1,11 @@
 import "package:collection/collection.dart";
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:matrix/matrix.dart";
 import "package:nexus/helpers/extensions/get_full_room.dart";
 import "package:nexus/models/full_room.dart";
 
 extension RoomToChildren on Room {
-  Future<List<FullRoom>> getAllChildren(Client client) async {
+  Future<IList<FullRoom>> getAllChildren(Client client) async {
     final direct = await Future.wait(
       spaceChildren
           .map(
@@ -21,6 +22,6 @@ extension RoomToChildren on Room {
             ? await child.roomData.getAllChildren(client)
             : [child],
       ),
-    )).expand((list) => list).toList();
+    )).expand((list) => list).toIList();
   }
 }
diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart
index 9716989..4631325 100644
--- a/lib/pages/login_page.dart
+++ b/lib/pages/login_page.dart
@@ -19,6 +19,8 @@ class LoginPage extends HookConsumerWidget {
     final isLoading = useState(false);
     final allowLogin = useState(false);
 
+    final launch = ref.watch(LaunchHelper.provider).launchUrl;
+
     Future<void> setHomeserver(Uri? homeserver) async {
       isLoading.value = true;
       final succeeded = homeserver == null
@@ -142,9 +144,7 @@ class LoginPage extends HookConsumerWidget {
                         ? null
                         : () => setHomeserver(homeserver.url),
                     trailing: IconButton(
-                      onPressed: () => ref
-                          .watch(LaunchHelper.provider)
-                          .launchUrl(homeserver.url),
+                      onPressed: () => launch(homeserver.url),
                       icon: Icon(Icons.info_outline),
                     ),
                   ),
@@ -152,9 +152,7 @@ class LoginPage extends HookConsumerWidget {
               )),
               SizedBox(height: 8),
               TextButton(
-                onPressed: () => ref
-                    .watch(LaunchHelper.provider)
-                    .launchUrl(Uri.https("servers.joinmatrix.org")),
+                onPressed: () => launch(Uri.https("servers.joinmatrix.org")),
                 child: Text("See more homeservers..."),
               ),
               if (isLoading.value)
diff --git a/lib/widgets/chat_page/top_widget.dart b/lib/widgets/chat_page/top_widget.dart
index e208c1e..95f613c 100644
--- a/lib/widgets/chat_page/top_widget.dart
+++ b/lib/widgets/chat_page/top_widget.dart
@@ -3,10 +3,8 @@ import "package:flutter/material.dart";
 import "package:flutter_chat_core/flutter_chat_core.dart";
 import "package:flutter_chat_ui/flutter_chat_ui.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/avatar_controller.dart";
 import "package:nexus/controllers/message_controller.dart";
 import "package:nexus/helpers/extensions/better_when.dart";
-import "package:nexus/widgets/avatar_or_hash.dart";
 import "package:nexus/widgets/chat_page/quoted.dart";
 
 class TopWidget extends ConsumerWidget {
@@ -64,18 +62,11 @@ class TopWidget extends ConsumerWidget {
                       mainAxisSize: MainAxisSize.min,
                       spacing: 8,
                       children: [
-                        ref
-                            .watch(
-                              AvatarController.provider(replyMessage.authorId),
-                            )
-                            .betterWhen(
-                              data: (avatar) => AvatarOrHash(
-                                avatar,
-                                replyMessage.metadata?["displayName"] ??
-                                    replyMessage.authorId,
-                                headers: headers,
-                              ),
-                            ),
+                        Avatar(
+                          userId: replyMessage.authorId,
+                          headers: headers,
+                          size: 16,
+                        ),
                         Flexible(
                           child: Text(
                             replyMessage.metadata?["displayName"] ??