diff --git a/lib/models/device/asset_transfer.dart b/lib/models/device/asset_transfer.dart
index 58fad7e7..db4c9900 100644
--- a/lib/models/device/asset_transfer.dart
+++ b/lib/models/device/asset_transfer.dart
@@ -178,10 +178,9 @@ class AssetTransfer {
         receiverAttachments!.add(AssetTransferAttachment.fromJson(v));
       });
     }
-    if(senderAttachments!=null){
+    if (senderAttachments != null) {
       attachments = senderAttachments;
-    }
-    else if(receiverAttachments!=null){
+    } else if (receiverAttachments != null) {
       attachments = receiverAttachments;
     }
     print('sender attachment i got is ${senderAttachments?.length}');
@@ -544,7 +543,7 @@ class AssetTransfer {
     map['id'] = id;
     map['statusValue'] = statusValue;
     map['isSender'] = isSender;
-    map['techComment'] = comment;
+    map['techComment'] = isSender! ? senderComment : receiverComment;
     map['assetTransferAssistantEmployees'] = modelAssistantEmployees;
     map['assetTransferEngineerTimers'] = assetTransferEngineerTimers;
     if (attachments != null) {
@@ -554,10 +553,10 @@ class AssetTransfer {
       map['assetTransferEngineerTimers'] = assetTransferEngineerTimers!.map((v) => v.toJson()).toList();
     }
     if (modelAssistantEmployees != null) {
-      if(modelAssistantEmployees!.employeeId!=null) {
+      if (modelAssistantEmployees!.employeeId != null) {
         map['assetTransferAssistantEmployees'] = [modelAssistantEmployees!.toJson()];
-      }else {
-        map['assetTransferAssistantEmployees'] =[];
+      } else {
+        map['assetTransferAssistantEmployees'] = [];
       }
     }
     return map;
diff --git a/lib/views/pages/device_transfer/update_device_transfer.dart b/lib/views/pages/device_transfer/update_device_transfer.dart
index 7e4071dd..fb629265 100644
--- a/lib/views/pages/device_transfer/update_device_transfer.dart
+++ b/lib/views/pages/device_transfer/update_device_transfer.dart
@@ -1,4 +1,3 @@
-
 //older code.
 // import 'dart:convert';
 // import 'dart:io';
@@ -334,6 +333,7 @@
 
 import 'dart:convert';
 import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:provider/provider.dart';
@@ -355,6 +355,7 @@ import 'package:test_sa/views/widgets/date_and_time/date_picker.dart';
 import 'package:test_sa/views/widgets/images/multi_image_picker.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/status/report/service_report_assistant_employee_menu.dart';
+
 import '../../../extensions/text_extensions.dart';
 import '../../../models/ppm/ppm.dart';
 import '../../../new_views/app_style/app_color.dart';
@@ -637,12 +638,11 @@ class _AssistantEmployeeCardState extends State<AssistantEmployeeCard> {
       employeeList = widget.formModel!.assetTransferAssistantEmployeesReceiver ?? [];
     }
 
-
-    widget.formModel?.modelAssistantEmployees = employeeList.isEmpty ?  AssetTransferAssistantEmployees():employeeList[0];
+    widget.formModel?.modelAssistantEmployees = employeeList.isEmpty ? AssetTransferAssistantEmployees() : employeeList[0];
 
     AssignedEmployee? assignedUser = AssignedEmployee();
-    if(employeeList.isNotEmpty){
-      assignedUser=  AssignedEmployee(
+    if (employeeList.isNotEmpty) {
+      assignedUser = AssignedEmployee(
         id: employeeList[0].employeeId,
         name: employeeList[0].employeeName,
       );