merged conflict

lib/presentation/appointments/appointment_payment_page.dart

@@ -335,7 +335,7 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
       // }
     } else {
       showCommonBottomSheet(context,
-          child: Utils.getLoadingWidget(), callBackFunc: () {}, title: "", height: ResponsiveExtension.screenHeight * 0.3, isCloseButtonVisible: false, isDismissible: false, isFullScreen: false);
+          child: Utils.getLoadingWidget(), callBackFunc: (str) {}, title: "", height: ResponsiveExtension.screenHeight * 0.3, isCloseButtonVisible: false, isDismissible: false, isFullScreen: false);
       await payfortViewModel.checkPaymentStatus(
           transactionID: transID,
           onSuccess: (apiResponse) async {
@@ -399,7 +399,7 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
         "1",
         "Haroon Amjad",
         "3628599",
-        AuthenticatedUser(outSA: 0, mobileNumber: "0593233758"),
+        AuthenticatedUser(outSa: 0, mobileNumber: "0593233758"),
         browser!,
         widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment ?? false,
         "2",

lib/widgets/common_bottom_sheet.dart

@@ -7,7 +7,7 @@ import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 
 void showCommonBottomSheet(BuildContext context,
-    {required Widget child,  Function(String?)? callBackFunc, String? title, required double height, bool isCloseButtonVisible = true, bool isFullScreen = true}) {
+    {required Widget child,  Function(String?)? callBackFunc, String? title, required double height, bool isCloseButtonVisible = true, bool isFullScreen = true, bool isDismissible = true}) {
   showModalBottomSheet<String>(
       sheetAnimationStyle: AnimationStyle(
         duration: Duration(milliseconds: 500), // Custom animation duration

lib/widgets/in_app_browser/InAppBrowser.dart

@@ -207,7 +207,7 @@ class MyInAppBrowser extends InAppBrowser {
       tamaraRequestModel.appointmentNo = (appoNo != null && appoNo != "") ? appoNo.toString() : "0";
       tamaraRequestModel.customerName = patientName;
       tamaraRequestModel.fileNumber = patientID.toString();
-      tamaraRequestModel.patientOutSA = authenticatedUser.outSA == 1 ? true : false;
+      tamaraRequestModel.patientOutSA = authenticatedUser.outSa == 1 ? true : false;
       tamaraRequestModel.deviceToken = await Utils.getStringFromPrefs(CacheConst.pushToken);
       tamaraRequestModel.latitude = appState.userLat.toString();
       tamaraRequestModel.longitude = appState.userLong.toString();
@@ -276,7 +276,7 @@ class MyInAppBrowser extends InAppBrowser {
     form = form.replaceFirst('PROJECT_ID_VALUE', projId);
     form = form.replaceFirst('PAYMENT_OPTION_VALUE', paymentMethod);
     form = form.replaceFirst('LANG_VALUE', currentLanguageID);
-    form = form.replaceFirst('PATIENT_OUT_SA', authUser.outSA == 0 ? false.toString() : true.toString());
+    form = form.replaceFirst('PATIENT_OUT_SA', authUser.outSa == 0 ? false.toString() : true.toString());
     form = form.replaceFirst('PATIENT_TYPE_ID', patientData == null ? patientType.toString() : "1");
 
     Platform.isIOS
@@ -338,10 +338,10 @@ class MyInAppBrowser extends InAppBrowser {
     form = form.replaceFirst('INSTALLMENTS_VALUE', installments);
     form = form.replaceFirst('CUSTNATIONALID_VALUE', authUser.patientIdentificationNo!);
     form = form.replaceFirst('CUSTMOBILE_VALUE', authUser.mobileNumber!);
-    form = form.replaceFirst('CUSTDOB_VALUE', DateUtil.getDayMonthYearDateFormatted(authUser.dateofBirthDataTime!));
+    form = form.replaceFirst('CUSTDOB_VALUE', DateUtil.getDayMonthYearDateFormatted(authUser.strDateofBirth!));
 
-    form = form.replaceFirst('CURRENCY_VALUE', authUser.outSA == 0 ? "SAR" : "AED");
-    form = form.replaceFirst('COUNTRY_CODE_VALUE', authUser.outSA == 0 ? "966" : "971");
+    form = form.replaceFirst('CURRENCY_VALUE', authUser.outSa == 0 ? "SAR" : "AED");
+    form = form.replaceFirst('COUNTRY_CODE_VALUE', authUser.outSa == 0 ? "966" : "971");
     form = form.replaceFirst('CUSTNAME_VALUE', patientName);
     form = form.replaceFirst('CUSTLASTNAME_VALUE', patientName);
     form = form.replaceFirst('CUSTID_VALUE', patientID.toString());