diff --git a/lib/views/pages/device_transfer/device_transfer_details.dart b/lib/views/pages/device_transfer/device_transfer_details.dart
index 1d6ab135..8c87e347 100644
--- a/lib/views/pages/device_transfer/device_transfer_details.dart
+++ b/lib/views/pages/device_transfer/device_transfer_details.dart
@@ -181,15 +181,11 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
             ),
             if ((_userProvider.user?.type == UsersTypes.engineer))
               if (isSender
-                  ? (_model?.senderMachineStatusName?.toLowerCase() != "closed" && _model?.senderMachineStatusName?.toLowerCase() != "completed")
-                  : (_model?.receiverMachineStatusName?.toLowerCase() != "closed" && _model?.receiverMachineStatusName?.toLowerCase() != "completed"))
-                "edit".toSvgAsset(height: 48, width: 48).onPress(isSender
-                    ? () {
-                        Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender)));
-                      }
-                    : () {
-                        Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender)));
-                      }),
+                  ? ((_model?.senderMachineStatusName?.toLowerCase()?.contains("close") ?? false) && (_model?.senderMachineStatusName?.toLowerCase()?.contains("complete") ?? false))
+                  : ((_model?.receiverMachineStatusName?.toLowerCase()?.contains("close") ?? false) && (_model?.receiverMachineStatusName?.toLowerCase()?.contains("complete") ?? false)))
+                "edit".toSvgAsset(height: 48, width: 48).onPress(() {
+                  Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender)));
+                }),
           ],
         ),
         _buildTextWidget('${context.translation.site} : $site'),
diff --git a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart
index d53ef841..c2515011 100644
--- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart
+++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart
@@ -319,7 +319,7 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
                             controller: _partQtyController,
                             spareParts: _spareParts,
                             initialList: _serviceReport.sparePartsWorkOrders,
-                            onAdd: (parts) {
+                            onChange: (parts) {
                               _serviceReport.sparePartsWorkOrders = parts;
                             },
                           ),
diff --git a/lib/views/pages/user/requests/work_order/create_service_report.dart b/lib/views/pages/user/requests/work_order/create_service_report.dart
index 1c654f11..d4e928be 100644
--- a/lib/views/pages/user/requests/work_order/create_service_report.dart
+++ b/lib/views/pages/user/requests/work_order/create_service_report.dart
@@ -273,7 +273,7 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
                         controller: _partQtyController,
                         spareParts: _spareParts,
                         initialList: _serviceReport.sparePartsWorkOrders,
-                        onAdd: (parts) {
+                        onChange: (parts) {
                           _serviceReport.sparePartsWorkOrders = parts;
                         },
                       ),
diff --git a/lib/views/pages/user/requests/work_order/edit_service_report.dart b/lib/views/pages/user/requests/work_order/edit_service_report.dart
index a15d62b6..e2d617c9 100644
--- a/lib/views/pages/user/requests/work_order/edit_service_report.dart
+++ b/lib/views/pages/user/requests/work_order/edit_service_report.dart
@@ -258,7 +258,7 @@ class _EditServiceReportState extends State<EditServiceReport> with TickerProvid
                         controller: _partQtyController,
                         spareParts: _spareParts,
                         initialList: _serviceReport.sparePartsWorkOrders,
-                        onAdd: (parts) {
+                        onChange: (parts) {
                           _serviceReport.sparePartsWorkOrders = parts;
                         },
                       ),
diff --git a/lib/views/pages/user/requests/work_order/part_no_button.dart b/lib/views/pages/user/requests/work_order/part_no_button.dart
index 8a38eb3d..af32e3c5 100644
--- a/lib/views/pages/user/requests/work_order/part_no_button.dart
+++ b/lib/views/pages/user/requests/work_order/part_no_button.dart
@@ -16,8 +16,8 @@ class PartNoButton extends StatefulWidget {
   final List<SparePart> spareParts;
   final List<SparePartsWorkOrders> initialList;
   final TextEditingController controller;
-  final Function(List<SparePartsWorkOrders> sparePart) onAdd;
-  const PartNoButton({@required this.spareParts, @required this.controller, this.initialList, this.onAdd, Key key}) : super(key: key);
+  final Function(List<SparePartsWorkOrders> sparePart) onChange;
+  const PartNoButton({@required this.spareParts, @required this.controller, this.initialList, this.onChange, Key key}) : super(key: key);
 
   @override
   State<PartNoButton> createState() => _PartNoButtonState();
@@ -95,7 +95,7 @@ class _PartNoButtonState extends State<PartNoButton> {
               if (current != null && _formKey.currentState.validate()) {
                 _formKey.currentState.save();
                 list.add(current);
-                if (widget.onAdd != null) widget.onAdd(list);
+                if (widget.onChange != null) widget.onChange(list);
                 current = SparePartsWorkOrders();
                 widget.controller.text = "";
                 setState(() {});
@@ -119,7 +119,7 @@ class _PartNoButtonState extends State<PartNoButton> {
                   32.width,
                   "trash".toSvgAsset().onPress(() {
                     list.remove(list[index]);
-                    if (widget.onAdd != null) widget.onAdd(list);
+                    if (widget.onChange != null) widget.onChange(list);
                     setState(() {});
                   }),
                 ],