finnish

lib/pages/vehicles_on_the_property/vehicle_history_screen.dart

@@ -77,34 +77,44 @@ class _VehicleHistoryScreenState extends State<VehicleHistoryScreen>
       child: FutureBuilder<void>(
         future: widget._future,
         builder: (context, snapshot) {
-          return ListView.builder(
+          if (snapshot.connectionState == ConnectionState.waiting) {
-            shrinkWrap: true,
+            return Center(child: CircularProgressIndicator());
-            physics: const BouncingScrollPhysics(),
+          } else if (snapshot.hasError) {
-            controller: _scrollController,
+            return Center(child: Text('Error: ${snapshot.error}'));
-            itemCount: widget._wrap.length + 1,
+          } else {
-            itemBuilder: (context, index) {
+            return ListView.builder(
-              if (index == 0) {
+              shrinkWrap: true,
-                return _buildHeader(context, limitedBodyTextSize);
+              physics: const BouncingScrollPhysics(),
-              } else {
+              controller: _scrollController,
-                Map<String, dynamic> item = widget._wrap[index - 1];
+              itemCount: widget._wrap.length + 1,
-                return FutureBuilder<Widget>(
+              itemBuilder: (context, index) {
-                  future: _item(context, item),
+                if (index == 0) {
-                  builder: (context, snapshot) {
+                  return _buildHeader(context, limitedBodyTextSize);
-                    if (snapshot.connectionState == ConnectionState.done) {
+                } else {
-                      return snapshot.data ?? Container();
+                  Map<String, dynamic> item = widget._wrap[index - 1];
-                    } else {
+                  return _buildVehicleItem(context, item);
-                      return Center(child: CircularProgressIndicator());
+                }
-                    }
+              },
-                  },
+            );
-                );
+          }
-              }
-            },
-          );
         },
       ),
     );
   }
 
+  Widget _buildVehicleItem(BuildContext context, Map<String, dynamic> item) {
+    return FutureBuilder<Widget>(
+      future: _item(context, item),
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.done) {
+          return snapshot.data ?? Container();
+        } else {
+          return Center(child: CircularProgressIndicator());
+        }
+      },
+    );
+  }
+
   Widget _buildHeader(BuildContext context, double limitedBodyTextSize) {
     log('amountRegister: ${widget.model.amountRegister}');
     return Padding(
@@ -215,8 +225,11 @@ mixin _FetchingMixin on State<VehicleHistoryScreen> {
 mixin _CardItemMixin on _FetchingMixin {
   Future<Widget> _item(BuildContext context, Map<String, dynamic> uItem) async {
     final bool? isOwner = uItem['isOwnerVehicle'];
-    final IconData iconData =
+    final IconData? iconData = isOwner == null
-        isOwner == true ? Symbols.no_crash : Symbols.directions_car;
+        ? null
+        : isOwner == true
+            ? Symbols.no_crash
+            : Symbols.directions_car;
     final FreCardIcon? cardIcon = isOwner != null
         ? FreCardIcon(
             height: 50,

lib/pages/vehicles_on_the_property/vehicle_model.dart

@@ -237,15 +237,19 @@ mixin _VehicleUpdateScreenModel on _BaseVehiclePage {
 
 /// [_VehicleHistoryScreenModel] is a mixin that contains the business logic of the vehicle history page.
 mixin _VehicleHistoryScreenModel on _BaseVehiclePage {
-  Future<Map<String, Color>?> generateStatusColorMap(
+  Future<Map<String, Color>?>? generateStatusColorMap(
       dynamic uItem, bool isDetail) async {
     final autoApproval =
         await StorageHelper().get(LocalsStorageKey.vehicleAutoApproval.key);
     if (autoApproval.toBoolean == true) return null;
-
     final theme = FlutterFlowTheme.of(context);
     final localization = FFLocalizations.of(context);
 
+    final status = uItem['status'];
+    final isOwner = uItem['isOwnerVehicle'];
+
+    if (isOwner == null && status == null) return null;
+
     String byLanguage(String en, String pt) =>
         localization.getVariableText(enText: en, ptText: pt);
 
@@ -276,9 +280,6 @@ mixin _VehicleHistoryScreenModel on _BaseVehiclePage {
       },
     };
 
-    final status = uItem['status'];
-    final isOwner = uItem['isOwnerVehicle'];
-
     if (vehicleStatusMap.containsKey(status)) {
       final statusMap = {
         vehicleStatusMap[status]!['text'] as String:
@@ -311,6 +312,7 @@ mixin _VehicleHistoryScreenModel on _BaseVehiclePage {
         width: 1,
       ),
     );
+    if (item['status'] == null) return [];
 
     final updateText = FFLocalizations.of(context)
         .getVariableText(ptText: 'Editar', enText: 'Edit');