Update: 2026-08-08 14:09:20

siro_driver/lib/controller/home/captin/destination_controller.dart

@@ -45,7 +45,10 @@ class DestinationController extends GetxController {
 
       if (response != null && response is Map && response['status'] == 'success') {
         final data = response['message'];
-        if (data != null) {
+        // عند غياب وجهة نشطة يردّ السيرفر نصاً ("No active destination set.")
+        // لا خريطة، وفهرسته كخريطة كان يرمي
+        // type 'String' is not a subtype of type 'int'.
+        if (data is Map) {
           final lat = double.tryParse(data['target_latitude']?.toString() ?? '0') ?? 0.0;
           final lng = double.tryParse(data['target_longitude']?.toString() ?? '0') ?? 0.0;
           activeLatLng = LatLng(lat, lng);

siro_driver/lib/controller/home/payment/captain_wallet_controller.dart

@@ -10,6 +10,7 @@ import 'package:siro_driver/constant/box_name.dart';
 import 'package:siro_driver/constant/links.dart';
 import 'package:siro_driver/controller/functions/crud.dart';
 import 'package:siro_driver/main.dart';
+import 'package:siro_driver/print.dart';
 import 'package:siro_driver/views/widgets/mycircular.dart';
 
 import '../../../views/home/my_wallet/payment_screen_mtn.dart';
@@ -88,9 +89,36 @@ class CaptainWalletController extends GetxController {
   }
 
   Future refreshCaptainWallet() async {
-    await getCaptainWalletFromRide();
-    await getCaptainWalletFromBuyPoints();
-    // await checkAccountCaptainBank();
+    // ═══════════════════════════════════════════════════════════════
+    // ‏isLoading كان يُطفأ في نهاية الدالة الثانية فقط. أي استثناء قبلها
+    // ‏— وأشهره سائق بلا أي دفعات، إذ يعود message = [] فيرمي فهرسه
+    // ‏[0] خطأ نطاق — كان يترك الشاشة تدور بلا نهاية بلا رسالة.
+    // ‏finally يضمن إطفاءه مهما حدث.
+    // ═══════════════════════════════════════════════════════════════
+    isLoading = true;
+    update();
+    try {
+      await getCaptainWalletFromRide();
+      await getCaptainWalletFromBuyPoints();
+      // await checkAccountCaptainBank();
+    } catch (e) {
+      Log.print('❌ refreshCaptainWallet: $e');
+      mySnackbarError('Connection problem, please try again'.tr);
+    } finally {
+      isLoading = false;
+      update();
+    }
+  }
+
+  /// ‏يقرأ رقماً من ردّ المحفظة بأمان: الردّ قد يكون خريطة بلا `message`،
+  /// ‏أو قائمة فارغة (سائق جديد بلا دفعات) — وكلاهما كان يُسقط الشاشة.
+  static String _readWalletNumber(dynamic decoded, String key) {
+    if (decoded is! Map) return '0';
+    final message = decoded['message'];
+    if (message is! List || message.isEmpty) return '0';
+    final first = message.first;
+    if (first is! Map) return '0';
+    return first[key]?.toString() ?? '0';
   }
 
   List amountToNewDriverMap = [];
@@ -122,23 +150,27 @@ class CaptainWalletController extends GetxController {
   }
 
   Future getCaptainWalletFromRide() async {
-    isLoading = true;
-    update();
     var res = await CRUD().getWallet(
       link: AppLink.getAllPaymentFromRide,
       payload: {'driverID': box.read(BoxName.driverID).toString()},
     );
-    // isLoading = false;
+
     if (res != 'failure') {
-      walletDate = jsonDecode(res);
-      totalAmount = walletDate['message'][0]['total_amount'] ?? '0';
+      final decoded = jsonDecode(res);
+      walletDate = decoded is Map ? decoded : {};
+      totalAmount = _readWalletNumber(decoded, 'total_amount');
       update();
+
       var res1 = await CRUD().getWallet(
           link: AppLink.getAllPaymentVisa,
           payload: {'driverID': box.read(BoxName.driverID).toString()});
-      walletDateVisa = jsonDecode(res1);
-      totalAmountVisa = walletDateVisa['message'][0]['diff'].toString();
-
+      if (res1 != 'failure') {
+        final decodedVisa = jsonDecode(res1);
+        walletDateVisa = decodedVisa is Map ? decodedVisa : {};
+        totalAmountVisa = _readWalletNumber(decodedVisa, 'diff');
+      } else {
+        totalAmountVisa = '0';
+      }
       update();
     } else {
       totalAmount = "0";
@@ -147,21 +179,16 @@ class CaptainWalletController extends GetxController {
   }
 
   Future getCaptainWalletFromBuyPoints() async {
-    // isLoading = true;
-    update();
-
     var res = await CRUD().getWallet(
       link: AppLink.getDriverPaymentPoints,
       payload: {'driverID': box.read(BoxName.driverID).toString()},
     );
-    isLoading = false;
-    // update();
 
     if (res != 'failure') {
-      walletDriverPointsDate = jsonDecode(res);
-      double totalPointsDouble = double.parse(
-          walletDriverPointsDate['message'][0]['total_amount'].toString());
-      totalPoints = totalPointsDouble.toStringAsFixed(0);
+      final decoded = jsonDecode(res);
+      walletDriverPointsDate = decoded is Map ? decoded : {};
+      final raw = _readWalletNumber(decoded, 'total_amount');
+      totalPoints = (double.tryParse(raw) ?? 0).toStringAsFixed(0);
     } else {
       totalPoints = '0';
     }