Update: 2026-08-01 05:29:35

intaleq_driver/lib/controller/auth/captin/login_captin_controller.dart

@@ -449,13 +449,8 @@ class LoginDriverController extends GetxController {
             box.write(BoxName.carTypeOfDriver, 'Awfar Car');
           }
 
-          // ✅ الحصول على توكن access بدل registration قبل أي طلبات بعد تسجيل الدخول
-          Log.print('🔑 Getting access token after login...');
-          String fingerPrint = await DeviceHelper.getDeviceFingerprint();
-          // await storage.write(
-          //     key: BoxName.fingerPrint, value: fingerPrint.toString());
-          // await getJWT();
-          // Log.print('🔑 Access token obtained.');
+          // (لا داعي لتوليد توكن جديد هنا، فعملية OTP قد زودتنا بتوكن Access صحيح وتم حفظه في الذاكرة)
+          Log.print('✅ Access token is already saved from the login process.');
 
 // add invitations
           if (box.read(BoxName.isInstall) == null ||
@@ -483,6 +478,8 @@ class LoginDriverController extends GetxController {
               final serverFp = serverData['data'][0]['fingerPrint'].toString();
               final tokenMismatch =
                   storedToken.isNotEmpty && serverToken != storedToken;
+              
+              String fingerPrint = await DeviceHelper.getDeviceFingerprint();
               Log.print(
                   '🔍 [FP_COMPARE] serverFp: $serverFp | localFp: ${fingerPrint.toString()} | tokenMismatch: $tokenMismatch | serverToken: $serverToken | storedToken: $storedToken');
               if (tokenMismatch) {

intaleq_driver/lib/controller/auth/captin/phone_helper_controller.dart

@@ -88,6 +88,12 @@ class PhoneAuthHelper {
           if (isRegistered) {
             // ✅ السائق مسجل مسبقًا - سجل دخوله واذهب إلى الصفحة الرئيسية
             final driver = data['message']['driver'];
+            final jwt = data['message']['jwt'];
+            
+            if (jwt != null) {
+              await storage.write(key: BoxName.jwt, value: jwt.toString());
+            }
+
             // mySnackbarSuccess('Welcome back, ${driver['first_name']}!');
 
             // حفظ بيانات السائق إذا أردت:

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

@@ -45,7 +45,7 @@ class DestinationController extends GetxController {
 
       if (response != null && response is Map && response['status'] == 'success') {
         final data = response['message'];
-        if (data != null) {
+        if (data != null && 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);

intaleq_driver/lib/controller/home/captin/home_captain_controller.dart

@@ -939,7 +939,7 @@ class HomeCaptainController extends GetxController {
   bool isZeroCommissionActive = false;
 
   getCountRideToday() async {
-    var res = await CRUD().get(
+    var res = await CRUD().getWallet(
         link: AppLink.getCountRide,
         payload: {'driver_id': box.read(BoxName.driverID).toString()});
     data = jsonDecode(res);