diff --git a/lib/api/chat/chat_provider_model.dart b/lib/api/chat/chat_provider_model.dart
index be5b68c..c9767b4 100644
--- a/lib/api/chat/chat_provider_model.dart
+++ b/lib/api/chat/chat_provider_model.dart
@@ -44,6 +44,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
 
   Future<void> getUserAutoLoginToken() async {
     String userName = AppState().memberInformationList!.eMPLOYEEEMAILADDRESS!.split("@").first.toString();
+    //userName
     Response response =
         await ApiClient().postJsonForResponse("${ApiConsts.chatServerBaseApiUrl}user/desktopuserlogin", {"userName": userName, "password": "FxIu26rWIKoF8n6mpbOmAjDLphzFGmpG", "loginType": 2});
     login.UserAutoLoginModel userLoginResponse = login.userAutoLoginModelFromJson(response.body);
@@ -84,8 +85,9 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
         }
       }
     }
-    pChatHistory = recentChat.response;
-    pChatHistory!.sort((ChatUser a, ChatUser b) => a.userName!.toLowerCase().compareTo(b.userName!.toLowerCase()));
+    pChatHistory = recentChat.response == null ? [] : recentChat.response;
+    if (pChatHistory != null) pChatHistory!.sort((ChatUser a, ChatUser b) => a.userName!.toLowerCase().compareTo(b.userName!.toLowerCase()));
+
     searchedChats = pChatHistory;
     isLoading = false;
     notifyListeners();
@@ -164,7 +166,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
       await hubConnection.start();
       hubConnection.on("OnUpdateUserStatusAsync", changeStatus);
       hubConnection.on("OnDeliveredChatUserAsync", onMsgReceived);
-   //   hubConnection.on("OnSeenChatUserAsync", onChatSeen);
+      //   hubConnection.on("OnSeenChatUserAsync", onChatSeen);
 
       //hubConnection.on("OnUserTypingAsync", onUserTyping);
       // hubConnection.on("OnUserCountAsync", userCountAsync);
@@ -288,7 +290,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
     //   }
     // });
     notifyListeners();
-  //  if (isChatScreenActive) scrollToBottom();
+    //  if (isChatScreenActive) scrollToBottom();
   }
 
   void onUserTyping(List<Object?>? parameters) {
@@ -402,17 +404,16 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
             )
           : null,
     );
-    String chatData =
-        '{"contant":"${message.text}","contantNo":"${uuid.v4()}","chatEventId":$chatEventId,"fileTypeId": $fileTypeId,"currentUserId":${AppState().chatDetails!.response!.id},"chatSource":1,"userChatHistoryLineRequestList":[{"isSeen":false,"isDelivered":false,"targetUserId":$targetUserId,"targetUserStatus":1}],"chatReplyId":$chatReplyId,"conversationId":"${uuid.v4()}"}';
-    await hubConnection.invoke("AddChatUserAsync", args: <Object>[json.decode(chatData)]);
-
     userChatHistory.insert(0, data);
-
     isFileSelected = false;
     isMsgReply = false;
     sFileType = "";
     message.clear();
     notifyListeners();
+
+    String chatData =
+        '{"contant":"${message.text}","contantNo":"${uuid.v4()}","chatEventId":$chatEventId,"fileTypeId": $fileTypeId,"currentUserId":${AppState().chatDetails!.response!.id},"chatSource":1,"userChatHistoryLineRequestList":[{"isSeen":false,"isDelivered":false,"targetUserId":$targetUserId,"targetUserStatus":1}],"chatReplyId":$chatReplyId,"conversationId":"${uuid.v4()}"}';
+    await hubConnection.invoke("AddChatUserAsync", args: <Object>[json.decode(chatData)]);
   }
 
   void sendChatMessage(int targetUserId, String targetUserName) async {
diff --git a/lib/ui/chat/chat_home_screen.dart b/lib/ui/chat/chat_home_screen.dart
index 3ac291c..d146891 100644
--- a/lib/ui/chat/chat_home_screen.dart
+++ b/lib/ui/chat/chat_home_screen.dart
@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -7,7 +9,6 @@ import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/config/routes.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/widgets/bottom_sheet.dart';
 import 'package:mohem_flutter_app/widgets/bottom_sheets/search_employee_bottom_sheet.dart';
@@ -113,35 +114,41 @@ class _ChatHomeScreenState extends State<ChatHomeScreen> {
                                   mainAxisAlignment: MainAxisAlignment.end,
                                   mainAxisSize: MainAxisSize.max,
                                   children: <Widget>[
-                                    if (m.searchedChats![index].unreadMessageCount! > 0)
-                                      Flexible(
-                                        child: Container(
-                                          padding: EdgeInsets.zero,
-                                          alignment: Alignment.centerRight,
-                                          width: 18,
-                                          height: 18,
-                                          decoration: const BoxDecoration(
-                                            color: MyColors.redColor,
-                                            borderRadius: BorderRadius.all(
-                                              Radius.circular(20),
-                                            ),
-                                          ),
-                                          child: (m.searchedChats![index].unreadMessageCount!.toString())
-                                              .toText10(
-                                                color: MyColors.white,
-                                              )
-                                              .center,
-                                        ),
-                                      ),
+                                    // if (m.searchedChats![index].unreadMessageCount != null)
+                                    //   Flexible(
+                                    //     child: Container(
+                                    //       padding: EdgeInsets.zero,
+                                    //       alignment: Alignment.centerRight,
+                                    //       width: 18,
+                                    //       height: 18,
+                                    //       decoration: const BoxDecoration(
+                                    //         color: MyColors.redColor,
+                                    //         borderRadius: BorderRadius.all(
+                                    //           Radius.circular(20),
+                                    //         ),
+                                    //       ),
+                                    //       child: (m.searchedChats![index].unreadMessageCount!.toString())
+                                    //           .toText10(
+                                    //             color: MyColors.white,
+                                    //           )
+                                    //           .center,
+                                    //     ),
+                                    //   ),
                                     Flexible(
                                       child: IconButton(
                                         alignment: Alignment.centerRight,
                                         padding: EdgeInsets.zero,
-                                        icon: Icon(m.searchedChats![index].isFav! ? Icons.star_sharp : Icons.star_border),
-                                        color: m.searchedChats![index].isFav! ? MyColors.yellowColor : MyColors.grey35Color,
+                                        icon: Icon(m.searchedChats![index].isFav != null && m.searchedChats![index].isFav == false ? Icons.star_sharp : Icons.star_sharp),
+                                        color: m.searchedChats![index].isFav != null && m.searchedChats![index].isFav == true ? MyColors.yellowColor : MyColors.grey35Color,
                                         onPressed: () {
-                                          if (m.searchedChats![index].isFav!) m.unFavoriteUser(userID: AppState().chatDetails!.response!.id!, targetUserID: m.searchedChats![index].id!);
-                                          if (!m.searchedChats![index].isFav!) m.favoriteUser(userID: AppState().chatDetails!.response!.id!, targetUserID: m.searchedChats![index].id!);
+
+                                          if (m.searchedChats![index].isFav == null || m.searchedChats![index].isFav == false) {
+                                            m.favoriteUser(userID: AppState().chatDetails!.response!.id!, targetUserID: m.searchedChats![index].id!);
+                                          }else if( m.searchedChats![index].isFav == true){
+                                            m.unFavoriteUser(userID: AppState().chatDetails!.response!.id!, targetUserID: m.searchedChats![index].id!);
+                                          } else{
+                                            m.favoriteUser(userID: AppState().chatDetails!.response!.id!, targetUserID: m.searchedChats![index].id!);
+                                          }
                                         },
                                       ),
                                     )