diff --git a/lib/controllers/providers/api/device_transfer_provider.dart b/lib/controllers/providers/api/device_transfer_provider.dart
index faebf334..1d2dc0b7 100644
--- a/lib/controllers/providers/api/device_transfer_provider.dart
+++ b/lib/controllers/providers/api/device_transfer_provider.dart
@@ -162,8 +162,8 @@ class DeviceTransferProvider extends ChangeNotifier{
     if(isSender){
       body.addAll(
         {
-          //"senderSiteId": newModel.client.id,
-          //"senderDepartmentId":  newModel.department.id,
+          "senderSiteId": newModel.client.id,
+          "senderDepartmentId":  newModel.department.id,
           "senderAssignedEmployeeId":  newModel.userId,
           "senderMachineStatusId": newModel.status.id,
           "senderComment": newModel.comment,
@@ -175,14 +175,14 @@ class DeviceTransferProvider extends ChangeNotifier{
     }else{
       body.addAll(
           {
-            //"destSiteId": newModel.client.id,
-            //"destDepartmentId":  newModel.department.id,
+            "destSiteId": newModel.client.id,
+            "destDepartmentId":  newModel.department.id,
             "receiverAssignedEmployeeId":  newModel.userId,
-            "receiverMachineStatusId": newModel.status.id,
+            "receiverMachineStatusId": newModel.status?.id??"",
             "receiverComment": newModel.comment,
             "receiverWorkingHours": newModel.workingHours,
             "receiverTravelingHours": newModel.travelingHours,
-            "receiverAttachmentName": "${DateTime.now().toIso8601String()}.png|${newModel.signature}",
+            "receiverAttachmentName": "${newModel.signature}.png",
           }
       );
     }
@@ -194,6 +194,9 @@ class DeviceTransferProvider extends ChangeNotifier{
           URLs.updateDeviceTransfer,
           body: body
       );
+
+      print(response.body);
+      print("${DateTime.now().toIso8601String()}.png|${newModel.signature}");
       // response = await post(
       //   Uri.parse("$host${URLs.updateDeviceTransfer}/$requestId"),
       //   body: body,
diff --git a/lib/controllers/providers/api/devices_provider.dart b/lib/controllers/providers/api/devices_provider.dart
index 458ed9de..acc066e4 100644
--- a/lib/controllers/providers/api/devices_provider.dart
+++ b/lib/controllers/providers/api/devices_provider.dart
@@ -72,7 +72,7 @@ class DevicesProvider extends ChangeNotifier{
     if(response.statusCode >= 200 && response.statusCode < 300) {
       // client's request was successfully received
       List equipmentListJson = json.decode(response.body)["data"];
-      _devices = equipmentListJson.map((device) => Device.fromJson(device)).toList();
+      _devices = equipmentListJson.map<Device>((device) => Device.fromJson(device)).toList();
     }
     _loading = false;
     notifyListeners();
diff --git a/lib/views/widgets/status/single_status_menu.dart b/lib/views/widgets/status/single_status_menu.dart
index 1bb1f844..22c19755 100644
--- a/lib/views/widgets/status/single_status_menu.dart
+++ b/lib/views/widgets/status/single_status_menu.dart
@@ -34,7 +34,7 @@ class _SingleStatusMenuState extends State<SingleStatusMenu> {
       }else{
         _selectedStatus =null;
       }
-      if(widget.initialStatus.id != _selectedStatus.id) {
+      if((widget.initialStatus?.id??"") != (_selectedStatus?.id??"")) {
         widget.onSelect(_selectedStatus);
       }
     } else {