diff --git a/lib/core/api/api_client.dart b/lib/core/api/api_client.dart
index 4015a4dc..3bfbf6cb 100644
--- a/lib/core/api/api_client.dart
+++ b/lib/core/api/api_client.dart
@@ -211,7 +211,7 @@ class ApiClientImp implements ApiClient {
         }
 
         // body['TokenID'] = "@dm!n";
-        // body['PatientID'] = 5974668;
+        // body['PatientID'] = 2122445;
         // body['PatientID'] = 53320;
         // body['PatientTypeID'] = 1;
         // body['PatientOutSA'] = 0;
diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart
index c4feec0b..2c64b13e 100644
--- a/lib/core/api_consts.dart
+++ b/lib/core/api_consts.dart
@@ -5,7 +5,7 @@ import 'package:hmg_patient_app_new/core/enums.dart';
 class ApiConsts {
   static const maxSmallScreen = 660;
 
-  static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat;
+  static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod;
 
   // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT
 
@@ -301,7 +301,7 @@ class ApiConsts {
   static String googleCloudStorageENTranslationFileBaseURL = "https://storage.googleapis.com/hmg-patientapp-translations";
 
   // ************     static values for Api   ****************
-  static final double appVersionID = 21.5;
+  static final double appVersionID = 21.6;
 
   // static final double appVersionID = 50.7;
   static final int appChannelId = 3;
diff --git a/lib/features/prescriptions/prescriptions_view_model.dart b/lib/features/prescriptions/prescriptions_view_model.dart
index 5354daad..cdd85b9f 100644
--- a/lib/features/prescriptions/prescriptions_view_model.dart
+++ b/lib/features/prescriptions/prescriptions_view_model.dart
@@ -235,11 +235,16 @@ class PrescriptionsViewModel extends ChangeNotifier {
 
     result.fold(
       (failure) async {
-        onError!(failure.message);
+        if (onError != null) {
+          onError(failure.message);
+        }
       },
       (apiResponse) {
         if (apiResponse.messageStatus == 2) {
-          onError!(apiResponse.errorMessage!);
+          if (onError != null) {
+            onError(apiResponse.errorMessage ?? "An error occurred while fetching the prescription instructions PDF.");
+          }
+          // onError!(apiResponse.errorMessage!);
           // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {});
         } else if (apiResponse.messageStatus == 1) {
           prescriptionInstructionsPDFLink = apiResponse.data;
diff --git a/lib/presentation/appointments/my_appointments_page.dart b/lib/presentation/appointments/my_appointments_page.dart
index 1f54e3d1..3512472d 100644
--- a/lib/presentation/appointments/my_appointments_page.dart
+++ b/lib/presentation/appointments/my_appointments_page.dart
@@ -43,8 +43,10 @@ class _MyAppointmentsPageState extends State<MyAppointmentsPage> {
   @override
   void initState() {
     scheduleMicrotask(() {
-      myAppointmentsViewModel.initAppointmentsViewModel();
-      myAppointmentsViewModel.getPatientAppointments(true, false);
+      if (!myAppointmentsViewModel.isMyAppointmentsLoading) {
+        myAppointmentsViewModel.initAppointmentsViewModel();
+        myAppointmentsViewModel.getPatientAppointments(true, false);
+      }
     });
     super.initState();
   }
diff --git a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart
index 972606a9..ef21ccbd 100644
--- a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart
+++ b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart
@@ -544,12 +544,12 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
     if (selectedPaymentMethod == "TAMARA") {
       if (Platform.isAndroid) {
         Uri uri = new Uri.dataFromString(url);
-        tamaraPaymentStatus = uri.queryParameters['status']!;
-        tamaraOrderID = uri.queryParameters['AuthorizePaymentId']!;
+        tamaraPaymentStatus = uri.queryParameters['status'] ?? "";
+        tamaraOrderID = uri.queryParameters['AuthorizePaymentId'] ?? "";
       } else {
         Uri uri = new Uri.dataFromString(url);
-        tamaraPaymentStatus = uri.queryParameters['paymentStatus']!;
-        tamaraOrderID = uri.queryParameters['orderId']!;
+        tamaraPaymentStatus = uri.queryParameters['paymentStatus'] ?? "";
+        tamaraOrderID = uri.queryParameters['orderId'] ?? "";
       }
     }
 
diff --git a/lib/presentation/notifications/notification_details_page.dart b/lib/presentation/notifications/notification_details_page.dart
index abe8b521..ba78a298 100644
--- a/lib/presentation/notifications/notification_details_page.dart
+++ b/lib/presentation/notifications/notification_details_page.dart
@@ -1,5 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_screenshot_blocker/flutter_screenshot_blocker.dart';
 import 'package:hmg_patient_app_new/core/utils/date_util.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
@@ -20,28 +21,38 @@ class NotificationDetailsPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return CollapsingListView(
-      title: LocaleKeys.notificationDetails.tr(),
-      // trailing: IconButton(
-      //   icon: Icon(
-      //     Icons.share_outlined,
-      //     size: 24.h,
-      //     color: AppColors.textColor,
-      //   ),
-      //   onPressed: () {
-      //     _shareNotification();
-      //   },
-      // ),
-      child: SingleChildScrollView(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            SizedBox(height: 24.h),
-            // Notification content card
-            _buildNotificationCard(context),
-            SizedBox(height: 24.h),
-          ],
-        ).paddingSymmetrical(24.w, 0.h),
+    return ScreenshotBlockerWidget(
+      blockScreenshots: true,       // makes this widget appear black in screenshots
+      detectScreenshots: true,      // listen for screenshot attempts
+      onScreenshotDetected: (event) {
+        // event.type → 'screenshot_taken' or 'screenshot_blocked'
+        // ScaffoldMessenger.of(context).showSnackBar(
+        //   SnackBar(content: Text('Screenshots are not allowed!')),
+        // );
+      },
+      child: CollapsingListView(
+        title: LocaleKeys.notificationDetails.tr(),
+        // trailing: IconButton(
+        //   icon: Icon(
+        //     Icons.share_outlined,
+        //     size: 24.h,
+        //     color: AppColors.textColor,
+        //   ),
+        //   onPressed: () {
+        //     _shareNotification();
+        //   },
+        // ),
+        child: SingleChildScrollView(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              SizedBox(height: 24.h),
+              // Notification content card
+              _buildNotificationCard(context),
+              SizedBox(height: 24.h),
+            ],
+          ).paddingSymmetrical(24.w, 0.h),
+        ),
       ),
     );
   }
@@ -109,9 +120,9 @@ class NotificationDetailsPage extends StatelessWidget {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 LocaleKeys.messageNotification.tr().toText14(
-                  weight: FontWeight.w600,
-                  color: AppColors.greyTextColor,
-                ),
+                      weight: FontWeight.w600,
+                      color: AppColors.greyTextColor,
+                    ),
                 SizedBox(height: 8.h),
                 notification.message!.toText16(
                   weight: FontWeight.w400,
@@ -123,8 +134,7 @@ class NotificationDetailsPage extends StatelessWidget {
             ),
 
           // Notification image (if MessageType is "image")
-          if (notification.messageType != null &&
-              notification.messageType!.toLowerCase() == "image")
+          if (notification.messageType != null && notification.messageType!.toLowerCase() == "image")
             Builder(
               builder: (context) {
                 // Try to get image URL from videoURL or messageTypeData
@@ -147,9 +157,9 @@ class NotificationDetailsPage extends StatelessWidget {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     LocaleKeys.attachedImage.tr().toText14(
-                      weight: FontWeight.w600,
-                      color: AppColors.greyTextColor,
-                    ),
+                          weight: FontWeight.w600,
+                          color: AppColors.greyTextColor,
+                        ),
                     SizedBox(height: 8.h),
                     ClipRRect(
                       borderRadius: BorderRadius.circular(12.h),
@@ -177,8 +187,8 @@ class NotificationDetailsPage extends StatelessWidget {
                                   ),
                                   SizedBox(height: 8.h),
                                   LocaleKeys.failedToLoadImage.tr().toText12(
-                                    color: AppColors.greyTextColor,
-                                  ),
+                                        color: AppColors.greyTextColor,
+                                      ),
                                   SizedBox(height: 4.h),
                                   Text(
                                     imageUrl!,
@@ -205,10 +215,7 @@ class NotificationDetailsPage extends StatelessWidget {
                             ),
                             child: Center(
                               child: CircularProgressIndicator(
-                                value: loadingProgress.expectedTotalBytes != null
-                                    ? loadingProgress.cumulativeBytesLoaded /
-                                        loadingProgress.expectedTotalBytes!
-                                    : null,
+                                value: loadingProgress.expectedTotalBytes != null ? loadingProgress.cumulativeBytesLoaded / loadingProgress.expectedTotalBytes! : null,
                               ),
                             ),
                           );
@@ -249,7 +256,8 @@ ${notification.message ?? 'Notification'}
 Time: ${_formatTime(notification.isSentOn)}
 Date: ${_formatDate(notification.isSentOn)}
 ${notification.notificationType != null ? '\nType: ${notification.notificationType}' : ''}
-    '''.trim();
+    '''
+        .trim();
 
     await Share.share(shareText);
   }
@@ -274,4 +282,3 @@ ${notification.notificationType != null ? '\nType: ${notification.notificationTy
     }
   }
 }
-
diff --git a/lib/presentation/notifications/notifications_list_page.dart b/lib/presentation/notifications/notifications_list_page.dart
index e9a9447e..afea0fba 100644
--- a/lib/presentation/notifications/notifications_list_page.dart
+++ b/lib/presentation/notifications/notifications_list_page.dart
@@ -61,7 +61,8 @@ class _NotificationsListPageState extends State<NotificationsListPage> {
                 child: ListView.builder(
                     itemCount: notificationsVM.isNotificationsLoading
                         ? 4
-                        : notificationsVM.notificationsList.length + (notificationsVM.hasMoreNotifications ? 1 : 0),
+                        // : notificationsVM.notificationsList.length + (notificationsVM.hasMoreNotifications ? 1 : 0),
+                        : notificationsVM.notificationsList.length,
                     physics: NeverScrollableScrollPhysics(),
                     shrinkWrap: true,
                     padding: EdgeInsetsGeometry.zero,
diff --git a/pubspec.yaml b/pubspec.yaml
index eafbd513..a86f25ac 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,8 +2,8 @@ name: hmg_patient_app_new
 description: "New HMG Patient App"
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-#version: 0.0.38+37
-version: 0.0.7+1
+version: 0.0.39+38
+#version: 0.0.8+1
 
 environment:
   sdk: ">=3.6.0 <4.0.0"
@@ -108,6 +108,7 @@ dependencies:
   clarity_flutter: 1.9.0
   flutter_amazonpaymentservices: ^0.0.13
   screen_brightness: ^1.0.1
+  flutter_screenshot_blocker: ^1.0.4
 
 dev_dependencies:
   flutter_test: