lib/core/utils/utils.dart

@@ -859,15 +859,15 @@ class Utils {
     BoxFit fit = BoxFit.cover,
     ImageErrorWidgetBuilder? errorBuilder,
   }) {
+    final double? iconW = (width == null && height == null) ? 24.w : width;
+    final double? iconH = (width == null && height == null) ? 24.h : height;
     if (url == null || url.isEmpty) {
       return Utils.buildSvgWithAssets(
-        width: width ?? 24.w,
-        height: height ?? 24.h,
+        width: iconW ?? 24.w,
+        height: iconH ?? 24.h,
         icon: AppAssets.noImageFound,
       );
     }
-    final iconH = height ?? 24.h;
-    final iconW = width ?? 24.w;
     return PreserveImageColors(
       child: Image.network(
         url,
@@ -877,7 +877,7 @@ class Utils {
         errorBuilder: errorBuilder ??
             (_, __, ___) {
               //todo_section change the error builder icon that it is returning
-              return Utils.buildSvgWithAssets(width: iconW, height: iconH, icon: AppAssets.noImageFound);
+              return Utils.buildSvgWithAssets(width: iconW ?? 24.w, height: iconH ?? 24.h, icon: AppAssets.noImageFound);
             },
       ),
     );

lib/features/authentication/authentication_view_model.dart

@@ -31,6 +31,7 @@ import 'package:hmg_patient_app_new/features/habib_wallet/habib_wallet_view_mode
 import 'package:hmg_patient_app_new/features/hmg_services/hmg_services_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/my_appointments_view_model.dart';
+import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_view_model.dart';
 import 'package:hmg_patient_app_new/features/symptoms_checker/symptoms_checker_view_model.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/presentation/authentication/login.dart';
@@ -1280,6 +1281,9 @@ class AuthenticationViewModel extends ChangeNotifier {
             getIt.get<HabibWalletViewModel>().setIsWalletAmountToBeLoaded(true);
             getIt.get<InsuranceViewModel>().setIsInsuranceDataToBeLoaded(true);
             getIt.get<HmgServicesViewModel>().setHasVitalSignDataLoaded(false);
+            getIt.get<MedicalFileViewModel>().setIsSickLeavesDataNeedsReloading(true);
+            getIt.get<MedicalFileViewModel>().setIsMedicalReportsDataNeedsReloading(true);
+            getIt.get<PrescriptionsViewModel>().setIsPrescriptionDataNeedsReloading(true);
             if (isUserAgreedBefore) {
               LoaderBottomSheet.hideLoader();
               navigateToHomeScreen();

lib/features/medical_file/medical_file_view_model.dart

@@ -168,6 +168,16 @@ class MedicalFileViewModel extends ChangeNotifier {
     notifyListeners();
   }
 
+  setIsSickLeavesDataNeedsReloading(bool value) {
+    isSickLeavesDataNeedsReloading = value;
+    notifyListeners();
+  }
+
+  setIsMedicalReportsDataNeedsReloading(bool value) {
+    isMedicalReportsDataNeedsReloading = value;
+    notifyListeners();
+  }
+
   setIsPatientSickLeaveListLoading(bool val) {
     if (val && isSickLeavesDataNeedsReloading) {
       patientSickLeaveList.clear();

lib/features/paytabs/paytabs_view_model.dart

@@ -52,6 +52,11 @@ class PayTabsViewModel extends ChangeNotifier {
       profileId: paytabsProjectDetailsRespModel!.merchantIdentifier,
       serverKey: paytabsProjectDetailsRespModel!.accessCode,
       clientKey: paytabsProjectDetailsRespModel!.shaResponse,
+
+      // profileId: PaymentSdkDefaultConfig.profileID,
+      // serverKey: PaymentSdkDefaultConfig.serverKey,
+      // clientKey: PaymentSdkDefaultConfig.clientKey,
+
       transactionType: PaymentSdkTransactionType.SALE,
         cartId: cartID.substring((cartID.length - 5), cartID.length),
         cartDescription: paymentDescription,

lib/features/prescriptions/prescriptions_view_model.dart

@@ -78,6 +78,11 @@ class PrescriptionsViewModel extends ChangeNotifier {
     notifyListeners();
   }
 
+  void setIsPrescriptionDataNeedsReloading(bool value) {
+    isPrescriptionsDataNeedsReloading = value;
+    notifyListeners();
+  }
+
   Future<bool> checkIfReminderExistForPrescription(int index) async {
     final item = prescriptionDetailsList[index];
     // Check device calendar

lib/presentation/appointments/widgets/appointment_card.dart

@@ -637,6 +637,7 @@ class _AppointmentCardState extends State<AppointmentCard> {
   }
 
   void _goToDetails(BuildContext context) {
+    if (widget.isLoading) return;
     if (widget.isFromMedicalReport) return;
     if (widget.isForEyeMeasurements) {
       Navigator.of(context).push(

lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart

@@ -817,10 +817,25 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
     ApplePayInsertRequest applePayInsertRequest = ApplePayInsertRequest();
     if (!appState.isPaytabsEnabled) {
       await payfortViewModel.getPayfortConfigurations(
-          serviceId: ServiceTypeEnum.liveCareAppointment.getIdFromServiceEnum(), projectId: ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat ? 15 : 12, integrationId: 2);
+          serviceId: ServiceTypeEnum.liveCareAppointment.getIdFromServiceEnum(),
+          projectId: ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat
+              ? appState.getAuthenticatedUser()!.outSa == 0
+                  ? 15
+                  : 2
+              : appState.getAuthenticatedUser()!.outSa == 0
+                  ? 12
+                  : 2,
+          integrationId: 2);
     } else {
       await paytabsViewModel.setPaymentConfiguration("LiveCare Payment", num.parse((immediateLiveCareViewModel.liveCareImmediateAppointmentFeesList.total ?? "0.0")),
-          ServiceTypeEnum.liveCareAppointment.getIdFromServiceEnum(), (ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat ? 15 : 12));
+          ServiceTypeEnum.liveCareAppointment.getIdFromServiceEnum(),
+          (ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat
+              ? appState.getAuthenticatedUser()!.outSa == 0
+                  ? 15
+                  : 2
+              : appState.getAuthenticatedUser()!.outSa == 0
+                  ? 12
+                  : 2));
     }
 
     applePayInsertRequest.clientRequestID = transID;
@@ -835,7 +850,7 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
     applePayInsertRequest.deviceToken = await Utils.getStringFromPrefs(CacheConst.pushToken);
     applePayInsertRequest.voipToken = await Utils.getStringFromPrefs(CacheConst.voipToken);
     applePayInsertRequest.doctorID = 0;
-    applePayInsertRequest.projectID = "12";
+    applePayInsertRequest.projectID = appState.getAuthenticatedUser()!.outSa == 0 ? "12" : "2";
     applePayInsertRequest.serviceID = ServiceTypeEnum.liveCareAppointment.getIdFromServiceEnum().toString();
     applePayInsertRequest.channelID = 3;
     applePayInsertRequest.patientID = appState.getAuthenticatedUser()!.patientId.toString();

lib/presentation/medical_file/medical_file_page.dart

@@ -485,8 +485,6 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
             dividerColor: AppColors.dividerColor,
             itemPadding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 14.h),
             onItemToggled: (index, isExpanded) {
-              debugPrint("Item at index $index is now ${isExpanded ? 'expanded' : 'collapsed'}");
-
               if (index == 0 && isExpanded) {
                 myAppointmentsViewModel.getPatientMyDoctors(isTop8: true);
                 prescriptionsViewModel.initPrescriptionsViewModel();

lib/widgets/map/location_map_widget.dart

@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/api_consts.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
 import 'package:hmg_patient_app_new/core/utils/size_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/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
@@ -131,11 +130,14 @@ class LocationMapWidget extends StatelessWidget {
                 borderRadius: BorderRadius.circular(24.r),
                 child: Utils.buildImgWithNetwork(
                   url: staticMapUrl,
+                  width: double.infinity,
+                  height: 165.h,
                   iconColor: AppColors.transparent,
-                  fit: BoxFit.contain,
+                  fit: BoxFit.cover,
                   errorBuilder: (context, error, stackTrace) {
                     return Container(
                       height: 165.h,
+                      width: double.infinity,
                       decoration: BoxDecoration(
                         color: AppColors.bgScaffoldColor,
                         borderRadius: BorderRadius.circular(24.r),
@@ -153,24 +155,23 @@ class LocationMapWidget extends StatelessWidget {
               ),
               Positioned(
                 bottom: 0,
-                child: SizedBox(
-                  width: MediaQuery.of(context).size.width * 0.785,
-                  child: CustomButton(
-                    text: LocaleKeys.getDirections.tr(context: context),
-                    onPressed: onDirectionsTap ?? _defaultLaunchDirections,
-                    backgroundColor: AppColors.textColor.withValues(alpha: 0.8),
-                    borderColor: AppColors.textColor.withValues(alpha: 0.01),
-                    textColor: AppColors.whiteColor,
-                    fontSize: 14.f,
-                    fontWeight: FontWeight.w600,
-                    borderRadius: 12.r,
-                    padding: EdgeInsets.symmetric(horizontal: 10.w),
-                    height: 40.h,
-                    icon: AppAssets.directions_icon,
-                    iconColor: AppColors.whiteColor,
-                    iconSize: 14.h,
-                  ).paddingAll(12.h),
-                ),
+                left: 0,
+                right: 0,
+                child: CustomButton(
+                  text: LocaleKeys.getDirections.tr(context: context),
+                  onPressed: onDirectionsTap ?? _defaultLaunchDirections,
+                  backgroundColor: AppColors.textColor.withValues(alpha: 0.8),
+                  borderColor: AppColors.textColor.withValues(alpha: 0.01),
+                  textColor: AppColors.whiteColor,
+                  fontSize: 14.f,
+                  fontWeight: FontWeight.w600,
+                  borderRadius: 12.r,
+                  padding: EdgeInsets.symmetric(horizontal: 10.w),
+                  height: 40.h,
+                  icon: AppAssets.directions_icon,
+                  iconColor: AppColors.whiteColor,
+                  iconSize: 14.h,
+                ).paddingAll(12.h),
               ),
             ],
           ),