diff --git a/lib/provider/chat_provider_model.dart b/lib/provider/chat_provider_model.dart
index b6583de..5fb4cbf 100644
--- a/lib/provider/chat_provider_model.dart
+++ b/lib/provider/chat_provider_model.dart
@@ -325,8 +325,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
   }
 
   Future<void> onMsgReceived(List<Object?>? parameters) async {
-    List<SingleUserChatModel> data = [];
-    List<SingleUserChatModel> temp = [];
+    List<SingleUserChatModel> data = [], temp = [];
     for (dynamic msg in parameters!) {
       data = getSingleUserChatModel(jsonEncode(msg));
       temp = getSingleUserChatModel(jsonEncode(msg));
@@ -349,10 +348,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
     }
     dynamic contain = searchedChats!.where((ChatUser element) => element.id == data.first.currentUserId);
     if (contain.isEmpty) {
-      searchedChats!.add(
-        ChatUser(id: data.first.currentUserId, userName: data.first.currentUserName, unreadMessageCount: 0, isImageLoading: false, image: "", isImageLoaded: true),
-      );
-      notifyListeners();
+      searchedChats!.add(ChatUser(id: data.first.currentUserId, userName: data.first.currentUserName, unreadMessageCount: 0, isImageLoading: false, image: "", isImageLoaded: true, userStatus: 1));
     }
 
     setMsgTune();
@@ -365,16 +361,24 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
           user.unreadMessageCount = tempCount + 1;
         }
       }
+      sort();
     }
 
     List list = [
       {"userChatHistoryId": data.first.userChatHistoryId, "TargetUserId": temp.first.targetUserId, "isDelivered": true, "isSeen": isChatScreenActive ? true : false}
     ];
     updateUserChatHistoryOnMsg(list);
-
     notifyListeners();
   }
 
+  void sort() {
+    searchedChats!.sort(
+      (ChatUser a, ChatUser b) => b.unreadMessageCount!.compareTo(
+        a.unreadMessageCount!,
+      ),
+    );
+  }
+
   void onUserTyping(List<Object?>? parameters) {
     for (ChatUser user in searchedChats!) {
       if (user.id == parameters![1] && parameters[0] == true) {
@@ -468,9 +472,9 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
       Uint8List? image,
       required bool isImageLoaded}) async {
     Uuid uuid = const Uuid();
-    var contentNo = uuid.v4();
+    String contentNo = uuid.v4();
 
-    var msg = message.text;
+    String msg = message.text;
     SingleUserChatModel data = SingleUserChatModel(
       chatEventId: chatEventId,
       chatSource: 1,
diff --git a/lib/ui/chat/chat_bubble.dart b/lib/ui/chat/chat_bubble.dart
index ec772f6..ea43004 100644
--- a/lib/ui/chat/chat_bubble.dart
+++ b/lib/ui/chat/chat_bubble.dart
@@ -239,8 +239,7 @@ class ChatBubble extends StatelessWidget {
             return SizedBox(
               height: isReplyPreview ? 32 : 140,
               width: isReplyPreview ? 32 : 227,
-              child: const Center(child: CircularProgressIndicator()),
-            );
+            ).toShimmer();
           }
         },
       );
diff --git a/lib/ui/chat/chat_home_screen.dart b/lib/ui/chat/chat_home_screen.dart
index 36bfe3e..804332a 100644
--- a/lib/ui/chat/chat_home_screen.dart
+++ b/lib/ui/chat/chat_home_screen.dart
@@ -34,7 +34,6 @@ class _ChatHomeScreenState extends State<ChatHomeScreen> {
 
   final RefreshController _rc = RefreshController(initialRefresh: false);
 
-
   @override
   void initState() {
     super.initState();
diff --git a/lib/ui/chat/favorite_users_screen.dart b/lib/ui/chat/favorite_users_screen.dart
index 6034151..9378625 100644
--- a/lib/ui/chat/favorite_users_screen.dart
+++ b/lib/ui/chat/favorite_users_screen.dart
@@ -23,13 +23,16 @@ class ChatFavoriteUsersScreen extends StatelessWidget {
       body: Consumer<ChatProviderModel>(
         builder: (BuildContext context, ChatProviderModel m, Widget? child) {
           if (m.isLoading) {
-            return  ChatHomeShimmer(isDetailedScreen: false,);
+            return ChatHomeShimmer(
+              isDetailedScreen: false,
+            );
           } else {
             return m.favUsersList != null && m.favUsersList.isNotEmpty
                 ? ListView.separated(
                     itemCount: m.favUsersList!.length,
                     shrinkWrap: true,
-                    physics: const NeverScrollableScrollPhysics(),
+                    physics: const ClampingScrollPhysics(),
+                    padding: const EdgeInsets.only(bottom: 80.0),
                     itemBuilder: (BuildContext context, int index) {
                       return SizedBox(
                         height: 55,
diff --git a/lib/widgets/bottom_sheets/search_employee_bottom_sheet.dart b/lib/widgets/bottom_sheets/search_employee_bottom_sheet.dart
index 32b501c..475c4a5 100644
--- a/lib/widgets/bottom_sheets/search_employee_bottom_sheet.dart
+++ b/lib/widgets/bottom_sheets/search_employee_bottom_sheet.dart
@@ -15,6 +15,7 @@ import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
 import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
+import 'package:mohem_flutter_app/main.dart';
 import 'package:mohem_flutter_app/models/chat/get_search_user_chat_model.dart';
 import 'package:mohem_flutter_app/models/get_action_history_list_model.dart';
 import 'package:mohem_flutter_app/models/worklist/get_favorite_replacements_model.dart';
@@ -90,10 +91,9 @@ class _SearchEmployeeBottomSheetState extends State<SearchEmployeeBottomSheet> {
       Utils.showLoading(context);
       chatUsersList = await ChatApiClient().getChatMemberFromSearch(
         searchText,
-        int.parse(
-          AppState().chatDetails!.response!.id.toString(),
-        ),
+        int.parse(AppState().chatDetails!.response!.id.toString()),
       );
+      chatUsersList!.removeWhere((element) => element.id == AppState().chatDetails!.response!.id);
       Utils.hideLoading(context);
       setState(() {});
     } catch (e) {