diff --git a/lib/providers/items.dart b/lib/providers/items.dart
index acca3ab..36173c4 100755
--- a/lib/providers/items.dart
+++ b/lib/providers/items.dart
@@ -368,7 +368,8 @@ class ItemProvider extends ChangeNotifier {
       createdAt: data['created_at'] != null ? data['created_at'] : '',
       udi: data['udi'] != null ? data['udi'] : '',
       status: data['status'],
-      packageId: data['package_id'].toString(),
+      packageId:
+          data['package_id'] != null ? data['package_id'].toString() : "",
       repair: data['repair'],
       filePath: mediaList,
     );
diff --git a/lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart b/lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart
index 353dcbe..e7919ed 100755
--- a/lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart
+++ b/lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart
@@ -466,15 +466,16 @@ class ItemDetailsDataBox extends StatelessWidget {
               userData['roles']?.contains('Supervisor') ||
               (userData['roles']?.contains('User') &&
                   (userData['name']?.contains(datas.userName.toString()))))
-            TransferDestroyButton(
-              deviceBlockSize: _deviceBlockSize,
-              firstColor: kDarkBlue,
-              secondColor: kDarkBlueSub,
-              text: 'Transfer',
-              onTap: () {
-                push();
-              },
-            ),
+            if (datas.status == 'approved' && datas.packageId == "")
+              TransferDestroyButton(
+                deviceBlockSize: _deviceBlockSize,
+                firstColor: kDarkBlue,
+                secondColor: kDarkBlueSub,
+                text: 'Transfer',
+                onTap: () {
+                  push();
+                },
+              ),
           // : datas.packageId != "null"
           //     ? TransferDestroyButton(
           //         deviceBlockSize: _deviceBlockSize,
@@ -486,13 +487,18 @@ class ItemDetailsDataBox extends StatelessWidget {
           //         },
           //       )
           // : Container(),
+          // if (userData['roles']?.contains('Admin') ||
+          //     userData['roles']?.contains('Supervisor'))
+          //   if (datas.repair == 0)
+          //     if (datas.packageId == "null")
           if (userData['roles']?.contains('Admin') ||
-              userData['roles']?.contains('Supervisor'))
-            if (datas.repair == 0)
-              if (datas.packageId == "null")
-                SizedBox(
-                  height: 10.0,
-                ),
+              userData['roles']?.contains('Supervisor') ||
+              (userData['roles']?.contains('User') &&
+                  (userData['name']?.contains(datas.userName.toString()))))
+            if (datas.status == 'approved' && datas.packageId == "")
+              SizedBox(
+                height: 10.0,
+              ),
           if (datas.repair == 0)
             (userData['roles']?.contains('Admin') ||
                     (userData['roles']?.contains('Supervisor') &&