Fix transmitter name in package history

lib/models/my_package_model.dart

@@ -58,12 +58,14 @@ class PackageHistoryObject extends Equatable {
   final String userHistoryName;
   final String userHistoryId;
   final String userHistoryPhon;
+  final String? userTransferName;
   PackageHistoryObject({
     required this.fromDate,
     required this.toDate,
     required this.userHistoryName,
     required this.userHistoryId,
     required this.userHistoryPhon,
+    required this.userTransferName
   });
 
   @override

lib/pages/MyPackagesPages/my_packages_history_screen.dart

@@ -39,10 +39,7 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
   void didChangeDependencies() {
     if (_isInit) {
       packageData =
-      ModalRoute
+          ModalRoute.of(context)!.settings.arguments as MyPackageResultObject?;
-          .of(context)!
-          .settings
-          .arguments as MyPackageResultObject?;
       var _id = packageData!.id;
       var myPackageResults = Provider.of<MyPackageProvider>(context);
       myPackageResults.setLoading();
@@ -72,14 +69,17 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
     final _media = MediaQuery.of(context);
     final double _deviceWidth = _media.size.width;
     final double _deviceBlockSize = _deviceWidth / 100;
-    final userData = Provider
+    final userData = Provider.of<Auth>(context, listen: false).user;
-        .of<Auth>(context, listen: false)
-        .user;
     return SafeArea(
       child: Scaffold(
         appBar: AppBar(
           titleSpacing: -10,
-          title: Text('My Packages', style: TextStyle(color: Colors.white,),),
+          title: Text(
+            'My Packages',
+            style: TextStyle(
+              color: Colors.white,
+            ),
+          ),
           backgroundColor: Colors.black,
           leading: IconButton(
             icon: Icon(
@@ -152,9 +152,6 @@ class _MyPackagesHistoryScreenState extends State<MyPackagesHistoryScreen> {
                                               deviceBlockSize: _deviceBlockSize,
                                               user: packageResults
                                                   .packageHistory![index],
-                                  transmitterName: !(index ==
-                                      (packageResults.packageHistory!.length -
-                                          1)) ? packageResults.packageHistory![index + 1].userHistoryName : null,
                                             ),
                                             SizedBox(
                                               height: 20.0,

lib/providers/my_packages.dart

@@ -11,12 +11,15 @@ class MyPackageProvider extends ChangeNotifier {
   String searchBoxValue = '';
   bool filterOn = false;
   List<MyPackageResultObject>? myPackages;
+
   // List<MyPackageResultObject>? hospitalPackages;
 
   List<MyPackageResultObject>? originalMyPackages;
+
   // List<MyPackageResultObject>? originalHospitalPackages;
 
   List<MyPackageResultObject>? originalMyPackagesRequests;
+
   // List<MyPackageResultObject>? originalHospitalPackagesRequests;
 
   List<PackageHistoryObject>? packageHistory;
@@ -27,8 +30,10 @@ class MyPackageProvider extends ChangeNotifier {
     // udi: '',
   );
   int pageNumber = 1;
+
   void resetPageNumber() => pageNumber = 1;
   bool isloading = false;
+
   void resetLoading() {
     isloading = false;
     notifyListeners();
@@ -227,6 +232,9 @@ class MyPackageProvider extends ChangeNotifier {
           userHistoryName: transfer['user']['name'].toString(),
           userHistoryId: transfer['user']['id'].toString(),
           userHistoryPhon: transfer['user']['cell_number'].toString(),
+          userTransferName: transfer['userTransfer'] != null
+              ? transfer['userTransfer']['name'].toString()
+              : null,
         ),
       );
     }

lib/widgets/MyPackagesScreens/History/user_package_history_box.dart

@@ -3,13 +3,11 @@ import 'package:flutter/material.dart';
 
 class UserPackageDataBox extends StatelessWidget {
   final PackageHistoryObject? user;
-  final String? transmitterName;
 
   const UserPackageDataBox({
     Key? key,
     required double deviceBlockSize,
     this.user,
-    this.transmitterName
   })  : _deviceBlockSize = deviceBlockSize,
         super(key: key);
 
@@ -42,7 +40,7 @@ class UserPackageDataBox extends StatelessWidget {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
                 Container(
-                  width: 30 * _deviceBlockSize,
+                  width: 25 * _deviceBlockSize,
                   child: Text(
                     user!.userHistoryName,
                     style: TextStyle(
@@ -52,7 +50,7 @@ class UserPackageDataBox extends StatelessWidget {
                   ),
                 ),
                 Container(
-                  width: 30 * _deviceBlockSize,
+                  width: 25 * _deviceBlockSize,
                   child: Text(
                     user!.userHistoryPhon,
                     style: TextStyle(
@@ -64,25 +62,27 @@ class UserPackageDataBox extends StatelessWidget {
                 ),
               ],
             ),
-            SizedBox(
+            Row(
-              width: 3 * _deviceBlockSize,
+              children: [
-            ),
-            Row(children: [
                 Text(
-                "Transmitter : ",
+                  user!.userTransferName != null ? "Transmitter : " : "",
                   style: TextStyle(
                     fontSize: 3 * _deviceBlockSize,
                     fontWeight: FontWeight.w700,
                   ),
                 ),
-              Text(
+                Container(
-                transmitterName ?? "null",
+                  width: 25 * _deviceBlockSize,
+                  child: Text(
+                    user!.userTransferName ?? "",
                     style: TextStyle(
                       fontSize: 3 * _deviceBlockSize,
                       fontWeight: FontWeight.w700,
                     ),
                   ),
-            ],),
+                ),
+              ],
+            ),
           ],
         ),
       ),