From 5d959184de0ca1167a1c56c737d8a1813dc7dc27 Mon Sep 17 00:00:00 2001
From: mike doornenbal <mikedoornenbal9@icloud.com>
Date: Tue, 27 Aug 2024 16:03:59 +0200
Subject: [PATCH] fix: getting users

---
 .../lib/src/models/user_model.dart            |  6 +++---
 .../screens/creation/widgets/user_list.dart   | 21 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/chat_repository_interface/lib/src/models/user_model.dart b/packages/chat_repository_interface/lib/src/models/user_model.dart
index b8b664b..89ff7f2 100644
--- a/packages/chat_repository_interface/lib/src/models/user_model.dart
+++ b/packages/chat_repository_interface/lib/src/models/user_model.dart
@@ -16,9 +16,9 @@ class UserModel {
 
   factory UserModel.fromMap(String id, Map<String, dynamic> data) => UserModel(
         id: id,
-        firstName: data["firstName"],
-        lastName: data["lastName"],
-        imageUrl: data["imageUrl"],
+        firstName: data["first_name"],
+        lastName: data["last_name"],
+        imageUrl: data["image_url"],
       );
 
   /// The user id
diff --git a/packages/flutter_chat/lib/src/screens/creation/widgets/user_list.dart b/packages/flutter_chat/lib/src/screens/creation/widgets/user_list.dart
index 6afc14f..9391ca6 100644
--- a/packages/flutter_chat/lib/src/screens/creation/widgets/user_list.dart
+++ b/packages/flutter_chat/lib/src/screens/creation/widgets/user_list.dart
@@ -62,15 +62,17 @@ class _UserListState extends State<UserList> {
   Widget build(BuildContext context) {
     var theme = Theme.of(context);
     var translations = widget.options.translations;
-    filteredUsers = users
-        .where(
-          (user) =>
-              user.fullname?.toLowerCase().contains(
-                    widget.query.toLowerCase(),
-                  ) ??
-              false,
-        )
-        .toList();
+    filteredUsers = widget.query.isNotEmpty
+        ? users
+            .where(
+              (user) =>
+                  user.fullname?.toLowerCase().contains(
+                        widget.query.toLowerCase(),
+                      ) ??
+                  false,
+            )
+            .toList()
+        : users;
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 12),
       child: ListView.builder(
@@ -78,7 +80,6 @@ class _UserListState extends State<UserList> {
         itemBuilder: (context, index) {
           var user = filteredUsers[index];
           var isSelected = widget.selectedUsers.any((u) => u.id == user.id);
-
           return InkWell(
             onTap: () async {
               if (widget.creatingGroup) {