Crashlytics fixes & updates

assets/langs/en-US.json

@@ -21,7 +21,7 @@
   "mySchedule": "My Schedule",
   "logout": "Logout",
   "respirationRate": "Respiration Rate",
-  "bookAppo": "New Appointment",
+  "bookAppo": "Book Appointment",
   "searchBy": "Search By:",
   "clinic": "Clinic",
   "byClinic": "By Clinic",

lib/core/api/api_client.dart

@@ -210,8 +210,8 @@ class ApiClientImp implements ApiClient {
           body['TokenID'] = "@dm!n";
         }
 
-        body['TokenID'] = "@dm!n";
+        // body['TokenID'] = "@dm!n";
-        // body['PatientID'] = 1307867;
+        // body['PatientID'] = 3310954;
         // body['PatientID'] = 53320;
         // body['PatientTypeID'] = 1;
         // body['PatientOutSA'] = 0;

lib/core/utils/request_utils.dart

@@ -40,14 +40,23 @@ class RequestUtils {
       if (zipCode == "0") {
         request.patientMobileNumberOthers = phoneNumber;
       } else {
-        request.patientMobileNumber = int.parse(phoneNumber);
+        // Remove any non-numeric characters before parsing
+        final numericPhone = phoneNumber.replaceAll(RegExp(r'[^0-9]'), '');
+        final parsedPhone = int.tryParse(numericPhone);
+        if (parsedPhone != null) {
+          request.patientMobileNumber = parsedPhone;
+        } else {
+          // If parsing fails, use as string in Others field
+          request.patientMobileNumberOthers = phoneNumber;
+        }
       }
     }
     request.oTPSendType = otpTypeEnum.toInt(); // could map OTPTypeEnum if needed
     request.zipCode = zipCode; // or countryCode if defined elsewhere
 
     if (isForRegister) {
-      request.patientIdentificationID = int.parse(nationId);
+      final parsedNationId = int.tryParse(nationId.replaceAll(RegExp(r'[^0-9]'), ''));
+      request.patientIdentificationID = parsedNationId ?? 0;
       request.searchType = 1;
       request.isHijri = calenderType.toInt;
       request.patientID = patientId;
@@ -56,7 +65,7 @@ class RequestUtils {
       request.isDentalAllowedBackend = false;
     } else {
       if (fileNo) {
-        request.patientID = patientId ?? int.parse(nationId);
+        request.patientID = patientId ?? (int.tryParse(nationId.replaceAll(RegExp(r'[^0-9]'), '')) ?? 0);
         request.patientIdentificationID = request.nationalID;
         request.searchType = 2;
       } else {
@@ -91,8 +100,17 @@ class RequestUtils {
       request.patientMobileNumberOthers = phoneNumber;
       request.mobileNo = phoneNumber;
     } else {
-      request.patientMobileNumber = int.parse(phoneNumber);
+      // Remove any non-numeric characters before parsing
-      request.mobileNo = '0$phoneNumber';
+      final numericPhone = phoneNumber.replaceAll(RegExp(r'[^0-9]'), '');
+      final parsedPhone = int.tryParse(numericPhone);
+      if (parsedPhone != null) {
+        request.patientMobileNumber = parsedPhone;
+        request.mobileNo = '0$numericPhone';
+      } else {
+        // If parsing fails, use as string in Others field
+        request.patientMobileNumberOthers = phoneNumber;
+        request.mobileNo = phoneNumber;
+      }
     }
     request.deviceToken = deviceToken;
     request.projectOutSA = patientOutSA;
@@ -115,7 +133,8 @@ class RequestUtils {
       log("nationIdText: ${nationIdText}");
     } else {
       if (fileNo) {
-        request.patientID = patientId ?? int.parse(nationIdText);
+        final numericNationId = nationIdText.replaceAll(RegExp(r'[^0-9]'), '');
+        request.patientID = patientId ?? (int.tryParse(numericNationId) ?? 0);
         request.patientIdentificationID = request.nationalID = '0';
         request.searchType = 2;
         //TODO: Issue HEre is Not Login
@@ -155,8 +174,17 @@ class RequestUtils {
         request.patientMobileNumberOthers = mobileNumber;
         request.mobileNo = mobileNumber;
       } else {
-        request.patientMobileNumber = int.parse(mobileNumber);
+        // Remove any non-numeric characters before parsing
-        request.mobileNo = '0$mobileNumber';
+        final numericMobile = mobileNumber.replaceAll(RegExp(r'[^0-9]'), '');
+        final parsedMobile = int.tryParse(numericMobile);
+        if (parsedMobile != null) {
+          request.patientMobileNumber = parsedMobile;
+          request.mobileNo = '0$numericMobile';
+        } else {
+          // If parsing fails, use as string in Others field
+          request.patientMobileNumberOthers = mobileNumber;
+          request.mobileNo = mobileNumber;
+        }
       }
     }
     request.projectOutSA = patientOutSA;
@@ -314,7 +342,9 @@ class RequestUtils {
       request.sharedPatientId = 0;
       request.sharedPatientIdentificationId = nationalIDorFile;
     } else if (loginType == 2) {
-      request.sharedPatientId = int.parse(nationalIDorFile);
+      // Remove any non-numeric characters before parsing
+      final numericId = nationalIDorFile.replaceAll(RegExp(r'[^0-9]'), '');
+      request.sharedPatientId = int.tryParse(numericId) ?? 0;
       request.sharedPatientIdentificationId = '';
     }
     request.searchType = loginType;

lib/features/book_appointments/book_appointments_view_model.dart

@@ -676,7 +676,6 @@ class BookAppointmentsViewModel extends ChangeNotifier {
       (failure) async {
         isDoctorsListLoading = false;
         if (onError != null) onError(LocaleKeys.noDoctorFound.tr());
-
         notifyListeners();
       },
       (apiResponse) {
@@ -691,7 +690,7 @@ class BookAppointmentsViewModel extends ChangeNotifier {
           clearSearchFilters();
           getFiltersFromDoctorList();
           _groupDoctorsList();
-          setIsNearestAppointmentSelected(isNearest);
+          // setIsNearestAppointmentSelected(isNearest);
           notifyListeners();
           if (onSuccess != null) {
             onSuccess(apiResponse);

lib/features/my_appointments/my_appointments_view_model.dart

@@ -78,7 +78,7 @@ class MyAppointmentsViewModel extends ChangeNotifier {
   List<PatientAppointmentHistoryResponseModel> patientUpcomingAppointmentsHistoryList = [];
   List<PatientAppointmentHistoryResponseModel> patientArrivedAppointmentsHistoryList = [];
 
-  List<PatientAppointmentHistoryResponseModel> patientAllArrivedAppointmentsHistoryList = [];
+  // List<PatientAppointmentHistoryResponseModel> patientAllArrivedAppointmentsHistoryList = [];
 
   List<PatientAppointmentHistoryResponseModel> patientMyDoctorsList = [];
 
@@ -174,7 +174,7 @@ class MyAppointmentsViewModel extends ChangeNotifier {
       patientAppointmentsHistoryList.clear();
       patientUpcomingAppointmentsHistoryList.clear();
       patientArrivedAppointmentsHistoryList.clear();
-      patientAllArrivedAppointmentsHistoryList.clear();
+      // patientAllArrivedAppointmentsHistoryList.clear();
       patientEyeMeasurementsAppointmentsHistoryList.clear();
       isMyAppointmentsLoading = true;
       isTimeLineAppointmentsLoading = true;
@@ -290,7 +290,7 @@ class MyAppointmentsViewModel extends ChangeNotifier {
     patientAppointmentsByHospital.clear();
     patientAppointmentsViewList.clear();
 
-    patientAllArrivedAppointmentsHistoryList.clear();
+    // patientAllArrivedAppointmentsHistoryList.clear();
     filteredAppointmentList.clear();
     patientAppointmentsHistoryList.clear();
     patientUpcomingAppointmentsHistoryList.clear();
@@ -329,7 +329,7 @@ class MyAppointmentsViewModel extends ChangeNotifier {
           isMyAppointmentsLoading = false;
           isAppointmentDataToBeLoaded = false;
           if (!isForTimeLine) {
-            patientAllArrivedAppointmentsHistoryList = apiResponse.data!;
+            // patientAllArrivedAppointmentsHistoryList = apiResponse.data!;
             isArrivedAppointmentDataLoaded = true;
             isFullArrivedAppointmentsLoaded = true;
           }
@@ -383,7 +383,7 @@ class MyAppointmentsViewModel extends ChangeNotifier {
           // Handle error
         } else if (apiResponse.messageStatus == 1) {
           patientArrivedAppointmentsHistoryList = apiResponse.data!;
-          patientAllArrivedAppointmentsHistoryList = apiResponse.data!;
+          // patientAllArrivedAppointmentsHistoryList = apiResponse.data!;
           isArrivedAppointmentDataLoaded = true;
           isFullArrivedAppointmentsLoaded = true;
 
@@ -414,9 +414,9 @@ class MyAppointmentsViewModel extends ChangeNotifier {
       availableFilters.add(AppointmentListingFilters.LIVECARE);
     }
 
-    if (filteredAppointmentList.any((element) => element.isLiveCareAppointment == false)) {
+    // if (filteredAppointmentList.any((element) => element.isLiveCareAppointment == false)) {
-      availableFilters.add(AppointmentListingFilters.WALKIN);
+    //   availableFilters.add(AppointmentListingFilters.WALKIN);
-    }
+    // }
 
     if (filteredAppointmentList.any((element) => AppointmentType.isArrived(element) == true)) {
       availableFilters.add(AppointmentListingFilters.ARRIVED);
@@ -853,15 +853,15 @@ class MyAppointmentsViewModel extends ChangeNotifier {
     selectedFilter = [];
     // if(previouslySelectedTab == selectedTabIndex ) return;
     switch (index) {
+      // case 0:
+      //   filteredAppointmentList.clear();
+      //   filteredAppointmentList.addAll(patientAppointmentsHistoryList);
+      //   break;
       case 0:
-        filteredAppointmentList.clear();
-        filteredAppointmentList.addAll(patientAppointmentsHistoryList);
-        break;
-      case 1:
         filteredAppointmentList.clear();
         filteredAppointmentList.addAll(patientUpcomingAppointmentsHistoryList);
         break;
-      case 2:
+      case 1:
         filteredAppointmentList.clear();
         filteredAppointmentList.addAll(patientArrivedAppointmentsHistoryList);
         break;
@@ -887,11 +887,12 @@ class MyAppointmentsViewModel extends ChangeNotifier {
     this.end = end;
     isDateFilterSelected = true;
     List<PatientAppointmentHistoryResponseModel> sourceList = [];
+    // if (selectedTabIndex == 0) {
+    //   sourceList = patientAppointmentsHistoryList;
+    // } else
       if (selectedTabIndex == 0) {
-      sourceList = patientAppointmentsHistoryList;
-    } else if (selectedTabIndex == 1) {
       sourceList = patientUpcomingAppointmentsHistoryList;
-    } else if (selectedTabIndex == 2) {
+    } else if (selectedTabIndex == 1) {
       sourceList = patientArrivedAppointmentsHistoryList;
     }
     // if (isDateFilterSelected) sourceList = filteredAppointmentList;

lib/features/prescriptions/prescriptions_view_model.dart

@@ -191,7 +191,9 @@ class PrescriptionsViewModel extends ChangeNotifier {
     result.fold(
       // (failure) async => await errorHandlerService.handleError(failure: failure),
       (failure) async {
-        onError!(failure.message);
+        if (onError != null) {
+          onError(failure.message);
+        }
       },
       (apiResponse) async {
         if (apiResponse.messageStatus == 2) {

lib/presentation/appointments/appointment_payment_page.dart

@@ -69,14 +69,20 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
         widget.patientAppointmentHistoryResponseModel.clinicID,
           widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(), widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment ?? false, onSuccess: (val) {
         myAppointmentsViewModel.getTamaraInstallmentsDetails().then((val) {
-          if (myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel != null) {
+          // if (myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel != null && myAppointmentsViewModel.patientAppointmentShareResponseModel != null) {
+          if (myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel != null &&
+              myAppointmentsViewModel.patientAppointmentShareResponseModel?.patientShareWithTax != null &&
+              myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel?.minLimit?.amount != null &&
+              myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel?.maxLimit?.amount != null) {
             if (myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax! >= myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel!.minLimit!.amount! &&
                 myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax! <= myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel!.maxLimit!.amount!) {
+              if (mounted) {
                 setState(() {
                   isShowTamara = true;
                 });
               }
             }
+          }
         });
       }, onError: (err) {
         Navigator.of(context).pop();

lib/presentation/appointments/my_appointments_page.dart

@@ -48,7 +48,7 @@ class _MyAppointmentsPageState extends State<MyAppointmentsPage> {
         myAppointmentsViewModel.getPatientAppointments(true, false, isForTimeLine: false);
       }
       // Load full arrived appointments if not already loaded
-      myAppointmentsViewModel.loadFullArrivedAppointmentsIfNeeded();
+      // myAppointmentsViewModel.loadFullArrivedAppointmentsIfNeeded();
     });
     super.initState();
   }
@@ -71,9 +71,9 @@ class _MyAppointmentsPageState extends State<MyAppointmentsPage> {
                   activeTextColor: Color(0xffED1C2B),
                   activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1),
                   tabs: [
-                    CustomTabBarModel(null, LocaleKeys.allAppt.tr(context: context)),
+                    // CustomTabBarModel(null, LocaleKeys.allAppt.tr(context: context)),
                     CustomTabBarModel(null, LocaleKeys.upcoming.tr(context: context)),
-                    CustomTabBarModel(null, LocaleKeys.completed.tr(context: context)),
+                    CustomTabBarModel(null, LocaleKeys.arrived.tr(context: context)),
                   ],
                   onTabChange: (index) {
                     setState(() {
@@ -82,6 +82,10 @@ class _MyAppointmentsPageState extends State<MyAppointmentsPage> {
                     myAppointmentsViewModel.onTabChange(index);
                     myAppointmentsViewModel.updateListWRTTab(index);
                     context.read<DateRangeSelectorRangeViewModel>().flush();
+
+                    if(index == 1) {
+                      myAppointmentsViewModel.loadFullArrivedAppointmentsIfNeeded();
+                    }
                   },
                 ).paddingSymmetrical(24.h, 0.h),
                 // Consumer<MyAppointmentsViewModel>(builder: (context, myAppointmentsVM, child) {
@@ -152,7 +156,7 @@ class _MyAppointmentsPageState extends State<MyAppointmentsPage> {
                   ? myAppointmentsVM.patientAppointmentsViewList.length
                   : 1,
           itemBuilder: (context, index) {
-            final isExpanded = myAppointmentsVM.selectedTabIndex == 1 ? true : expandedIndex == index;
+            final isExpanded = myAppointmentsVM.selectedTabIndex == 0 ? true : expandedIndex == index;
             return myAppointmentsVM.isMyAppointmentsLoading
                 ? Container(
                     decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.h, hasShadow: true),

lib/presentation/book_appointment/select_clinic_page.dart

@@ -1021,6 +1021,7 @@ class _SelectClinicPageState extends State<SelectClinicPage> {
   void onClinicSelected(GetClinicsListResponseModel clinic) {
     bookAppointmentsViewModel.setSelectedClinic(clinic);
     bookAppointmentsViewModel.setIsDoctorsListLoading(true);
+    searchEditingController.text = "";
     if (clinic.isLiveCareClinicAndOnline ?? false) {
       Navigator.of(context).push(
         CustomPageRoute(

lib/presentation/book_appointment/select_doctor_page.dart

@@ -48,7 +48,7 @@ class _SelectDoctorPageState extends State<SelectDoctorPage> {
     Clarity.setCurrentScreenName('Select Doctor Page');
     _scrollController = ScrollController();
     scheduleMicrotask(() {
-      bookAppointmentsViewModel.setIsNearestAppointmentSelected(true);
+      bookAppointmentsViewModel.setIsNearestAppointmentSelected(false);
       if (bookAppointmentsViewModel.isLiveCareSchedule) {
         bookAppointmentsViewModel.getLiveCareDoctorsList();
       } else {
@@ -57,8 +57,7 @@ class _SelectDoctorPageState extends State<SelectDoctorPage> {
         } else if (bookAppointmentsViewModel.isGetDocForHealthCal) {
           bookAppointmentsViewModel.getDoctorsListByHealthCal();
         } else {
-          bookAppointmentsViewModel.setIsNearestAppointmentSelected(true);
+          bookAppointmentsViewModel.getDoctorsList(isNearest: false);
-          bookAppointmentsViewModel.getDoctorsList(isNearest: true);
         }
       }
     });

lib/presentation/book_appointment/widgets/doctor_card.dart

@@ -144,8 +144,9 @@ class DoctorCard extends StatelessWidget {
                         spacing: 3.h,
                         runSpacing: 4.h,
                         children: [
-                          bookAppointmentsViewModel.isNearestAppointmentSelected
+                          // bookAppointmentsViewModel.isNearestAppointmentSelected
-                              ? doctorsListResponseModel.nearestFreeSlot != null
+                          //     ?
+                          doctorsListResponseModel.nearestFreeSlot != null
                                   ? AppCustomChipWidget(
                                       labelText: (isLoading ? "Cardiologist" : DateUtil.getDateStringForNearestSlot(doctorsListResponseModel.nearestFreeSlot)),
                                       // richText: (isLoading ? "Cardiologist" : DateUtil.getDateStringForNearestSlot(doctorsListResponseModel.nearestFreeSlot))
@@ -155,7 +156,8 @@ class DoctorCard extends StatelessWidget {
                                       textColor: AppColors.successColor,
                                     ).toShimmer2(isShow: isLoading)
                                   : SizedBox.shrink()
-                              : SizedBox.shrink(),
+                              // : SizedBox.shrink()
+                          ,
                           AppCustomChipWidget(
                             labelText: "${isLoading ? "Cardiologist" : doctorsListResponseModel.clinicName}",
                           ).toShimmer2(isShow: isLoading),

lib/presentation/profile_settings/widgets/preferred_language_widget.dart

@@ -74,7 +74,7 @@ class _PreferredLanguageWidgetState extends State<PreferredLanguageWidget> {
                       callBackFunc: () async {
                     Navigator.of(GetIt.instance<NavigationService>().navigatorKey.currentContext!).pop();
                     profileSettingsViewModel.getProfileSettings();
-                  }, isFullScreen: false, isAutoDismiss: true);
+                  }, isFullScreen: false, isAutoDismiss: true, isCloseButtonVisible: false);
                 },
                 onError: (error) {
                   LoaderBottomSheet.hideLoader();

lib/presentation/profile_settings/widgets/update_email_widget.dart

@@ -134,7 +134,7 @@ class _UpdateEmailDialogState extends State<UpdateEmailDialog> {
                       callBackFunc: () async {
                     Navigator.of(getIt<NavigationService>().navigatorKey.currentContext!).pop();
                     profileSettingsViewModel!.getProfileSettings();
-                  }, isFullScreen: false, isAutoDismiss: true);
+                  }, isFullScreen: false, isAutoDismiss: true, isCloseButtonVisible: false);
                 },
                 onError: (error) {
                   LoaderBottomSheet.hideLoader();

lib/widgets/common_bottom_sheet.dart

@@ -257,8 +257,7 @@ void showCommonBottomSheetWithoutHeight(
       duration: Duration(milliseconds: 500),
       reverseDuration: Duration(milliseconds: 300),
     ),
-    constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width //MediaQuery.of(context).size.width, // Full width
+    constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width),
-        ),
     context: context,
     isScrollControlled: true,
     showDragHandle: false,