Update: 2026-06-25 02:55:24

siro_rider/lib/views/home/my_wallet/cliq_payment_sheet.dart

@@ -52,6 +52,7 @@ class _CliqPaymentSheetState extends State<CliqPaymentSheet> {
   @override
   Widget build(BuildContext context) {
     final accent = AppColor.secondaryColorStatic;
+    final navy = AppColor.primaryColor;
     return Padding(
       padding: EdgeInsets.only(
         left: 24, right: 24, top: 20,
@@ -68,7 +69,7 @@ class _CliqPaymentSheetState extends State<CliqPaymentSheet> {
               child: Container(
                 width: 36, height: 4,
                 decoration: BoxDecoration(
-                  color: Colors.white.withOpacity(0.2),
+                  color: Colors.grey.shade300,
                   borderRadius: BorderRadius.circular(2),
                 ),
               ),
@@ -76,14 +77,11 @@ class _CliqPaymentSheetState extends State<CliqPaymentSheet> {
             const SizedBox(height: 20),
 
             // Title
-            Text('Pay by Cliq'.tr, style: AppStyle.headTitle2),
+            Text('Pay by Cliq'.tr, style: AppStyle.headTitle2.copyWith(color: navy)),
             const SizedBox(height: 4),
             Text(
               'Enter your Cliq wallet details'.tr,
-              style: TextStyle(
-                color: Colors.white.withOpacity(0.5),
-                fontSize: 13,
-              ),
+              style: TextStyle(color: navy.withOpacity(0.5), fontSize: 13),
             ),
             const SizedBox(height: 24),
 
@@ -91,26 +89,26 @@ class _CliqPaymentSheetState extends State<CliqPaymentSheet> {
             TextFormField(
               controller: _phoneCtrl,
               keyboardType: TextInputType.phone,
-              style: const TextStyle(color: Colors.white, fontSize: 16, letterSpacing: 1.2),
+              style: TextStyle(color: navy, fontSize: 16, letterSpacing: 1.2),
               decoration: InputDecoration(
                 labelText: 'Wallet Phone Number'.tr,
                 hintText: CountryLogic.getPhoneHint(box.read(BoxName.countryCode) ?? 'Jordan'),
-                hintStyle: TextStyle(color: Colors.white.withOpacity(0.3)),
-                labelStyle: TextStyle(color: accent.withOpacity(0.7)),
+                hintStyle: TextStyle(color: navy.withOpacity(0.3)),
+                labelStyle: TextStyle(color: accent),
                 filled: true,
-                fillColor: Colors.white.withOpacity(0.06),
+                fillColor: Colors.grey.shade50,
                 border: OutlineInputBorder(
                   borderRadius: BorderRadius.circular(12),
-                  borderSide: BorderSide.none,
+                  borderSide: BorderSide(color: Colors.grey.shade200),
                 ),
                 focusedBorder: OutlineInputBorder(
                   borderRadius: BorderRadius.circular(12),
                   borderSide: BorderSide(color: accent, width: 1.5),
                 ),
-                prefixIcon: Icon(Icons.phone_android, color: accent.withOpacity(0.6)),
+                prefixIcon: Icon(Icons.phone_android, color: accent),
                 suffixIcon: _phoneCtrl.text.isNotEmpty
                     ? IconButton(
-                        icon: Icon(Icons.clear, color: Colors.white.withOpacity(0.4)),
+                        icon: Icon(Icons.clear, color: navy.withOpacity(0.4)),
                         onPressed: () => setState(() => _phoneCtrl.clear()),
                       )
                     : null,
@@ -126,7 +124,7 @@ class _CliqPaymentSheetState extends State<CliqPaymentSheet> {
             Container(
               padding: const EdgeInsets.all(14),
               decoration: BoxDecoration(
-                color: accent.withOpacity(0.08),
+                color: accent.withOpacity(0.06),
                 borderRadius: BorderRadius.circular(12),
                 border: Border.all(color: accent.withOpacity(0.15)),
               ),
@@ -138,10 +136,10 @@ class _CliqPaymentSheetState extends State<CliqPaymentSheet> {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       Text('Invoice Amount'.tr,
-                        style: TextStyle(fontSize: 11, color: Colors.white.withOpacity(0.5))),
+                        style: TextStyle(fontSize: 11, color: navy.withOpacity(0.5))),
                       const SizedBox(height: 2),
                       Text('${PaymentTierConfig.formatAmount(widget.amount)} ${CurrencyHelper.currency}',
-                        style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w700, color: Colors.white)),
+                        style: TextStyle(fontSize: 18, fontWeight: FontWeight.w700, color: navy)),
                     ],
                   ),
                 ],

siro_rider/lib/views/home/my_wallet/passenger_wallet.dart

@@ -35,7 +35,8 @@ class PassengerWallet extends StatelessWidget {
         Stack(
           children: [
             // استخدام Column لتنظيم المحتوى بشكل أفضل
-            Padding(
+            SingleChildScrollView(
+              child: Padding(
               padding: const EdgeInsets.symmetric(horizontal: 16.0),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -77,8 +78,9 @@ class PassengerWallet extends StatelessWidget {
                 ],
               ),
             ),
+          ),
 
-            // --- عرض الـ Dialog بنفس طريقتك القديمة ---
+          // --- عرض الـ Dialog بنفس طريقتك القديمة ---
             const PassengerWalletDialog(),
           ],
         ),

siro_rider/lib/views/home/my_wallet/passenger_wallet_dialoge.dart

@@ -346,7 +346,7 @@ void showPaymentOptions(BuildContext context, PaymentController controller) {
                 showModalBottomSheet(
                   context: context,
                   isScrollControlled: true,
-                  backgroundColor: AppColor.primaryColor,
+                  backgroundColor: Colors.white,
                   shape: const RoundedRectangleBorder(
                     borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
                   ),