Update: 2026-06-11 18:22:57

siro_rider/lib/controller/auth/otp_controller.dart

@@ -1,5 +1,4 @@
 import 'package:siro_rider/constant/links.dart';
-import 'package:siro_rider/views/home/map_page_passenger.dart';
 import 'package:get/get.dart';
 import '../../../constant/box_name.dart';
 import '../../../main.dart';
@@ -8,6 +7,7 @@ import '../../views/auth/otp_page.dart';
 import '../../views/widgets/error_snakbar.dart';
 import '../functions/crud.dart';
 import '../functions/package_info.dart';
+import '../functions/country_logic.dart';
 import 'login_controller.dart';
 
 // --- Helper Class for Phone Authentication ---
@@ -19,67 +19,13 @@ class PhoneAuthHelper {
   static final String _verifyOtpUrl = '${_baseUrl}verifyOtp.php';
   static final String _registerUrl = '${_baseUrl}register_passenger.php';
 
-  static String formatSyrianPhone(String phone) {
-    // Remove spaces, symbols, +, -, ()
-    phone = phone.replaceAll(RegExp(r'[ \-\(\)\+]'), '').trim();
-
-    // Normalize 00963 → 963
-    if (phone.startsWith('00963')) {
-      phone = phone.replaceFirst('00963', '963');
-    }
-
-    // Normalize 0963 → 963
-    if (phone.startsWith('0963')) {
-      phone = phone.replaceFirst('0963', '963');
-    }
-
-    // NEW: Fix 96309xxxx → 9639xxxx
-    if (phone.startsWith('96309')) {
-      phone = '9639' + phone.substring(5); // remove the "0" after 963
-    }
-
-    // If starts with 9630 → correct to 9639
-    if (phone.startsWith('9630')) {
-      phone = '9639' + phone.substring(4);
-    }
-
-    // If already in correct format: 9639xxxxxxxx
-    if (phone.startsWith('9639') && phone.length == 12) {
-      return phone;
-    }
-
-    // If starts with 963 but missing the 9
-    if (phone.startsWith('963') && phone.length > 3) {
-      // Ensure it begins with 9639
-      if (!phone.startsWith('9639')) {
-        phone = '9639' + phone.substring(3);
-      }
-      return phone;
-    }
-
-    // If starts with 09xxxxxxxx → 9639xxxxxxxx
-    if (phone.startsWith('09')) {
-      return '963' + phone.substring(1);
-    }
-
-    // If 9xxxxxxxx (9 digits)
-    if (phone.startsWith('9') && phone.length == 9) {
-      return '963' + phone;
-    }
-
-    // If starts with incorrect 0xxxxxxx → assume Syrian and fix
-    if (phone.startsWith('0') && phone.length == 10) {
-      return '963' + phone.substring(1);
-    }
-
-    return phone;
-  }
+  // removed formatSyrianPhone
 
   /// Sends an OTP to the provided phone number.
   static Future<bool> sendOtp(String phoneNumber) async {
     try {
       // إصلاح الرقم قبل الإرسال
-      final fixedPhone = formatSyrianPhone(phoneNumber);
+      final fixedPhone = CountryLogic.formatCurrentCountryPhone(phoneNumber);
 
       final response = await CRUD().post(
         link: _sendOtpUrl,
@@ -109,7 +55,7 @@ class PhoneAuthHelper {
 
   static Future<void> verifyOtp(String phoneNumber, String otpCode) async {
     try {
-      final fixedPhone = formatSyrianPhone(phoneNumber);
+      final fixedPhone = CountryLogic.formatCurrentCountryPhone(phoneNumber);
       final response = await CRUD().post(
         link: _verifyOtpUrl,
         payload: {