Update: 2026-07-06 03:45:17

backend/api/ride/get_competitor_context.php

@@ -83,23 +83,7 @@ if ($competitorTotalPrice > 0 && $siroPrice < $competitorTotalPrice) {
 }
 
 // Format the labels
-$compNameAr = match(strtolower($topComp)) {
-    'careem'  => 'كريم',
-    'uber'    => 'أوبر',
-    'yallago' => 'يلا غو',
-    'jenny'   => 'جيني',
-    'taxif'   => 'تكسي إف',
-    'com.taxif.passenger' => 'تكسي إف',
-    'indrive' => 'إن درايف',
-    'yango'   => 'يانغو',
-    'petra'   => 'بترا رايد',
-    'petra ride' => 'بترا رايد',
-    'gojo'    => 'جو جو',
-    'didi'    => 'ديدي',
-    'zakin'   => 'زاكن',
-    'tofaddal'=> 'تفضل',
-    default   => $topComp
-};
+$compNameAr = 'التطبيقات الأخرى';
 
 $savingsLabel = "أوفر بـ " . number_format($savingsPct, 1) . "% من $compNameAr ⚡";
 

siro_rider/ios/Podfile

@@ -42,6 +42,9 @@ post_install do |installer|
       config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.1'
       # Fix for "non-modular header" issues with some pods.
       config.build_settings['CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES'] = 'YES'
+      
+      # Fix for Swift 6 concurrency errors in Xcode 16
+      config.build_settings['SWIFT_STRICT_CONCURRENCY'] = 'minimal'
 
       config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
         '$(inherited)',

siro_rider/ios/Podfile.lock

@@ -348,6 +348,6 @@ SPEC CHECKSUMS:
   WebRTC-SDK: ab9b5319e458c2bfebdc92b3600740da35d5630d
   webview_flutter_wkwebview: 8ebf4fded22593026f7dbff1fbff31ea98573c8d
 
-PODFILE CHECKSUM: bd6e2f6541b0ca1731e9c8557eb4a4f6036c5508
+PODFILE CHECKSUM: 0ae238984c6e7aa969e949a5874ab41e6db33de4
 
 COCOAPODS: 1.16.2

siro_rider/lib/views/home/map_widget.dart/car_details_widget_to_go.dart

@@ -138,7 +138,7 @@ class CarDetailsTypeToChoose extends StatelessWidget {
 
                   // ── Car Selection List ───────────────────────────────
                   SizedBox(
-                    height: 134,
+                    height: 115,
                     child: ListView.builder(
                       physics: const BouncingScrollPhysics(),
                       scrollDirection: Axis.horizontal,
@@ -158,12 +158,13 @@ class CarDetailsTypeToChoose extends StatelessWidget {
                   ),
 
                   // ── Competitor Price Savings Badge ─────────────────────
-                  if (controller.savingsLabel != null && 
+                  if (controller.savingsLabel != null &&
                       controller.savingsLabel!.isNotEmpty)
                     Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 4),
+                      padding: const EdgeInsets.symmetric(
+                          horizontal: 20, vertical: 4),
                       child: CompetitorPriceBadge(
-                        badgeText: controller.savingsLabel,
+                        savingsLabel: controller.savingsLabel,
                         savingsPercent: controller.savingsPercent ?? 0.0,
                       ),
                     ),
@@ -315,7 +316,7 @@ class CarDetailsTypeToChoose extends StatelessWidget {
       child: AnimatedContainer(
         duration: const Duration(milliseconds: 300),
         curve: Curves.easeOutCubic,
-        width: 122,
+        width: 105,
         decoration: BoxDecoration(
           gradient: isSelected
               ? LinearGradient(
@@ -386,7 +387,7 @@ class CarDetailsTypeToChoose extends StatelessWidget {
                     duration: const Duration(milliseconds: 300),
                     child: Image.asset(
                       carType.image,
-                      height: 54,
+                      height: 44,
                       fit: BoxFit.contain,
                     ),
                   ),
@@ -429,8 +430,8 @@ class CarDetailsTypeToChoose extends StatelessWidget {
                       child: Text(
                         '${_getPassengerPriceText(carType, controller)} ${CurrencyHelper.currency}',
                         style: TextStyle(
-                          fontSize: 12,
-                          fontWeight: FontWeight.w700,
+                          fontSize: 14.5,
+                          fontWeight: FontWeight.w800,
                           color: isSelected
                               ? Colors.white
                               : AppColor.writeColor.withOpacity(0.8),