Merge branch 'master' into Main_App_Replacement

# Conflicts:
#	lib/core/api_consts.dart
#	pubspec.yaml

lib/core/api_consts.dart

@@ -302,7 +302,7 @@ class ApiConsts {
   static String googleCloudStorageENTranslationFileBaseURL = "https://storage.googleapis.com/hmg-patientapp-translations";
 
   // ************     static values for Api   ****************
-  // static final double appVersionID = 21.7;
+  // static final double appVersionID = 21.8;
   static final double appVersionID = 20.8;
 
   // static final double appVersionID = 50.7;

lib/features/authentication/authentication_view_model.dart

@@ -980,15 +980,15 @@ class AuthenticationViewModel extends ChangeNotifier {
     // TODO: GET APP SMS SIGNATURE HERE
     request.sMSSignature = await getSignature();
 
-    if(!kDebugMode) {
+    // if(!kDebugMode) {
-      // Get Turnstile token if configured
+    //   // Get Turnstile token if configured
-      final turnstileToken = await _turnstileService.getTurnstileToken();
+    //   final turnstileToken = await _turnstileService.getTurnstileToken();
-      if (turnstileToken != null) {
+    //   if (turnstileToken != null) {
-        request.turnstileToken = turnstileToken;
+    //     request.turnstileToken = turnstileToken;
-      } else {
+    //   } else {
-        request.turnstileToken = "";
+    //     request.turnstileToken = "";
-      }
+    //   }
-    }
+    // }
 
     if (isNeedLoading) {
       LoaderBottomSheet.showLoader();

lib/main.dart

@@ -371,6 +371,7 @@ class MyApp extends StatelessWidget {
                     darkTheme: AppTheme.getDarkTheme(isArabic),
                     themeMode: profileVm.isDarkMode ? ThemeMode.dark : ThemeMode.light,
                     navigatorKey: getIt.get<NavigationService>().navigatorKey,
+                    navigatorObservers: [getIt.get<NavigationService>().routeObserver],
                   );
                 },
               );

lib/presentation/appointments/widgets/appointment_card.dart

@@ -14,6 +14,7 @@ import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart';
 import 'package:hmg_patient_app_new/features/book_appointments/models/resp_models/doctors_list_response_model.dart';
+import 'package:hmg_patient_app_new/features/book_appointments/models/resp_models/get_clinic_list_response_model.dart';
 import 'package:hmg_patient_app_new/features/contact_us/contact_us_view_model.dart';
 import 'package:hmg_patient_app_new/features/medical_file/medical_file_view_model.dart';
 import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_history_response_model.dart';
@@ -677,7 +678,15 @@ class _AppointmentCardState extends State<AppointmentCard> {
       projectName: widget.patientAppointmentHistoryResponseModel.projectName,
     );
 
+    final clinic = GetClinicsListResponseModel(
+      clinicID: widget.patientAppointmentHistoryResponseModel.clinicID,
+      clinicDescription: widget.patientAppointmentHistoryResponseModel.clinicName,
+      clinicDescriptionN: widget.patientAppointmentHistoryResponseModel.clinicName,
+    );
+
     widget.bookAppointmentsViewModel.setSelectedDoctor(doctor);
+    widget.bookAppointmentsViewModel.setSelectedClinic(clinic);
+
     LoaderBottomSheet.showLoader();
 
     await widget.bookAppointmentsViewModel.getDoctorFreeSlots(

lib/presentation/authentication/saved_login_screen.dart

@@ -16,6 +16,7 @@ import 'package:hmg_patient_app_new/features/authentication/authentication_view_
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/presentation/authentication/login.dart';
 import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart';
+import 'package:hmg_patient_app_new/services/navigation_service.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/appbar/app_bar_widget.dart';
 import 'package:hmg_patient_app_new/widgets/bottomsheet/generic_bottom_sheet.dart';
@@ -30,11 +31,24 @@ class SavedLogin extends StatefulWidget {
   _SavedLogin createState() => _SavedLogin();
 }
 
-class _SavedLogin extends State<SavedLogin> {
+class _SavedLogin extends State<SavedLogin> with RouteAware {
   LoginTypeEnum loginType = LoginTypeEnum.sms;
   late AuthenticationViewModel authVm;
   late AppState appState;
   bool? isOther;
+  PageRoute<dynamic>? _pageRoute;
+
+  void _assignSavedLoginData() {
+    authVm.phoneNumberController.text = appState.getSelectDeviceByImeiRespModelElement!.mobile!.startsWith("0")
+        ? appState.getSelectDeviceByImeiRespModelElement!.mobile!.replaceFirst("0", "")
+        : appState.getSelectDeviceByImeiRespModelElement!.mobile!;
+    authVm.nationalIdController.text = appState.getSelectDeviceByImeiRespModelElement!.identificationNo!;
+
+    if (isOther == true) {
+      authVm.phoneNumberController.text = appState.getSelectDeviceByImeiRespModelElement!.mobile!;
+      authVm.selectedCountrySignup = CountryEnum.others;
+    }
+  }
 
   @override
   void initState() {
@@ -43,19 +57,10 @@ class _SavedLogin extends State<SavedLogin> {
     appState = getIt.get<AppState>();
     loginType = LoginTypeExtension.fromValue(appState.getSelectDeviceByImeiRespModelElement!.logInType!)!;
 
-    authVm.phoneNumberController.text = appState.getSelectDeviceByImeiRespModelElement!.mobile!.startsWith("0")
-        ? appState.getSelectDeviceByImeiRespModelElement!.mobile!.replaceFirst("0", "")
-        : appState.getSelectDeviceByImeiRespModelElement!.mobile!;
-    authVm.nationalIdController.text = appState.getSelectDeviceByImeiRespModelElement!.identificationNo!;
-
     // Check if this is an "Others" country user
     isOther = appState.getSelectDeviceByImeiRespModelElement!.isOther == true;
 
-    // Set country to Others if isOther flag is true - this ensures _Others APIs are called
+    _assignSavedLoginData();
-    if (isOther!) {
-      authVm.phoneNumberController.text = appState.getSelectDeviceByImeiRespModelElement!.mobile!;
-      authVm.selectedCountrySignup = CountryEnum.others;
-    }
 
     if (loginType == LoginTypeEnum.fingerprint || loginType == LoginTypeEnum.face) {
       authVm.loginWithFingerPrintFace(() {});
@@ -63,6 +68,30 @@ class _SavedLogin extends State<SavedLogin> {
     super.initState();
   }
 
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    final route = ModalRoute.of(context);
+    if (route is PageRoute && route != _pageRoute) {
+      if (_pageRoute != null) {
+        getIt.get<NavigationService>().routeObserver.unsubscribe(this);
+      }
+      _pageRoute = route;
+      getIt.get<NavigationService>().routeObserver.subscribe(this, route);
+    }
+  }
+
+  @override
+  void didPopNext() {
+    _assignSavedLoginData();
+  }
+
+  @override
+  void dispose() {
+    getIt.get<NavigationService>().routeObserver.unsubscribe(this);
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(

lib/presentation/book_appointment/doctor_profile_page.dart

@@ -8,6 +8,7 @@ import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart';
+import 'package:hmg_patient_app_new/features/book_appointments/models/resp_models/get_clinic_list_response_model.dart';
 import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/presentation/book_appointment/widgets/appointment_calendar.dart';
@@ -240,6 +241,14 @@ class DoctorProfilePage extends StatelessWidget {
                       bookAppointmentsViewModel.selectedDoctor.clinicName = bookAppointmentsViewModel.doctorsProfileResponseModel.clinicDescription;
                       bookAppointmentsViewModel.selectedDoctor.projectName = bookAppointmentsViewModel.doctorsProfileResponseModel.projectName;
 
+                      final clinic = GetClinicsListResponseModel(
+                        clinicID: bookAppointmentsViewModel.doctorsProfileResponseModel.clinicID,
+                        clinicDescription: bookAppointmentsViewModel.doctorsProfileResponseModel.clinicDescription,
+                        clinicDescriptionN: bookAppointmentsViewModel.doctorsProfileResponseModel.clinicDescription,
+                      );
+
+                      bookAppointmentsViewModel.setSelectedClinic(clinic);
+
                       LoaderBottomSheet.showLoader();
                       bookAppointmentsViewModel.isLiveCareSchedule
                           ? await bookAppointmentsViewModel.getLiveCareDoctorFreeSlots(

lib/presentation/book_appointment/widgets/appointment_calendar.dart

@@ -268,7 +268,7 @@ class _AppointmentCalendarState extends State<AppointmentCalendar> {
                     ),
                   );
                 } else {
-                  if (bookAppointmentsViewModel.selectedClinic.clinicID! == 17 && bookAppointmentsViewModel.selectedChiefComplaintID == 0) {
+                  if (bookAppointmentsViewModel.selectedClinic.clinicID == 17 && bookAppointmentsViewModel.selectedChiefComplaintID == 0) {
                     GetClinicsListResponseModel selectedClinic = GetClinicsListResponseModel(
                         clinicID: bookAppointmentsViewModel.selectedClinic.clinicID,
                         clinicDescription: bookAppointmentsViewModel.selectedClinic.clinicDescription,

lib/services/navigation_service.dart

@@ -6,6 +6,7 @@ import 'package:hmg_patient_app_new/routes/app_routes.dart';
 
 class NavigationService {
   final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
+  final RouteObserver<PageRoute<dynamic>> routeObserver = RouteObserver<PageRoute<dynamic>>();
 
   BuildContext? get context => navigatorKey.currentContext;