merge conflict fixed.

assets/images/svg/reminder_bell.svg

@@ -0,0 +1,4 @@
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5 1.25C8.04419 1.25 4.42789 4.84151 4.42786 9.27697C4.42776 10.3087 4.35838 11.0873 3.88271 11.7872C3.81656 11.8831 3.72879 12.0032 3.63289 12.1345C3.46634 12.3625 3.27527 12.624 3.13033 12.8505C2.87452 13.2503 2.62459 13.7324 2.53868 14.2942C2.25836 16.127 3.55056 17.3136 4.83746 17.8454C9.37016 19.7182 15.6298 19.7182 20.1625 17.8454C21.4494 17.3136 22.7416 16.127 22.4613 14.2942C22.3754 13.7324 22.1255 13.2503 21.8697 12.8505C21.7247 12.624 21.5337 12.3625 21.3671 12.1345C21.2712 12.0033 21.1835 11.8832 21.1173 11.7873C20.6416 11.0874 20.5722 10.3088 20.5721 9.27703C20.5721 4.84155 16.9558 1.25 12.5 1.25Z" fill="white"/>
+<path d="M12.4985 22.7477C13.5187 22.7477 14.4742 22.4563 15.2776 21.9511C15.9906 21.5027 16.3472 21.2785 16.2224 20.9057C16.0976 20.533 15.6057 20.5747 14.6217 20.6582C13.2146 20.7776 11.7824 20.7776 10.3752 20.6582C9.39126 20.5747 8.8993 20.533 8.77454 20.9057C8.64977 21.2784 9.0063 21.5027 9.71934 21.9511C10.5227 22.4563 11.4782 22.7477 12.4985 22.7477Z" fill="white"/>
+</svg>

ios/Runner/Runner.entitlements

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.developer.in-app-payments</key>
+	<array>
+		<string>merchant.com.hmgwebservices</string>
+		<string>merchant.com.hmgwebservices.uat</string>
+	</array>
+	<key>com.apple.developer.nfc.readersession.formats</key>
+	<array>
+		<string>TAG</string>
+	</array>
+</dict>
+</plist>

lib/core/app_assets.dart

@@ -85,7 +85,7 @@ class AppAssets {
   static const String uae_dirham_symbol = '$svgBasePath/uae_dirham_symbol.svg';
   static const String directions_icon = '$svgBasePath/directions_icon.svg';
   static const String apple_pay_button = '$svgBasePath/pay_with_apple_pay.svg';
-  static const String bell = '$svgBasePath/bell.svg';
+  static const String reminder_bell = '$svgBasePath/reminder_bell.svg';
 
 
   //bottom navigation//

lib/core/utils/calendar_utils.dart

@@ -81,16 +81,16 @@ class CalendarUtils {
 
   Future<void> _showReminderBottomSheet(BuildContext providedContext, DateTime dateTime, String doctorName, String eventId, String appoDateFormatted, String appoTimeFormatted,
       {required Function onSuccess, String? title, String? description, Function(int)? onMultiDateSuccess, bool? isMultiAllowed}) async {
-    showCommonBottomSheet(
-      providedContext,
-      child: Column(children: [
-
-      ],),
-      callBackFunc: () {},
-      title: "",
-      isCloseButtonVisible: false,
-      isFullScreen: false, height: null,
-    );
+    // showCommonBottomSheet(
+    //   providedContext,
+    //   child: Column(children: [
+    //
+    //   ],),
+    //   callBackFunc: () {},
+    //   title: "",
+    //   isCloseButtonVisible: false,
+    //   isFullScreen: false, height: null,
+    // );
 
     // return showDialog<void>(
     //   context: providedContext,

lib/presentation/prescriptions/prescription_reminder_view.dart

@@ -105,7 +105,7 @@ class _PrescriptionReminderViewState extends State<PrescriptionReminderView> {
                 backgroundColor: AppColors.bgGreenColor,
                 borderColor: AppColors.bgGreenColor,
                 textColor: Colors.white,
-                icon: AppAssets.bell,
+                icon: AppAssets.reminder_bell,
               ),
             ),
           ],