diff --git a/lib/api/eit_api_client.dart b/lib/api/eit_api_client.dart index d473aaf..67f155a 100644 --- a/lib/api/eit_api_client.dart +++ b/lib/api/eit_api_client.dart @@ -25,16 +25,23 @@ class EITApiClient { postParams.addAll(AppState().postParamsJson); return await ApiClient().postJsonForObject( (json) { + // Check if GetEITTransactionList exists and is not empty + if (json['GetEITTransactionList'] == null || (json['GetEITTransactionList'] is List && json['GetEITTransactionList'].isEmpty)) { + return isCompleteList ? >[] : []; + } + if (isCompleteList) { List> responseData = []; json['GetEITTransactionList'].forEach((element) { var transactionList = GetEitTransactionsModel.fromJson(element).collectionTransaction; - if (transactionList != null) responseData.add(transactionList); + if (transactionList != null && transactionList.isNotEmpty) { + responseData.add(transactionList); + } }); return responseData; } else { List? responseData = GetEitTransactionsModel.fromJson(json['GetEITTransactionList'][0]).collectionTransaction; - return responseData; + return responseData ?? []; } }, url, diff --git a/lib/ui/screens/ticket/ticket_detailed_screen.dart b/lib/ui/screens/ticket/ticket_detailed_screen.dart index 3e8d0b1..f5b3583 100644 --- a/lib/ui/screens/ticket/ticket_detailed_screen.dart +++ b/lib/ui/screens/ticket/ticket_detailed_screen.dart @@ -115,13 +115,12 @@ class _TicketDetailedScreenState extends State { ), ), const SizedBox(height: 21), - dashboardProviderModel == null && dashboardProviderModel!.ticketHistoryTransactionList == null - ? const SizedBox() - : ListView( + (dashboardProviderModel != null && dashboardProviderModel!.ticketHistoryTransactionList != null && dashboardProviderModel!.ticketHistoryTransactionList!.isNotEmpty) + ? ListView( shrinkWrap: true, physics: const NeverScrollableScrollPhysics(), children: [ - "Tickets History".toText20().expanded, + "Tickets History".toText20(), 12.height, ListView.separated( physics: const NeverScrollableScrollPhysics(), @@ -219,7 +218,8 @@ class _TicketDetailedScreenState extends State { itemCount: dashboardProviderModel!.ticketHistoryTransactionList!.length, ), ], - ), + ) + : const SizedBox(), ], ], ).expanded,