6/25/1

lib/controller/auth/login_controller.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 import 'dart:math';
 
 import 'package:SEFER/controller/firebase/firbase_messge.dart';
-import 'package:SEFER/views/auth/register_page.dart';
 import 'package:SEFER/views/auth/sms_verfy_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
@@ -84,6 +83,7 @@ class LoginController extends GetxController {
                 'token': box.read(BoxName.tokenFCM),
                 'passengerID': box.read(BoxName.passengerID).toString()
               });
+              Get.offAll(() => const MapPagePassenger());
             }
           }
 

lib/controller/home/map_passenger_controller.dart

@@ -840,7 +840,8 @@ class MapPassengerController extends GetxController {
     update();
   }
 
-  void getDialog(String title, midTitle, VoidCallback onPressed) {
+  void getDialog(String title, String? midTitle, VoidCallback onPressed) {
+    final textToSpeechController = Get.find<TextToSpeechController>();
     Get.defaultDialog(
         title: title,
         titleStyle: AppStyle.title,
@@ -849,13 +850,11 @@ class MapPassengerController extends GetxController {
           children: [
             IconButton(
                 onPressed: () async {
-                  final textToSpeechController =
-                      Get.find<TextToSpeechController>();
-                  await textToSpeechController.speakText(midTitle);
+                  await textToSpeechController.speakText(title ?? midTitle!);
                 },
                 icon: const Icon(Icons.headphones)),
             Text(
-              midTitle,
+              midTitle!,
               style: AppStyle.title,
             )
           ],
@@ -867,6 +866,7 @@ class MapPassengerController extends GetxController {
         ),
         cancel: MyElevatedButton(
             title: 'Cancel',
+            kolor: AppColor.redColor,
             onPressed: () {
               Get.back();
             }));

lib/controller/local/translations.dart

@@ -4,6 +4,11 @@ class MyTranslation extends Translations {
   @override
   Map<String, Map<String, String>> get keys => {
         "ar": {
+          "Click here point": "انقر هنا", // Click here (literal translation)
+          "Pick or Tap to confirm":
+              "اختر أو اضغط للتأكيد", // Choose or Tap to confirm
+          "Are you want to change": "هل تريد التغيير؟",
+          'by': 'ب',
           "Enter your complaint here": "أدخل شكواك هنا",
           "Complaint": "شكوى",
           "Please enter your complaint.": "الرجاء إدخال شكواك.",

lib/controller/payment/payment_controller.dart

@@ -82,7 +82,7 @@ class PaymentController extends GetxController {
   }
 
   Future addSeferWallet(String paymentMethod, point) async {
-    var seferToken = await generateTokenDriver(point);
+    var seferToken = await generateTokenPassenger(point);
     await CRUD().post(link: AppLink.addSeferWallet, payload: {
       'amount': point.toString(),
       'paymentMethod': paymentMethod,