Merge remote-tracking branch 'origin/master'

lib/features/book_appointments/book_appointments_repo.dart

@@ -734,7 +734,7 @@ class BookAppointmentsRepoImp implements BookAppointmentsRepo {
         body: mapDevice,
         onFailure: (error, statusCode, {messageStatus, failureType}) {
           failure = failureType;
-          onError!(error);
+          onError?.call(error);
         },
         onSuccess: (response, statusCode, {messageStatus, errorMessage}) {
           try {

lib/features/book_appointments/book_appointments_view_model.dart

@@ -1009,7 +1009,7 @@ class BookAppointmentsViewModel extends ChangeNotifier {
       (failure) async => await errorHandlerService.handleError(failure: failure),
       (apiResponse) {
         if (apiResponse.messageStatus == 2) {
-          onError!(apiResponse.errorMessage!);
+          onError?.call(apiResponse.errorMessage!);
           // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {});
         } else if (apiResponse.messageStatus == 1) {
           dentalChiefComplaintsList = apiResponse.data!;

lib/features/my_appointments/appointment_via_region_viewmodel.dart

@@ -110,7 +110,6 @@ class AppointmentViaRegionViewmodel extends ChangeNotifier {
         );
       }
     }
-
     if (clinicId == 253) {
       {
 

lib/presentation/book_appointment/laser/widgets/body_part_listing.dart

@@ -43,7 +43,9 @@ class BodyPartsListing extends StatelessWidget {
                 itemBuilder: (BuildContext context, int index) {
                   return SizedBox( height: 80, width: 80,).toShimmer2(isShow: isLoading);
                 })),
-        GridView.builder(
+        Visibility(
+          visible: !isLoading,
+          child: GridView.builder(
             gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
                 crossAxisCount: 3,
                 childAspectRatio: 85 / 107,
@@ -123,6 +125,7 @@ class BodyPartsListing extends StatelessWidget {
               );
             },
           ),
+        ),
       ],
     );
   }

lib/presentation/book_appointment/select_clinic_page.dart

@@ -303,11 +303,9 @@ class _SelectClinicPageState extends State<SelectClinicPage> {
         id = regionalViewModel.selectedHospital?.patientDoctorAppointmentList?.first.projectID?.toString() ?? "";
       }
       if (bookAppointmentsViewModel.selectedClinic.clinicID == 17) {
-
         if (appState.isAuthenticated) {
-          initDentalAppointmentBookingFlow(int.parse(bookAppointmentsViewModel
-              .currentlySelectedHospitalFromRegionFlow ??
-              "0"));
+          initDentalAppointment();
+          return SizedBox.shrink();
         }else {
           bookAppointmentsViewModel.setIsChiefComplaintsListLoading(true);
         }
@@ -464,6 +462,7 @@ class _SelectClinicPageState extends State<SelectClinicPage> {
           isCloseButtonVisible: true,
         );
       } else {
+        bookAppointmentsViewModel.setIsChiefComplaintsListLoading(true);
         Navigator.of(context).push(
           CustomPageRoute(
             page: DentalChiefComplaintsPage(),
@@ -472,4 +471,12 @@ class _SelectClinicPageState extends State<SelectClinicPage> {
       }
     });
   }
+
+  void initDentalAppointment() async {
+    await Future.delayed(Duration(milliseconds: 300));
+    initDentalAppointmentBookingFlow(int.parse(bookAppointmentsViewModel
+        .currentlySelectedHospitalFromRegionFlow ??
+        "0"));
+    return;
+  }
 }

lib/services/dialog_service.dart

@@ -59,15 +59,14 @@ class DialogServiceImp implements DialogService {
         onOkPressed: () {
           if (onOkPressed != null) {
             onOkPressed();
-          } else {
-            context.pop();
           }
           context.pop();
         },
         onCancelPressed: () {
           if (onCancelPressed != null) {
-            context.pop();
+            onCancelPressed();
           }
+          context.pop();
         },
       ),
     );

lib/widgets/buttons/custom_button.dart

@@ -60,7 +60,7 @@ class CustomButton extends StatelessWidget {
               color: isDisabled ? backgroundColor.withOpacity(.5) : backgroundColor,
               borderRadius: borderRadius,
               customBorder: BorderRadius.circular(borderRadius),
-              side: borderSide ?? BorderSide(width: borderWidth.h, color: isDisabled ? borderColor.withValues(alpha: 0.5) : borderColor)),
+              side: borderSide ?? BorderSide(width: borderWidth.h, color: isDisabled ? Colors.transparent : borderColor)),
           child: Row(
             crossAxisAlignment: CrossAxisAlignment.center,
             mainAxisAlignment: MainAxisAlignment.center,