debugging changes

lib/view_models/appointments_view_model.dart

@@ -973,7 +973,7 @@ class AppointmentsVM extends BaseVM {
         Utils.showToast("${genericRespModel.message.toString()}");
         return;
       }
-      if (genericRespModel.data == 1) {
+      if (genericRespModel.messageStatus == 1) {
         context.read<DashboardVmCustomer>().onNavbarTapped(1);
         applyFilterOnAppointmentsVM(
             appointmentStatusEnum: AppointmentStatusEnum.cancelled);

lib/view_models/chat_view_model.dart

@@ -94,10 +94,9 @@ class ChatVM extends ChangeNotifier {
   }
 
   Future<void> onNewMessageReceived({required List<ChatMessageModel> messages, required BuildContext context}) async {
+    log("message I received in onNewMessageReceived ${messages.first.toString()}");
     if (AppState().currentAppType == AppType.customer) {
       for (var msg in messages) {
-        log("printing senderUserID: ${msg.senderUserID}");
-        log("printing providerUserId: ${serviceProviderOffersList.first.providerUserId}");
         int providerIndex = serviceProviderOffersList.indexWhere((element) => element.providerUserId == msg.senderUserID);
         if (providerIndex != -1) {
           serviceProviderOffersList[providerIndex].chatMessages!.add(msg);
@@ -105,9 +104,11 @@ class ChatVM extends ChangeNotifier {
       }
     } else {
       for (var msg in messages) {
-        int providerIndex = context.read<RequestsVM>().myFilteredRequests.indexWhere((element) => element.customerUserID == msg.receiverUserID);
+        int providerIndex = context.read<RequestsVM>().myFilteredRequests.indexWhere(
+              (element) => element.customerUserID == msg.receiverUserID,
+            ); // Where we need to call this function for saving a message in chat we will use receiverUserID and in those cases where received ID is null , it means it is a signal R call
         log("here is it: $providerIndex");
-        log("here is it: ${msg.senderUserID}");
+        log("here is it: ${msg.receiverUserID}");
         log("here is it: ${context.read<RequestsVM>().myFilteredRequests.first.customerUserID.toString()}");
         if (providerIndex != -1) {
           context.read<RequestsVM>().addChatMessagesInRequestsModel(msg: msg, index: providerIndex);
@@ -222,6 +223,8 @@ class ChatVM extends ChangeNotifier {
         requestID: requestId,
         senderName: name,
         senderUserID: userId,
+        chatMessageTypeEnum: ChatMessageTypeEnum.freeText,
+        receiverUserID: receiverId,
       );
 
       if (AppState().currentAppType == AppType.customer) {
@@ -230,7 +233,7 @@ class ChatVM extends ChangeNotifier {
           serviceProviderOffersList[providerIndex].chatMessages!.add(chatMessageModel);
         }
       } else {
-        int providerIndex = context.read<RequestsVM>().myFilteredRequests.indexWhere((element) => element.customerID == receiverId);
+        int providerIndex = context.read<RequestsVM>().myFilteredRequests.indexWhere((element) => element.customerUserID == receiverId);
         if (providerIndex != -1) {
           context.read<RequestsVM>().addChatMessagesInRequestsModel(msg: chatMessageModel, index: providerIndex);
         }

lib/view_models/requests_view_model.dart

@@ -241,8 +241,7 @@ class RequestsVM extends BaseVM {
   }
 
   //Request Management
-  String price = "",
-      description = "";
+  String price = "", description = "";
 
   updatePrice(String v) {
     price = v;
@@ -255,9 +254,7 @@ class RequestsVM extends BaseVM {
   Future<VehiclePostingImages> convertFileToRequestPostingImages({required File file}) async {
     List<int> imageBytes = await file.readAsBytes();
     String image = base64Encode(imageBytes);
-    String fileName = file.path
-        .split('/')
-        .last;
+    String fileName = file.path.split('/').last;
     VehiclePostingImages vehiclePostingImages = VehiclePostingImages(
       imageName: fileName,
       imageStr: image,
@@ -404,7 +401,7 @@ class RequestsVM extends BaseVM {
     notifyListeners();
   }
 
-  Future<void> onSendOfferPressed({ 
+  Future<void> onSendOfferPressed({
     required BuildContext context,
     required String receiverId,
     required String message,
@@ -425,20 +422,29 @@ class RequestsVM extends BaseVM {
         context: context,
       );
 
-
       if (status) {
         final senderName = AppState().getUser.data!.userInfo!.firstName;
         final senderId = AppState().getUser.data!.userInfo!.userId;
         // resetSendOfferBottomSheet();
         Navigator.pop(context);
         ChatMessageModel chatMessageModel = ChatMessageModel(
-          isMyMessage: true,
-          chatText: message,
-          messageType: ChatMessageTypeEnum.freeText.getIdFromChatMessageTypeEnum(),
-          senderName: senderName,
-          senderUserID: senderId,
-          receiverUserID: receiverId
-        );
+            isMyMessage: true,
+            chatText: message,
+            messageType: ChatMessageTypeEnum.offer.getIdFromChatMessageTypeEnum(),
+            senderName: senderName,
+            senderUserID: senderId,
+            receiverUserID: receiverId,
+            chatMessageTypeEnum: ChatMessageTypeEnum.offer,
+            requestID: requestModel.id,
+            offerStatus: RequestOfferStatusEnum.offer.getIdFromRequestOfferStatusEnum(),
+            reqOffer: ReqOffer(
+              offerStatus: RequestOfferStatusEnum.offer.getIdFromRequestOfferStatusEnum(),
+              requestID: requestModel.id,
+              price: double.parse(offerPrice),
+              requestOfferStatusEnum: RequestOfferStatusEnum.offer,
+              comment: message,
+              offerStatusText: "",
+            ));
         context.read<ChatVM>().onNewMessageReceived(messages: [chatMessageModel], context: context);
         if (!isFromChatScreen) {
           ChatViewArguments chatViewArguments = ChatViewArguments(

lib/views/chat/chat_view.dart

@@ -146,12 +146,12 @@ class ChatView extends StatelessWidget {
                           size: 30,
                         ).onPress(
                           () async {
-                            log("chatViewArguments.receiverId:${chatViewArguments.receiverId}");
+                            log("chatViewArguments.requestId:${chatViewArguments.requestId}");
                             final status = await chatVM.onTextMessageSend(
                               context: context,
                               receiverId: chatViewArguments.receiverId,
                               message: chatVM.chatMessageText,
-                              requestId: chatViewArguments.chatTypeEnum == ChatTypeEnum.requestOffer ? chatViewArguments.requestId ?? 0 : 0,
+                              requestId: chatViewArguments.requestId ?? 0,
                               offerPrice: "0.0",
                               chatMessageType: ChatMessageTypeEnum.freeText,
                             );
@@ -253,7 +253,7 @@ class _ChatMessageCustomWidgetState extends State<ChatMessageCustomWidget> {
             Row(
               crossAxisAlignment: CrossAxisAlignment.end,
               children: [
-                "${chatMessageModel.reqOffer!.price}".toText(fontSize: 19, isBold: true, color: MyColors.white),
+                "${chatMessageModel.reqOffer!.price}".toText(fontSize: 19, isBold: true, color: AppState().currentAppType == AppType.provider ? MyColors.white : MyColors.darkTextColor),
                 5.width,
                 "SAR".toText(color: MyColors.lightTextColor, height: 2.2, fontSize: 10, isBold: true),
               ],
@@ -361,6 +361,9 @@ class _ChatMessageCustomWidgetState extends State<ChatMessageCustomWidget> {
 
   @override
   Widget build(BuildContext context) {
+    log("here message type : ${widget.chatMessageModel.chatMessageTypeEnum}");
+    log("here message type : ${widget.chatMessageModel.chatText}");
+
     return Directionality(
       textDirection: (widget.chatMessageModel.isMyMessage ?? false) ? TextDirection.rtl : TextDirection.ltr,
       // textDirection: (widget.chatMessageModel.isMyMessage ?? false) ? TextDirection.rtl : TextDirection.ltr,