From 5b9e11da5a7b1e3b5a09529514e9ed6a0b98f9d7 Mon Sep 17 00:00:00 2001
From: jantunesmesias <jantunesmessias@gmail.com>
Date: Fri, 2 Aug 2024 13:03:09 -0300
Subject: [PATCH] WIP

---
 .../message_history_page_widget.dart           | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/pages/message_history_page/message_history_page_widget.dart b/lib/pages/message_history_page/message_history_page_widget.dart
index 217a73a8..7d141108 100644
--- a/lib/pages/message_history_page/message_history_page_widget.dart
+++ b/lib/pages/message_history_page/message_history_page_widget.dart
@@ -171,10 +171,10 @@ Widget liberationDynamicListView(
     width: double.infinity,
     height: double.infinity,
     decoration: const BoxDecoration(),
-    child: FutureBuilder<ApiCallResponse>(
+    child: FutureBuilder<dynamic>(
       future: Future(() async {
         try {
-          return await PhpGroup.getMessagesCall.call(
+          var response = await PhpGroup.getMessagesCall.call(
             devUUID: FFAppState().devUUID.toString(),
             userUUID: FFAppState().userUUID.toString(),
             cliID: FFAppState().cliUUID.toString(),
@@ -183,9 +183,10 @@ Widget liberationDynamicListView(
             pageNumber: '1',
             tipoDestino: DestIndex,
           );
+          return response.jsonBody;
         } catch (error) {
           log('Error: ${error.toString()}');
-          throw error;
+          return {'mensagens': [], 'total_rows': 0};
         }
       }),
       builder: (context, snapshot) {
@@ -201,15 +202,18 @@ Widget liberationDynamicListView(
             ),
           );
         }
-        if (snapshot.hasError == true || snapshot.data == null) {
+        if (snapshot.hasError == true ||
+            snapshot.data == null ||
+            !snapshot.hasData ||
+            snapshot.hasError) {
           log('Error: ${snapshot.error.toString()}');
           // log('Error: ${snapshot.data!.jsonBody['mensagens']}');
           return const Center(
             child: Text('Erro ao carregar mensagens'),
           );
         }
-        final mensagens = snapshot.data!.jsonBody['mensagens'];
-        final totalRows = snapshot.data!.jsonBody['total_rows'];
+        final mensagens = snapshot.data!['mensagens'];
+        final totalRows = snapshot.data!['total_rows'];
         if (totalRows == 0 || mensagens == null || mensagens.isEmpty) {
           return const Center(
             child: Text('Nenhuma mensagem encontrada'),
@@ -223,7 +227,7 @@ Widget liberationDynamicListView(
           itemBuilder: (BuildContext context, int index) {
             return messageHistoryItem(
               context,
-              snapshot.data!.jsonBody['mensagens'][index],
+              snapshot.data!['mensagens'][index],
             );
           },
         );