diff --git a/lib/api/api_client.dart b/lib/api/api_client.dart
index 7a6f668..1e66d45 100644
--- a/lib/api/api_client.dart
+++ b/lib/api/api_client.dart
@@ -18,8 +18,7 @@ class APIError {
 
   APIError(this.errorCode, this.errorMessage);
 
-  Map<String, dynamic> toJson() =>
-      {'errorCode': errorCode, 'errorMessage': errorMessage};
+  Map<String, dynamic> toJson() => {'errorCode': errorCode, 'errorMessage': errorMessage};
 
   @override
   String toString() {
@@ -54,8 +53,7 @@ APIException _throwAPIException(Response response) {
       return APIException(APIException.INTERNAL_SERVER_ERROR);
     case 444:
       var downloadUrl = response.headers["location"];
-      return APIException(APIException.UPGRADE_REQUIRED,
-          arguments: downloadUrl);
+      return APIException(APIException.UPGRADE_REQUIRED, arguments: downloadUrl);
     default:
       return APIException(APIException.OTHER);
   }
@@ -68,13 +66,8 @@ class ApiClient {
 
   factory ApiClient() => _instance;
 
-  Future<U> postJsonForObject<T, U>(
-      FactoryConstructor<U> factoryConstructor, String url, T jsonObject,
-      {String? token,
-      Map<String, dynamic>? queryParameters,
-      Map<String, String>? headers,
-      int retryTimes = 0,
-      bool isFormData = false}) async {
+  Future<U> postJsonForObject<T, U>(FactoryConstructor<U> factoryConstructor, String url, T jsonObject,
+      {String? token, Map<String, dynamic>? queryParameters, Map<String, String>? headers, int retryTimes = 0, bool isFormData = false}) async {
     var _headers = {'Accept': 'application/json'};
     if (headers != null && headers.isNotEmpty) {
       _headers.addAll(headers);
@@ -84,12 +77,7 @@ class ApiClient {
       var bodyJson = json.encode(jsonObject);
       print("body:$bodyJson");
     }
-    var response = await postJsonForResponse(url, jsonObject,
-        token: token,
-        queryParameters: queryParameters,
-        headers: _headers,
-        retryTimes: retryTimes,
-        isFormData: isFormData);
+    var response = await postJsonForResponse(url, jsonObject, token: token, queryParameters: queryParameters, headers: _headers, retryTimes: retryTimes, isFormData: isFormData);
     // try {
     if (!kReleaseMode) {
       logger.i("res: " + response.body);
@@ -102,8 +90,7 @@ class ApiClient {
       return factoryConstructor(jsonData);
     } else {
       APIError? apiError;
-      apiError =
-          APIError(jsonData['ErrorCode'], jsonData['ErrorEndUserMessage']);
+      apiError = APIError(jsonData['ErrorCode'], jsonData['ErrorEndUserMessage']);
       throw APIException(APIException.BAD_REQUEST, error: apiError);
     }
     // } catch (ex) {
@@ -116,11 +103,7 @@ class ApiClient {
   }
 
   Future<Response> postJsonForResponse<T>(String url, T jsonObject,
-      {String? token,
-      Map<String, dynamic>? queryParameters,
-      Map<String, String>? headers,
-      int retryTimes = 0,
-      bool isFormData = false}) async {
+      {String? token, Map<String, dynamic>? queryParameters, Map<String, String>? headers, int retryTimes = 0, bool isFormData = false}) async {
     String? requestBody;
     late Map<String, String> stringObj;
     if (jsonObject != null) {
@@ -134,22 +117,13 @@ class ApiClient {
 
     if (isFormData) {
       headers = {'Content-Type': 'application/x-www-form-urlencoded'};
-      stringObj = ((jsonObject ?? {}) as Map<String, dynamic>)
-          .map((key, value) => MapEntry(key, value?.toString() ?? ""));
+      stringObj = ((jsonObject ?? {}) as Map<String, dynamic>).map((key, value) => MapEntry(key, value?.toString() ?? ""));
     }
 
-    return await _postForResponse(url, isFormData ? stringObj : requestBody,
-        token: token,
-        queryParameters: queryParameters,
-        headers: headers,
-        retryTimes: retryTimes);
+    return await _postForResponse(url, isFormData ? stringObj : requestBody, token: token, queryParameters: queryParameters, headers: headers, retryTimes: retryTimes);
   }
 
-  Future<Response> _postForResponse(String url, requestBody,
-      {String? token,
-      Map<String, dynamic>? queryParameters,
-      Map<String, String>? headers,
-      int retryTimes = 0}) async {
+  Future<Response> _postForResponse(String url, requestBody, {String? token, Map<String, dynamic>? queryParameters, Map<String, String>? headers, int retryTimes = 0}) async {
     try {
       var _headers = <String, String>{};
       if (token != null) {
@@ -164,9 +138,7 @@ class ApiClient {
         var queryString = new Uri(queryParameters: queryParameters).query;
         url = url + '?' + queryString;
       }
-      var response =
-          await _post(Uri.parse(url), body: requestBody, headers: _headers)
-              .timeout(Duration(seconds: 120));
+      var response = await _post(Uri.parse(url), body: requestBody, headers: _headers).timeout(Duration(seconds: 120));
 
       if (response.statusCode >= 200 && response.statusCode < 300) {
         return response;
@@ -177,11 +149,7 @@ class ApiClient {
       if (retryTimes > 0) {
         print('will retry after 3 seconds...');
         await Future.delayed(Duration(seconds: 3));
-        return await _postForResponse(url, requestBody,
-            token: token,
-            queryParameters: queryParameters,
-            headers: headers,
-            retryTimes: retryTimes - 1);
+        return await _postForResponse(url, requestBody, token: token, queryParameters: queryParameters, headers: headers, retryTimes: retryTimes - 1);
       } else {
         throw APIException(APIException.OTHER, arguments: e);
       }
@@ -189,11 +157,7 @@ class ApiClient {
       if (retryTimes > 0) {
         print('will retry after 3 seconds...');
         await Future.delayed(Duration(seconds: 3));
-        return await _postForResponse(url, requestBody,
-            token: token,
-            queryParameters: queryParameters,
-            headers: headers,
-            retryTimes: retryTimes - 1);
+        return await _postForResponse(url, requestBody, token: token, queryParameters: queryParameters, headers: headers, retryTimes: retryTimes - 1);
       } else {
         throw APIException(APIException.OTHER, arguments: e);
       }
@@ -203,39 +167,23 @@ class ApiClient {
       if (retryTimes > 0) {
         print('will retry after 3 seconds...');
         await Future.delayed(Duration(seconds: 3));
-        return await _postForResponse(url, requestBody,
-            token: token,
-            queryParameters: queryParameters,
-            headers: headers,
-            retryTimes: retryTimes - 1);
+        return await _postForResponse(url, requestBody, token: token, queryParameters: queryParameters, headers: headers, retryTimes: retryTimes - 1);
       } else {
         throw APIException(APIException.OTHER, arguments: e);
       }
     }
   }
 
-  Future<Response> getJsonForResponse<T>(String url,
-      {String? token,
-      Map<String, dynamic>? queryParameters,
-      Map<String, String>? headers,
-      int retryTimes = 0}) async {
+  Future<Response> getJsonForResponse<T>(String url, {String? token, Map<String, dynamic>? queryParameters, Map<String, String>? headers, int retryTimes = 0}) async {
     if (headers == null) {
       headers = {'Content-Type': 'application/json'};
     } else {
       headers['Content-Type'] = 'application/json';
     }
-    return await _getForResponse(url,
-        token: token,
-        queryParameters: queryParameters,
-        headers: headers,
-        retryTimes: retryTimes);
+    return await _getForResponse(url, token: token, queryParameters: queryParameters, headers: headers, retryTimes: retryTimes);
   }
 
-  Future<Response> _getForResponse(String url,
-      {String? token,
-      Map<String, dynamic>? queryParameters,
-      Map<String, String>? headers,
-      int retryTimes = 0}) async {
+  Future<Response> _getForResponse(String url, {String? token, Map<String, dynamic>? queryParameters, Map<String, String>? headers, int retryTimes = 0}) async {
     try {
       var _headers = <String, String>{};
       if (token != null) {
@@ -250,8 +198,7 @@ class ApiClient {
         var queryString = new Uri(queryParameters: queryParameters).query;
         url = url + '?' + queryString;
       }
-      var response = await _get(Uri.parse(url), headers: _headers)
-          .timeout(Duration(seconds: 60));
+      var response = await _get(Uri.parse(url), headers: _headers).timeout(Duration(seconds: 60));
 
       if (response.statusCode >= 200 && response.statusCode < 300) {
         return response;
@@ -262,11 +209,7 @@ class ApiClient {
       if (retryTimes > 0) {
         print('will retry after 3 seconds...');
         await Future.delayed(Duration(seconds: 3));
-        return await _getForResponse(url,
-            token: token,
-            queryParameters: queryParameters,
-            headers: headers,
-            retryTimes: retryTimes - 1);
+        return await _getForResponse(url, token: token, queryParameters: queryParameters, headers: headers, retryTimes: retryTimes - 1);
       } else {
         throw APIException(APIException.OTHER, arguments: e);
       }
@@ -274,11 +217,7 @@ class ApiClient {
       if (retryTimes > 0) {
         print('will retry after 3 seconds...');
         await Future.delayed(Duration(seconds: 3));
-        return await _getForResponse(url,
-            token: token,
-            queryParameters: queryParameters,
-            headers: headers,
-            retryTimes: retryTimes - 1);
+        return await _getForResponse(url, token: token, queryParameters: queryParameters, headers: headers, retryTimes: retryTimes - 1);
       } else {
         throw APIException(APIException.OTHER, arguments: e);
       }
@@ -288,19 +227,14 @@ class ApiClient {
       if (retryTimes > 0) {
         print('will retry after 3 seconds...');
         await Future.delayed(Duration(seconds: 3));
-        return await _getForResponse(url,
-            token: token,
-            queryParameters: queryParameters,
-            headers: headers,
-            retryTimes: retryTimes - 1);
+        return await _getForResponse(url, token: token, queryParameters: queryParameters, headers: headers, retryTimes: retryTimes - 1);
       } else {
         throw APIException(APIException.OTHER, arguments: e);
       }
     }
   }
 
-  Future<Response> _get(url, {Map<String, String>? headers}) =>
-      _withClient((client) => client.get(url, headers: headers));
+  Future<Response> _get(url, {Map<String, String>? headers}) => _withClient((client) => client.get(url, headers: headers));
 
   bool _certificateCheck(X509Certificate cert, String host, int port) => true;
 
@@ -314,8 +248,5 @@ class ApiClient {
     }
   }
 
-  Future<Response> _post(url,
-          {Map<String, String>? headers, body, Encoding? encoding}) =>
-      _withClient((client) =>
-          client.post(url, headers: headers, body: body, encoding: encoding));
+  Future<Response> _post(url, {Map<String, String>? headers, body, Encoding? encoding}) => _withClient((client) => client.post(url, headers: headers, body: body, encoding: encoding));
 }
diff --git a/lib/api/chat/chat_api_client.dart b/lib/api/chat/chat_api_client.dart
index 323c3d4..91b622a 100644
--- a/lib/api/chat/chat_api_client.dart
+++ b/lib/api/chat/chat_api_client.dart
@@ -1,10 +1,14 @@
 import 'dart:convert';
 import 'dart:io';
+import 'dart:typed_data';
 
 import 'package:http/http.dart';
 import 'package:mohem_flutter_app/api/api_client.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/consts.dart';
+import 'package:mohem_flutter_app/classes/utils.dart';
+import 'package:mohem_flutter_app/exceptions/api_exception.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/chat/get_user_login_token_model.dart' as user;
 import 'package:mohem_flutter_app/models/chat/make_user_favotire_unfavorite_chat_model.dart' as fav;
@@ -43,13 +47,30 @@ class ChatApiClient {
       );
 
   Future<ChatUserModel> getRecentChats() async {
-    Response response = await ApiClient().getJsonForResponse(
-      "${ApiConsts.chatRecentUrl}getchathistorybyuserid",
-      token: AppState().chatDetails!.response!.token,
-    );
-    return ChatUserModel.fromJson(
-      json.decode(response.body),
-    );
+    try {
+      Response response = await ApiClient().getJsonForResponse(
+        "${ApiConsts.chatRecentUrl}getchathistorybyuserid",
+        token: AppState().chatDetails!.response!.token,
+      );
+      return ChatUserModel.fromJson(
+        json.decode(response.body),
+      );
+    } catch (e) {
+      e as APIException;
+      if (e.message == "api_common_unauthorized") {
+        logger.d("Token Generated On APIIIIII");
+        user.UserAutoLoginModel userLoginResponse = await ChatApiClient().getUserLoginToken();
+        if (userLoginResponse.response != null) {
+          AppState().setchatUserDetails = userLoginResponse;
+          getRecentChats();
+        } else {
+          Utils.showToast(
+            userLoginResponse.errorResponses!.first.fieldName.toString() + " Erorr",
+          );
+        }
+      }
+      throw e;
+    }
   }
 
   Future<ChatUserModel> getFavUsers() async {
@@ -63,11 +84,27 @@ class ChatApiClient {
   }
 
   Future<Response> getSingleUserChatHistory({required int senderUID, required int receiverUID, required bool loadMore, bool isNewChat = false, required int paginationVal}) async {
-    Response response = await ApiClient().getJsonForResponse(
-      "${ApiConsts.chatSingleUserHistoryUrl}GetUserChatHistory/$senderUID/$receiverUID/$paginationVal",
-      token: AppState().chatDetails!.response!.token,
-    );
-    return response;
+    try {
+      Response response = await ApiClient().getJsonForResponse(
+        "${ApiConsts.chatSingleUserHistoryUrl}GetUserChatHistory/$senderUID/$receiverUID/$paginationVal",
+        token: AppState().chatDetails!.response!.token,
+      );
+      return response;
+    } catch (e) {
+      e as APIException;
+      if (e.message == "api_common_unauthorized") {
+        user.UserAutoLoginModel userLoginResponse = await ChatApiClient().getUserLoginToken();
+        if (userLoginResponse.response != null) {
+          AppState().setchatUserDetails = userLoginResponse;
+          getSingleUserChatHistory(senderUID: senderUID, receiverUID: receiverUID, loadMore: loadMore, paginationVal: paginationVal);
+        } else {
+          Utils.showToast(
+            userLoginResponse.errorResponses!.first.fieldName.toString() + " Erorr",
+          );
+        }
+      }
+      throw e;
+    }
   }
 
   Future<fav.FavoriteChatUser> favUser({required int userID, required int targetUserID}) async {
@@ -83,13 +120,30 @@ class ChatApiClient {
   }
 
   Future<fav.FavoriteChatUser> unFavUser({required int userID, required int targetUserID}) async {
-    Response response = await ApiClient().postJsonForResponse(
-      "${ApiConsts.chatFavUser}deleteFavUser",
-      {"targetUserId": targetUserID, "userId": userID},
-      token: AppState().chatDetails!.response!.token,
-    );
-    fav.FavoriteChatUser favoriteChatUser = fav.FavoriteChatUser.fromRawJson(response.body);
-    return favoriteChatUser;
+    try {
+      Response response = await ApiClient().postJsonForResponse(
+        "${ApiConsts.chatFavUser}deleteFavUser",
+        {"targetUserId": targetUserID, "userId": userID},
+        token: AppState().chatDetails!.response!.token,
+      );
+      fav.FavoriteChatUser favoriteChatUser = fav.FavoriteChatUser.fromRawJson(response.body);
+      return favoriteChatUser;
+    } catch (e) {
+      e as APIException;
+      if (e.message == "api_common_unauthorized") {
+        logger.d("Token Generated On APIIIIII");
+        user.UserAutoLoginModel userLoginResponse = await ChatApiClient().getUserLoginToken();
+        if (userLoginResponse.response != null) {
+          AppState().setchatUserDetails = userLoginResponse;
+          unFavUser(userID: userID, targetUserID: targetUserID);
+        } else {
+          Utils.showToast(
+            userLoginResponse.errorResponses!.first.fieldName.toString() + " Erorr",
+          );
+        }
+      }
+      throw e;
+    }
   }
 
   Future<StreamedResponse> uploadMedia(String userId, File file) async {
@@ -100,4 +154,29 @@ class ChatApiClient {
     StreamedResponse response = await request.send();
     return response;
   }
+
+  // Download File For Chat
+
+  Future<Uint8List> downloadURL({required String fileName, required String fileTypeDescription}) async {
+    Response response = await ApiClient().postJsonForResponse(
+      "${ApiConsts.chatMediaImageUploadUrl}download",
+      {"fileType": fileTypeDescription, "fileName": fileName, "fileSource": 1},
+      token: AppState().chatDetails!.response!.token,
+    );
+    Uint8List data = Uint8List.fromList(response.bodyBytes);
+    return data;
+  }
+
+  Future getUsersImages({required List encryptedEmails}) async {
+    Response response = await ApiClient().postJsonForResponse(
+      "${ApiConsts.chatUserImages}images",
+      {
+        "encryptedEmails": ["/g8Rc+s6eEOdci41PwJuV5dX+gXe51G9OTHzb9ahcVlHCmVvNhxReirudF79+hdxVSkCnQ6wC5DBFV8xnJlC74X6157PxF7mNYrAYuHRgp4="],
+        "fromClient": true
+      },
+      token: AppState().chatDetails!.response!.token,
+    );
+    logger.d(response.body);
+    // Uint8List data = Uint8List.fromList(response.body);
+  }
 }
diff --git a/lib/api/dashboard_api_client.dart b/lib/api/dashboard_api_client.dart
index 69c2e82..e30af91 100644
--- a/lib/api/dashboard_api_client.dart
+++ b/lib/api/dashboard_api_client.dart
@@ -182,22 +182,22 @@ class DashboardApiClient {
 
   Future<ChatUnreadCovnCountModel> getChatCount() async {
     Response response = await ApiClient().getJsonForResponse(
-      "${ApiConsts.chatServerBaseApiUrl}user/unreadconversationcount/${AppState().getUserName}",
+      "${ApiConsts.chatLoginTokenUrl}unreadconversationcount/${AppState().getUserName}",
     );
     return chatUnreadCovnCountModelFromJson(response.body);
   }
 
-  // Future setAdvertisementViewed(String masterID, int advertisementId) async {
-  //   String url = "${ApiConsts.cocRest}Mohemm_ITG_UpdateAdvertisementAsViewed";
-  //
-  //   Map<String, dynamic> postParams = {
-  //     "ItgNotificationMasterId": masterID,
-  //     "ItgAdvertisement": {"advertisementId": advertisementId, "acknowledgment": true} //Mobile Id
-  //   };
-  //   postParams.addAll(AppState().postParamsJson);
-  //   return await ApiClient().postJsonForObject((json) {
-  //     // ItgMainRes responseData = ItgMainRes.fromJson(json);
-  //     return json;
-  //   }, url, postParams);
-  // }
+// Future setAdvertisementViewed(String masterID, int advertisementId) async {
+//   String url = "${ApiConsts.cocRest}Mohemm_ITG_UpdateAdvertisementAsViewed";
+//
+//   Map<String, dynamic> postParams = {
+//     "ItgNotificationMasterId": masterID,
+//     "ItgAdvertisement": {"advertisementId": advertisementId, "acknowledgment": true} //Mobile Id
+//   };
+//   postParams.addAll(AppState().postParamsJson);
+//   return await ApiClient().postJsonForObject((json) {
+//     // ItgMainRes responseData = ItgMainRes.fromJson(json);
+//     return json;
+//   }, url, postParams);
+// }
 }
diff --git a/lib/classes/consts.dart b/lib/classes/consts.dart
index edc866f..4e9c9b6 100644
--- a/lib/classes/consts.dart
+++ b/lib/classes/consts.dart
@@ -1,6 +1,6 @@
 class ApiConsts {
- // static String baseUrl = "http://10.200.204.20:2801/"; // Local server
-   //static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
+  // static String baseUrl = "http://10.200.204.20:2801/"; // Local server
+  //static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
   static String baseUrl = "https://hmgwebservices.com"; // Live server
   static String baseUrlServices = baseUrl + "/Services/"; // server
   // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
@@ -23,6 +23,7 @@ class ApiConsts {
   static String chatSingleUserHistoryUrl = chatServerBaseApiUrl + "UserChatHistory/";
   static String chatMediaImageUploadUrl = chatServerBaseApiUrl + "shared/";
   static String chatFavUser = chatServerBaseApiUrl + "FavUser/";
+  static String chatUserImages = chatServerBaseUrl +  "empservice/api/employee/";
 }
 
 class SharedPrefsConsts {
diff --git a/lib/provider/chat_provider_model.dart b/lib/provider/chat_provider_model.dart
index 74ee633..31106c1 100644
--- a/lib/provider/chat_provider_model.dart
+++ b/lib/provider/chat_provider_model.dart
@@ -10,6 +10,7 @@ import 'package:mohem_flutter_app/api/chat/chat_api_client.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/consts.dart';
 import 'package:mohem_flutter_app/classes/utils.dart';
+import 'package:mohem_flutter_app/exceptions/api_exception.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/chat/get_single_user_chat_list_model.dart';
@@ -587,6 +588,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
 
   Future<void> unFavoriteUser({required int userID, required int targetUserID}) async {
     fav.FavoriteChatUser favoriteChatUser = await ChatApiClient().unFavUser(userID: userID, targetUserID: targetUserID);
+
     if (favoriteChatUser.response != null) {
       for (ChatUser user in searchedChats!) {
         if (user.id == favoriteChatUser.response!.targetUserId!) {
@@ -597,6 +599,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
         (ChatUser element) => element.id == targetUserID,
       );
     }
+
     notifyListeners();
   }
 
@@ -650,6 +653,11 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
     );
   }
 
+  // Future<void> getDownLoadFile(String fileName) async {
+  //   var data = await ChatApiClient().downloadURL(fileName: "data");
+  //   Image.memory(data);
+  // }
+
 // void getUserChatHistoryNotDeliveredAsync({required int userId}) async {
 //   try {
 //     await hubConnection.invoke("GetUserChatHistoryNotDeliveredAsync", args: [userId]);
@@ -657,4 +665,13 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
 //     hubConnection.off("GetUserChatHistoryNotDeliveredAsync", method: chatNotDelivered);
 //   }
 // }
+
+
+
+
+
+
+
+
+
 }
diff --git a/lib/provider/dashboard_provider_model.dart b/lib/provider/dashboard_provider_model.dart
index b785293..59b62b6 100644
--- a/lib/provider/dashboard_provider_model.dart
+++ b/lib/provider/dashboard_provider_model.dart
@@ -295,7 +295,6 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
   }
 
   Future<void> getUserAutoLoginToken() async {
-    logger.d("Token Generated On Home");
     UserAutoLoginModel userLoginResponse = await ChatApiClient().getUserLoginToken();
     if (userLoginResponse.response != null) {
       AppState().setchatUserDetails = userLoginResponse;
@@ -315,7 +314,6 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
     isChatHubLoding = false;
     return hub;
   }
-
   void notify() {
     notifyListeners();
   }
diff --git a/lib/ui/chat/chat_bubble.dart b/lib/ui/chat/chat_bubble.dart
index bcf78aa..8382585 100644
--- a/lib/ui/chat/chat_bubble.dart
+++ b/lib/ui/chat/chat_bubble.dart
@@ -1,8 +1,13 @@
+import 'dart:typed_data';
+
 import 'package:flutter/material.dart';
+import 'package:mohem_flutter_app/api/api_client.dart';
+import 'package:mohem_flutter_app/api/chat/chat_api_client.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
 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/main.dart';
 
 // todo: @aamir use extension methods, and use correct widgets.
 
@@ -16,7 +21,9 @@ class ChatBubble extends StatelessWidget {
       required this.isDelivered,
       required this.dateTime,
       required this.isReplied,
-      required this.userName})
+      required this.userName,
+      this.fileTypeID,
+      this.fileTypeDescription})
       : super(key: key);
   final String text;
   final String replyText;
@@ -26,6 +33,8 @@ class ChatBubble extends StatelessWidget {
   final String dateTime;
   final bool isReplied;
   final String userName;
+  final int? fileTypeID;
+  final String? fileTypeDescription;
 
   @override
   Widget build(BuildContext context) {
@@ -177,7 +186,8 @@ class ChatBubble extends StatelessWidget {
               ).expanded,
             ),
           ).paddingOnly(right: 5, bottom: 7),
-        (text).toText12(),
+        if (fileTypeID == 12 || fileTypeID == 4 || fileTypeID == 3) showImage().paddingOnly(right: 5),
+        if (fileTypeID != 12 || fileTypeID != 4 || fileTypeID != 3) (text).toText12(),
         Align(
           alignment: Alignment.centerRight,
           child: Row(
@@ -237,7 +247,7 @@ class ChatBubble extends StatelessWidget {
                 ).expanded,
               ),
             ).paddingOnly(right: 5, bottom: 7),
-          (text).toText12(color: Colors.white),
+          if (fileTypeID == 12 || fileTypeID == 4 || fileTypeID == 3) showImage().paddingOnly(right: 5) else (text).toText12(color: Colors.white),
           Align(
             alignment: Alignment.centerRight,
             child: dateTime.toText10(
@@ -248,4 +258,26 @@ class ChatBubble extends StatelessWidget {
       ),
     ).paddingOnly(right: MediaQuery.of(context).size.width * 0.3);
   }
+
+  Widget showImage() {
+    return FutureBuilder<Uint8List>(
+      future: ChatApiClient().downloadURL(fileName: text, fileTypeDescription: fileTypeDescription!),
+      builder: (BuildContext context, AsyncSnapshot<dynamic> snapshot) {
+        if (snapshot.connectionState != ConnectionState.waiting) {
+          if (snapshot.data == null) {
+            return (text).toText12(color: Colors.white);
+          } else {
+            return Image.memory(
+              snapshot.data,
+              height: 140,
+              width: 227,
+              fit: BoxFit.cover,
+            );
+          }
+        } else {
+          return const SizedBox(height: 140, width: 227, child: Center(child: CircularProgressIndicator()));
+        }
+      },
+    );
+  }
 }
diff --git a/lib/ui/chat/chat_detailed_screen.dart b/lib/ui/chat/chat_detailed_screen.dart
index e0f7f93..4dc7c35 100644
--- a/lib/ui/chat/chat_detailed_screen.dart
+++ b/lib/ui/chat/chat_detailed_screen.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -9,6 +10,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/call.dart';
 import 'package:mohem_flutter_app/provider/chat_provider_model.dart';
 import 'package:mohem_flutter_app/ui/chat/call/chat_outgoing_call_screen.dart';
@@ -74,21 +76,14 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
         showHomeButton: false,
         image: userDetails["targetUser"].image,
         actions: [
-          IconButton(
-            constraints: const BoxConstraints(),
-            onPressed: () {
-              //  makeCall(callType: "AUDIO", con: hubConnection);
-            },
-            icon: SvgPicture.asset("assets/icons/chat/call.svg", width: 22, height: 22),
-          ),
-          IconButton(
-            constraints: const BoxConstraints(),
-            onPressed: () {
-              //makeCall(callType: "VIDEO", con: hubConnection);
-            },
-            icon: SvgPicture.asset("assets/icons/chat/video_call.svg", width: 20, height: 20),
-          ),
-          10.width,
+          SvgPicture.asset("assets/icons/chat/call.svg", width: 21, height: 23).onPress(() {
+            // makeCall(callType: "AUDIO", con: hubConnection);
+          }),
+          24.width,
+          SvgPicture.asset("assets/icons/chat/video_call.svg", width: 21, height: 18).onPress(() {
+            // makeCall(callType: "VIDEO", con: hubConnection);
+          }),
+          21.width,
         ],
       ),
       body: Consumer<ChatProviderModel>(
@@ -128,13 +123,17 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
                               dateTime: m.dateFormte(m.userChatHistory[i].createdDate!),
                               isReplied: m.userChatHistory[i].userChatReplyResponse != null ? true : false,
                               userName: AppState().chatDetails!.response!.userName == m.userChatHistory[i].currentUserName.toString() ? "You" : m.userChatHistory[i].currentUserName.toString(),
+                              fileTypeID: m.userChatHistory[i].fileTypeId,
+                              fileTypeDescription: m.userChatHistory[i].fileTypeResponse!.fileTypeDescription,
                             ),
                             onRightSwipe: () {
                               m.chatReply(
                                 m.userChatHistory[i],
                               );
                             },
-                          );
+                          ).onPress(() {
+                            logger.d(jsonEncode(m.userChatHistory[i]));
+                          });
                         },
                       ),
                     ).expanded,
@@ -181,12 +180,12 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
                         disabledBorder: InputBorder.none,
                         filled: true,
                         fillColor: MyColors.white,
-                        contentPadding: EdgeInsets.only(
+                        contentPadding: const EdgeInsets.only(
                           left: 21,
                           top: 20,
                           bottom: 20,
                         ),
-                        prefixIconConstraints: BoxConstraints(),
+                        prefixIconConstraints: const BoxConstraints(),
                         prefixIcon: m.sFileType.isNotEmpty
                             ? SvgPicture.asset(m.getType(m.sFileType), height: 30, width: 22, alignment: Alignment.center, fit: BoxFit.cover).paddingOnly(left: 21, right: 15)
                             : null,
diff --git a/lib/ui/chat/chat_home_screen.dart b/lib/ui/chat/chat_home_screen.dart
index 95ff2ed..9072b33 100644
--- a/lib/ui/chat/chat_home_screen.dart
+++ b/lib/ui/chat/chat_home_screen.dart
@@ -46,106 +46,87 @@ class _ChatHomeScreenState extends State<ChatHomeScreen> {
         builder: (BuildContext context, ChatProviderModel m, Widget? child) {
           return m.isLoading
               ? ChatHomeShimmer()
-              : ListView(
-            padding: EdgeInsets.zero,
-                  shrinkWrap: true,
-                  physics: const AlwaysScrollableScrollPhysics(),
+              : Column(
                   children: <Widget>[
-                    Padding(
-                      padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 20),
-                      child: TextField(
-                        controller: m.search,
-                        style: const TextStyle(color: MyColors.darkTextColor, fontWeight: FontWeight.w500, fontSize: 12),
-                        onChanged: (String val) {
-                          m.filter(val);
-                        },
-                        decoration: InputDecoration(
-                          border: fieldBorder(radius: 5, color: 0xFFE5E5E5),
-                          focusedBorder: fieldBorder(radius: 5, color: 0xFFE5E5E5),
-                          enabledBorder: fieldBorder(radius: 5, color: 0xFFE5E5E5),
-                          contentPadding: const EdgeInsets.all(11),
-                          hintText: LocaleKeys.searchfromchat.tr(),
-                          hintStyle: const TextStyle(color: MyColors.lightTextColor, fontStyle: FontStyle.italic, fontWeight: FontWeight.w500, fontSize: 12),
-                          filled: true,
-                          fillColor: const Color(0xFFF7F7F7),
-                          suffixIconConstraints: const BoxConstraints(),
-                          suffixIcon: m.search.text.isNotEmpty
-                              ? IconButton(
-                                  constraints: const BoxConstraints(),
-                                  onPressed: () {
-                                    m.clearSelections();
-                                  },
-                                  icon: const Icon(Icons.clear, size: 22),
-                                  color: MyColors.redA3Color,
-                                )
-                              : null,
-                        ),
+                    TextField(
+                      controller: m.search,
+                      style: const TextStyle(color: MyColors.darkTextColor, fontWeight: FontWeight.w500, fontSize: 12),
+                      onChanged: (String val) {
+                        m.filter(val);
+                      },
+                      decoration: InputDecoration(
+                        border: fieldBorder(radius: 5, color: 0xFFE5E5E5),
+                        focusedBorder: fieldBorder(radius: 5, color: 0xFFE5E5E5),
+                        enabledBorder: fieldBorder(radius: 5, color: 0xFFE5E5E5),
+                        contentPadding: const EdgeInsets.all(11),
+                        hintText: LocaleKeys.searchfromchat.tr(),
+                        hintStyle: const TextStyle(color: MyColors.lightTextColor, fontStyle: FontStyle.italic, fontWeight: FontWeight.w500, fontSize: 12),
+                        filled: true,
+                        fillColor: const Color(0xFFF7F7F7),
+                        suffixIconConstraints: const BoxConstraints(),
+                        suffixIcon: m.search.text.isNotEmpty
+                            ? IconButton(
+                                constraints: const BoxConstraints(),
+                                onPressed: () {
+                                  m.clearSelections();
+                                },
+                                icon: const Icon(Icons.clear, size: 22),
+                                color: MyColors.redA3Color,
+                              )
+                            : null,
                       ),
-                    ),
+                    ).paddingOnly(top: 20, bottom: 14),
                     if (m.searchedChats != null)
                       ListView.separated(
                         itemCount: m.searchedChats!.length,
-                        padding: const EdgeInsets.only(bottom: 80),
                         shrinkWrap: true,
-                        physics: const NeverScrollableScrollPhysics(),
+                        physics: const ClampingScrollPhysics(),
                         itemBuilder: (BuildContext context, int index) {
+                          // todo @aamir, remove list tile, make a custom ui instead
                           return SizedBox(
                             height: 55,
-                            // todo @aamir, remove list tile, make a custom ui instead
-                            child: ListTile(
-                              leading: Stack(
-                                children: <Widget>[
-                                  SvgPicture.asset(
-                                    "assets/images/user.svg",
-                                    height: 48,
-                                    width: 48,
-                                  ),
-                                  Positioned(
-                                    right: 5,
-                                    bottom: 1,
-                                    child: Container(
-                                      width: 10,
-                                      height: 10,
-                                      decoration: BoxDecoration(
-                                        color: m.searchedChats![index].userStatus == 1 ? MyColors.green2DColor : Colors.red,
-                                        borderRadius: const BorderRadius.all(
-                                          Radius.circular(10),
+                            child: Row(
+                              children: [
+                                Stack(
+                                  children: <Widget>[
+                                    SvgPicture.asset(
+                                      "assets/images/user.svg",
+                                      height: 48,
+                                      width: 48,
+                                    ),
+                                    Positioned(
+                                      right: 5,
+                                      bottom: 1,
+                                      child: Container(
+                                        width: 10,
+                                        height: 10,
+                                        decoration: BoxDecoration(
+                                          color: m.searchedChats![index].userStatus == 1 ? MyColors.green2DColor : Colors.red,
+                                          borderRadius: const BorderRadius.all(
+                                            Radius.circular(10),
+                                          ),
                                         ),
                                       ),
-                                    ),
-                                  )
-                                ],
-                              ),
-                              title: (m.searchedChats![index].userName!.replaceFirst(".", " ").capitalizeFirstofEach ?? "").toText14(color: MyColors.darkTextColor),
-                              // subtitle: (m.searchedChats![index].isTyping == true ? "Typing ..." : "").toText11(color: MyColors.normalTextColor),
-                              trailing: SizedBox(
-                                width: 60,
-                                child: Row(
-                                  crossAxisAlignment: CrossAxisAlignment.center,
-                                  mainAxisAlignment: MainAxisAlignment.end,
-                                  mainAxisSize: MainAxisSize.max,
-                                  children: <Widget>[
-                                    // if (m.searchedChats![index].isLoadingCounter!)
-                                    //   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: CircularProgressIndicator(),
-                                    //     ),
-                                    //   ),
-                                    if (m.searchedChats![index].unreadMessageCount! > 0)
-                                      Flexible(
-                                        child: Container(
-                                          padding: EdgeInsets.zero,
-                                          alignment: Alignment.centerRight,
+                                    )
+                                  ],
+                                ),
+                                Column(
+                                  mainAxisAlignment: MainAxisAlignment.start,
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    (m.searchedChats![index].userName!.replaceFirst(".", " ").capitalizeFirstofEach ?? "").toText14(color: MyColors.darkTextColor).paddingOnly(left: 11, top: 13),
+                                  ],
+                                ).expanded,
+                                SizedBox(
+                                  width: 60,
+                                  child: Row(
+                                    crossAxisAlignment: CrossAxisAlignment.center,
+                                    mainAxisAlignment: MainAxisAlignment.end,
+                                    mainAxisSize: MainAxisSize.max,
+                                    children: <Widget>[
+                                      if (m.searchedChats![index].unreadMessageCount! > 0)
+                                        Container(
+                                          alignment: Alignment.center,
                                           width: 18,
                                           height: 18,
                                           decoration: const BoxDecoration(
@@ -159,18 +140,12 @@ class _ChatHomeScreenState extends State<ChatHomeScreen> {
                                                 color: MyColors.white,
                                               )
                                               .center,
-                                        ),
-                                      ),
-                                    Flexible(
-                                      child: IconButton(
-                                        constraints: BoxConstraints(),
-                                        alignment: Alignment.centerRight,
-                                        padding: EdgeInsets.zero,
-                                        icon: Icon(
-                                          m.searchedChats![index].isFav != null && m.searchedChats![index].isFav == false ? Icons.star_sharp : Icons.star_sharp,
-                                        ),
+                                        ).paddingOnly(right: 10).center,
+                                      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: () {
+                                      ).onPress(
+                                        () {
                                           if (m.searchedChats![index].isFav == null || m.searchedChats![index].isFav == false) {
                                             m.favoriteUser(
                                               userID: AppState().chatDetails!.response!.id!,
@@ -188,40 +163,28 @@ class _ChatHomeScreenState extends State<ChatHomeScreen> {
                                             );
                                           }
                                         },
-                                      ),
-                                    )
-                                  ],
+                                      ).center
+                                    ],
+                                  ),
                                 ),
-                              ),
-                              minVerticalPadding: 0,
-                              onTap: () {
-                                Navigator.pushNamed(
-                                  context,
-                                  AppRoutes.chatDetailed,
-                                  arguments: {"targetUser": m.searchedChats![index], "isNewChat": false},
-                                ).then((Object? value) {
-                                  // m.GetUserChatHistoryNotDeliveredAsync(userId: int.parse(AppState().chatDetails!.response!.id.toString()));
-                                  m.clearSelections();
-                                  m.notifyListeners();
-                                });
-                              },
+                              ],
                             ),
-                          );
+                          ).onPress(() {
+                            Navigator.pushNamed(
+                              context,
+                              AppRoutes.chatDetailed,
+                              arguments: {"targetUser": m.searchedChats![index], "isNewChat": false},
+                            ).then((Object? value) {
+                              // m.GetUserChatHistoryNotDeliveredAsync(userId: int.parse(AppState().chatDetails!.response!.id.toString()));
+                              m.clearSelections();
+                              m.notifyListeners();
+                            });
+                          });
                         },
-                        separatorBuilder: (BuildContext context, int index) => const Padding(
-                          padding: EdgeInsets.only(
-                            right: 10,
-                            left: 70,
-                          ),
-                          child: Divider(
-                            color: Color(
-                              0xFFE5E5E5,
-                            ),
-                          ),
-                        ),
-                      ),
+                        separatorBuilder: (BuildContext context, int index) => const Divider(color: MyColors.lightGreyE5Color).paddingOnly(left: 59),
+                      ).paddingOnly(bottom: 70).expanded,
                   ],
-                );
+                ).paddingOnly(left: 21, right: 21);
         },
       ),
       floatingActionButton: FloatingActionButton(
diff --git a/lib/ui/chat/favorite_users_screen.dart b/lib/ui/chat/favorite_users_screen.dart
index 8f303cd..6bc0040 100644
--- a/lib/ui/chat/favorite_users_screen.dart
+++ b/lib/ui/chat/favorite_users_screen.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:mohem_flutter_app/main.dart';
 import 'package:mohem_flutter_app/provider/chat_provider_model.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
@@ -26,81 +27,80 @@ class ChatFavoriteUsersScreen extends StatelessWidget {
             return m.favUsersList != null && m.favUsersList.isNotEmpty
                 ? ListView.separated(
                     itemCount: m.favUsersList!.length,
-                    padding: const EdgeInsets.only(top: 20),
                     shrinkWrap: true,
                     physics: const NeverScrollableScrollPhysics(),
                     itemBuilder: (BuildContext context, int index) {
                       return SizedBox(
                         height: 55,
-                        child: ListTile(
-                          leading: Stack(
-                            children: <Widget>[
-                              SvgPicture.asset(
-                                "assets/images/user.svg",
-                                height: 48,
-                                width: 48,
-                              ),
-                              Positioned(
-                                right: 5,
-                                bottom: 1,
-                                child: Container(
-                                  width: 10,
-                                  height: 10,
-                                  decoration: BoxDecoration(
-                                    color: m.favUsersList![index].userStatus == 1 ? MyColors.green2DColor : Colors.red,
-                                    borderRadius: const BorderRadius.all(
-                                      Radius.circular(10),
+                        child: Row(
+                          children: [
+                            Stack(
+                              children: <Widget>[
+                                SvgPicture.asset(
+                                  "assets/images/user.svg",
+                                  height: 48,
+                                  width: 48,
+                                ),
+                                Positioned(
+                                  right: 5,
+                                  bottom: 1,
+                                  child: Container(
+                                    width: 10,
+                                    height: 10,
+                                    decoration: BoxDecoration(
+                                      color: m.favUsersList![index].userStatus == 1 ? MyColors.green2DColor : Colors.red,
+                                      borderRadius: const BorderRadius.all(
+                                        Radius.circular(10),
+                                      ),
                                     ),
                                   ),
-                                ),
-                              )
-                            ],
-                          ),
-                          title: (m.favUsersList![index].userName!.replaceFirst(".", " ").capitalizeFirstofEach ?? "").toText14(
-                            color: MyColors.darkTextColor,
-                          ),
-                          trailing: IconButton(
-                            alignment: Alignment.centerRight,
-                            padding: EdgeInsets.zero,
-                            icon: Icon(
-                              m.favUsersList![index].isFav! ? Icons.star : Icons.star_border,
+                                )
+                              ],
                             ),
-                            color: m.favUsersList![index].isFav! ? MyColors.yellowColor : MyColors.grey35Color,
-                            onPressed: () {
-                              if (m.favUsersList![index].isFav!)
-                                m.unFavoriteUser(
-                                  userID: AppState().chatDetails!.response!.id!,
-                                  targetUserID: m.favUsersList![index].id!,
-                                );
-                            },
-                          ),
-                          minVerticalPadding: 0,
-                          onTap: () {
-                            Navigator.pushNamed(
-                              context,
-                              AppRoutes.chatDetailed,
-                              arguments: {"targetUser": m.favUsersList![index], "isNewChat": false},
-                            ).then(
-                              (Object? value) {
-                                m.clearSelections();
-                              },
-                            );
-                          },
+                            Column(
+                              mainAxisAlignment: MainAxisAlignment.start,
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                (m.favUsersList![index].userName!.replaceFirst(".", " ").capitalizeFirstofEach ?? "").toText14(color: MyColors.darkTextColor).paddingOnly(left: 11, top: 13),
+                              ],
+                            ).expanded,
+                            SizedBox(
+                              width: 60,
+                              child: Row(
+                                crossAxisAlignment: CrossAxisAlignment.center,
+                                mainAxisAlignment: MainAxisAlignment.end,
+                                mainAxisSize: MainAxisSize.max,
+                                children: <Widget>[
+                                  Icon(
+                                    m.favUsersList![index].isFav! ? Icons.star : Icons.star_border,
+                                    color: m.favUsersList![index].isFav! ? MyColors.yellowColor : MyColors.grey35Color,
+                                  ).onPress(() {
+                                    if (m.favUsersList![index].isFav!) {
+                                      m.unFavoriteUser(
+                                        userID: AppState().chatDetails!.response!.id!,
+                                        targetUserID: m.favUsersList![index].id!,
+                                      );
+                                    }
+                                  }).center,
+                                ],
+                              ),
+                            ),
+                          ],
                         ),
-                      );
+                      ).onPress(() {
+                        Navigator.pushNamed(
+                          context,
+                          AppRoutes.chatDetailed,
+                          arguments: {"targetUser": m.favUsersList![index], "isNewChat": false},
+                        ).then(
+                          (Object? value) {
+                            m.clearSelections();
+                          },
+                        );
+                      });
                     },
-                    separatorBuilder: (BuildContext context, int index) => const Padding(
-                      padding: EdgeInsets.only(
-                        right: 10,
-                        left: 70,
-                      ),
-                      child: Divider(
-                        color: Color(
-                          0xFFE5E5E5,
-                        ),
-                      ),
-                    ),
-                  )
+                    separatorBuilder: (BuildContext context, int index) => const Divider(color: MyColors.lightGreyE5Color).paddingOnly(left: 70),
+                  ).paddingAll(21)
                 : Column(
                     children: <Widget>[
                       Utils.getNoDataWidget(context).expanded,
diff --git a/lib/widgets/image_picker.dart b/lib/widgets/image_picker.dart
index f92f9f4..69bf7e4 100644
--- a/lib/widgets/image_picker.dart
+++ b/lib/widgets/image_picker.dart
@@ -20,7 +20,7 @@ class ImageOptions {
           if (Platform.isAndroid) {
             cameraImageAndroid(image);
           } else {
-            File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.camera, imageQuality: 20))?.path ?? "");
+            File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.camera, imageQuality: 10))?.path ?? "");
             String fileName = _image.path;
             var bytes = File(fileName).readAsBytesSync();
             String base64Encode = base64.encode(bytes);
@@ -33,7 +33,7 @@ class ImageOptions {
           if (Platform.isAndroid) {
             galleryImageAndroid(image);
           } else {
-            File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.gallery, imageQuality: 20))?.path ?? "");
+            File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.gallery, imageQuality: 10))?.path ?? "");
             String fileName = _image.path;
             var bytes = File(fileName).readAsBytesSync();
             String base64Encode = base64.encode(bytes);
@@ -74,7 +74,7 @@ class ImageOptions {
                   if (Platform.isAndroid) {
                     galleryImageAndroid(image);
                   } else {
-                    File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.gallery, imageQuality: 20))?.path ?? "");
+                    File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.gallery, imageQuality: 10))?.path ?? "");
                     String fileName = _image.path;
                     var bytes = File(fileName).readAsBytesSync();
                     String base64Encode = base64.encode(bytes);
@@ -91,7 +91,7 @@ class ImageOptions {
                   if (Platform.isAndroid) {
                     cameraImageAndroid(image);
                   } else {
-                    File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.camera, imageQuality: 20))?.path ?? "");
+                    File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.camera, imageQuality: 10))?.path ?? "");
                     String fileName = _image.path;
                     var bytes = File(fileName).readAsBytesSync();
                     String base64Encode = base64.encode(bytes);
@@ -114,7 +114,7 @@ class ImageOptions {
 }
 
 void galleryImageAndroid(Function(String, File) image) async {
-  File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.gallery, imageQuality: 20))?.path ?? "");
+  File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.gallery, imageQuality: 10))?.path ?? "");
   String fileName = _image.path;
   var bytes = File(fileName).readAsBytesSync();
   String base64Encode = base64.encode(bytes);
@@ -124,7 +124,7 @@ void galleryImageAndroid(Function(String, File) image) async {
 }
 
 void cameraImageAndroid(Function(String, File) image) async {
-  File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.camera, imageQuality: 20))?.path ?? "");
+  File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.camera, imageQuality: 10))?.path ?? "");
   String fileName = _image.path;
   var bytes = File(fileName).readAsBytesSync();
   String base64Encode = base64.encode(bytes);