diff --git a/lib/config/config.dart b/lib/config/config.dart
index d58bcff6..a9091a47 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -22,8 +22,8 @@ var PACKAGES_ORDER_HISTORY = '/api/orders/items';
 var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
 // var  BASE_URL = 'http://10.50.100.198:2018/';
 // var  BASE_URL = 'http://10.50.100.198:4422/';
-var BASE_URL = 'https://uat.hmgwebservices.com/';
-// var BASE_URL = 'https://hmgwebservices.com/';
+// var BASE_URL = 'https://uat.hmgwebservices.com/';
+var BASE_URL = 'https://hmgwebservices.com/';
 //  var  BASE_URL = 'http://10.20.200.111:1010/';
 // var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
 // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
@@ -668,10 +668,10 @@ var GET_DENTAL_INSTRUCTIONS = 'Services/OUTPs.svc/Rest/getProcedureNotification'
 //PAYFORT
 var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails";
 var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse";
-// var payFortEnvironment = FortEnvironment.production;
-// var applePayMerchantId = "merchant.com.hmgwebservices";
-var payFortEnvironment = FortEnvironment.test;
-var applePayMerchantId = "merchant.com.hmgwebservices.uat";
+var payFortEnvironment = FortEnvironment.production;
+var applePayMerchantId = "merchant.com.hmgwebservices";
+// var payFortEnvironment = FortEnvironment.test;
+// var applePayMerchantId = "merchant.com.hmgwebservices.uat";
 
 class AppGlobal {
   static var context;
diff --git a/lib/core/viewModels/project_view_model.dart b/lib/core/viewModels/project_view_model.dart
index 398b3afe..7216da7b 100644
--- a/lib/core/viewModels/project_view_model.dart
+++ b/lib/core/viewModels/project_view_model.dart
@@ -30,7 +30,7 @@ class ProjectViewModel extends BaseViewModel {
   AppSharedPreferences sharedPref = AppSharedPreferences();
   Locale _appLocale = Locale('ar');
   String currentLanguage = 'ar';
-  bool _isArabic = false;
+  bool _isArabic = true;
   bool isInternetConnection = true;
   bool isLoading = false;
   bool isError = false;
diff --git a/lib/pages/Blood/confirm_payment_page.dart b/lib/pages/Blood/confirm_payment_page.dart
index 20cfd88f..edf3d0e5 100644
--- a/lib/pages/Blood/confirm_payment_page.dart
+++ b/lib/pages/Blood/confirm_payment_page.dart
@@ -290,7 +290,6 @@ class ConfirmPaymentPage extends StatelessWidget {
     GifLoaderDialogUtils.showMyDialog(AppGlobal.context);
     service.addAdvancedNumberRequest(advanceNumber, paymentReference, appointmentID, AppGlobal.context).then((res) {
       GifLoaderDialogUtils.hideDialog(AppGlobal.context);
-      print(res);
       navigateToHome(AppGlobal.context);
     }).catchError((err) {
       GifLoaderDialogUtils.hideDialog(AppGlobal.context);
diff --git a/lib/pages/Covid-DriveThru/covid-payment-summary.dart b/lib/pages/Covid-DriveThru/covid-payment-summary.dart
index a9a2af78..384b2422 100644
--- a/lib/pages/Covid-DriveThru/covid-payment-summary.dart
+++ b/lib/pages/Covid-DriveThru/covid-payment-summary.dart
@@ -420,7 +420,6 @@ class _CovidPaymentSummaryState extends State<CovidPaymentSummary> {
   addAdvancedNumberRequest(String advanceNumber, String paymentReference, String appointmentID) {
     DoctorsListService service = new DoctorsListService();
     service.addAdvancedNumberRequest(advanceNumber, paymentReference, appointmentID, context).then((res) {
-      print(res);
       getAppoQR(context);
     }).catchError((err) {
       GifLoaderDialogUtils.hideDialog(context);
diff --git a/lib/pages/medical/balance/confirm_payment_page.dart b/lib/pages/medical/balance/confirm_payment_page.dart
index c5fb2c2e..da9570f2 100644
--- a/lib/pages/medical/balance/confirm_payment_page.dart
+++ b/lib/pages/medical/balance/confirm_payment_page.dart
@@ -529,7 +529,6 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
   addAdvancedNumberRequest(String advanceNumber, String paymentReference, dynamic appointmentID, AppoitmentAllHistoryResultList appo) {
     DoctorsListService service = new DoctorsListService();
     service.addAdvancedNumberRequest(advanceNumber, paymentReference, appointmentID, AppGlobal.context).then((res) {
-      print(res);
       GifLoaderDialogUtils.hideDialog(AppGlobal.context);
       navigateToHome(AppGlobal.context);
     }).catchError((err) {
diff --git a/lib/services/clinic_services/get_clinic_service.dart b/lib/services/clinic_services/get_clinic_service.dart
index 82e52ae7..dc494a61 100644
--- a/lib/services/clinic_services/get_clinic_service.dart
+++ b/lib/services/clinic_services/get_clinic_service.dart
@@ -52,7 +52,7 @@ class ClinicListService extends BaseService {
   Future<Map> getProjectsList(int languageID, context) async {
     Map<String, dynamic> request = {};
 
-    request = {"LanguageID": languageID};
+    // request = {"LanguageID": languageID};
 
     dynamic localRes;
 
diff --git a/lib/uitl/app_shared_preferences.dart b/lib/uitl/app_shared_preferences.dart
index 2d5fa774..4ecd1b91 100644
--- a/lib/uitl/app_shared_preferences.dart
+++ b/lib/uitl/app_shared_preferences.dart
@@ -76,7 +76,8 @@ class AppSharedPreferences {
     final SharedPreferences prefs = await _prefs;
     await prefs.reload();
     String value = prefs.getString(key).toString();
-    return value == null ? defaultVal : value;
+    return (value == null) || (value == "null") ? defaultVal : value;
+    // return value == null ? defaultVal : value;
   }
 
   /// Get List of String [key] the key was saved
diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart
index 9ffec736..f353eec2 100644
--- a/lib/widgets/in_app_browser/InAppBrowser.dart
+++ b/lib/widgets/in_app_browser/InAppBrowser.dart
@@ -38,9 +38,9 @@ class MyInAppBrowser extends InAppBrowser {
   static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE
   // static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT
 
-  static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT
+  // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT
 
-  // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE
+  static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE
 
   // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS