diff --git a/android/app/agconnect-services.json b/android/app/agconnect-services.json
index 66f04d15..91aad2c7 100644
--- a/android/app/agconnect-services.json
+++ b/android/app/agconnect-services.json
@@ -1 +1,74 @@
-{"agcgw":{"url":"connect-drcn.dbankcloud.cn","backurl":"connect-drcn.hispace.hicloud.com","websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn","websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com"},"agcgw_all":{"SG":"connect-dra.dbankcloud.cn","SG_back":"connect-dra.hispace.hicloud.com","CN":"connect-drcn.dbankcloud.cn","CN_back":"connect-drcn.hispace.hicloud.com","RU":"connect-drru.hispace.dbankcloud.ru","RU_back":"connect-drru.hispace.dbankcloud.cn","DE":"connect-dre.dbankcloud.cn","DE_back":"connect-dre.hispace.hicloud.com"},"websocketgw_all":{"SG":"connect-ws-dra.hispace.dbankcloud.cn","SG_back":"connect-ws-dra.hispace.dbankcloud.com","CN":"connect-ws-drcn.hispace.dbankcloud.cn","CN_back":"connect-ws-drcn.hispace.dbankcloud.com","RU":"connect-ws-drru.hispace.dbankcloud.ru","RU_back":"connect-ws-drru.hispace.dbankcloud.cn","DE":"connect-ws-dre.hispace.dbankcloud.cn","DE_back":"connect-ws-dre.hispace.dbankcloud.com"},"client":{"cp_id":"2640966000002322881","product_id":"736430079244816567","client_id":"563735388191982656","client_secret":"650C7C799812AFFD53A10C7756CF05FB9F215A7E49032ABA8EBF3E14B77535CF","project_id":"736430079244816567","app_id":"116912301","api_key":"CgB6e3x9DJzMgRCmnT6dyUEkp6UsIfddb6l3w0ZEXzeiRMHEFi3400Z5fJ5qaHneU0OrAI/JRpk+DMGVs3QpUxlI","package_name":"com.cloudsolutions.HMGPatientApp"},"oauth_client":{"client_id":"116912301","client_type":1},"app_info":{"app_id":"116912301","package_name":"com.cloudsolutions.HMGPatientApp"},"service":{"analytics":{"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn","collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn","collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn","collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com","collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn","resource_id":"p1","channel_id":""},"ml":{"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"},"cloudstorage":{"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn","storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru","storage_url_sg":"https://ops-dra.agcstorage.link","storage_url_de":"https://ops-dre.agcstorage.link","storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn","storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru","storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia","storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu","storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn"},"search":{"url":"https://search-drcn.cloud.huawei.com"},"edukit":{"edu_url":"edukit.cloud.huawei.com.cn","dh_url":"edukit.cloud.huawei.com.cn"}},"region":"CN","configuration_version":"3.0","appInfos":[{"package_name":"com.cloudsolutions.HMGPatientApp","client":{"app_id":"116912301"},"app_info":{"package_name":"com.cloudsolutions.HMGPatientApp","app_id":"116912301"},"oauth_client":{"client_type":1,"client_id":"116912301"}},{"package_name":"com.ejada.hmg","client":{"app_id":"102857389"},"app_info":{"package_name":"com.ejada.hmg","app_id":"102857389"},"oauth_client":{"client_type":1,"client_id":"102857389"}}]}
\ No newline at end of file
+{
+	"agcgw":{
+		"backurl":"connect-drcn.hispace.hicloud.com",
+		"url":"connect-drcn.dbankcloud.cn",
+		"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
+		"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
+	},
+	"agcgw_all":{
+		"CN":"connect-drcn.dbankcloud.cn",
+		"CN_back":"connect-drcn.hispace.hicloud.com",
+		"DE":"connect-dre.dbankcloud.cn",
+		"DE_back":"connect-dre.hispace.hicloud.com",
+		"RU":"connect-drru.dbankcloud.cn",
+		"RU_back":"connect-drru.hispace.hicloud.com",
+		"SG":"connect-dra.dbankcloud.cn",
+		"SG_back":"connect-dra.hispace.hicloud.com"
+	},
+	"client":{
+		"cp_id":"2640966000002322881",
+		"product_id":"736430079244816567",
+		"client_id":"563735388191982656",
+		"client_secret":"650C7C799812AFFD53A10C7756CF05FB9F215A7E49032ABA8EBF3E14B77535CF",
+		"project_id":"736430079244816567",
+		"app_id":"102857389",
+		"api_key":"CgB6e3x9DJzMgRCmnT6dyUEkp6UsIfddb6l3w0ZEXzeiRMHEFi3400Z5fJ5qaHneU0OrAI/JRpk+DMGVs3QpUxlI",
+		"package_name":"com.ejada.hmg"
+	},
+	"oauth_client":{
+		"client_id":"102857389",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"102857389",
+		"package_name":"com.ejada.hmg"
+	},
+	"service":{
+		"analytics":{
+			"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"collector_url_ru":"datacollector-drru.dt.hicloud.com,datacollector-drru.dt.dbankcloud.cn",
+			"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+			"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+			"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"resource_id":"p1",
+			"channel_id":""
+		},
+		"search":{
+			"url":"https://search-drcn.cloud.huawei.com"
+		},
+		"cloudstorage":{
+			"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn"
+		},
+		"ml":{
+			"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
+		}
+	},
+	"region":"CN",
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.ejada.hmg",
+			"client":{
+				"app_id":"102857389"
+			},
+			"app_info":{
+				"package_name":"com.ejada.hmg",
+				"app_id":"102857389"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"102857389"
+			}
+		}
+	]
+}
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 13f778ff..e115ebef 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -19,7 +19,8 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    namespace = "com.cloudsolutions.HMGPatientApp"
+//    namespace = "com.cloudsolutions.HMGPatientApp"
+    namespace = "com.ejada.hmg"
     compileSdk = 36
     // Using NDK 26 for better compatibility with Zoom SDK native libraries
 //    ndkVersion = "27.0.12077973"
@@ -33,7 +34,8 @@ android {
     }
 
     defaultConfig {
-        applicationId = "com.cloudsolutions.HMGPatientApp"
+//        applicationId = "com.cloudsolutions.HMGPatientApp"
+        applicationId = "com.ejada.hmg"
         // minSdk = 24
         minSdk = 29
         targetSdk = 36
@@ -141,6 +143,10 @@ flutter {
     source = "../.."
 }
 
+configurations.all {
+    exclude(group = "org.jetbrains.kotlin", module = "kotlin-android-extensions-runtime")
+}
+
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20")
     implementation("com.google.firebase:firebase-messaging:24.1.2")
diff --git a/android/app/google-services.json b/android/app/google-services.json
index 49bf1ace..3707617c 100644
--- a/android/app/google-services.json
+++ b/android/app/google-services.json
@@ -3,45 +3,9 @@
     "project_number": "815750722565",
     "firebase_url": "https://api-project-815750722565.firebaseio.com",
     "project_id": "api-project-815750722565",
-    "storage_bucket": "api-project-815750722565.firebasestorage.app"
+    "storage_bucket": "api-project-815750722565.appspot.com"
   },
   "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:815750722565:android:fa20b3a2401e08633c186c",
-        "android_client_info": {
-          "package_name": "com.cloudsolutions.HMGPatientApp"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "815750722565-3a0gc7neins0eoahdrimrfksk0sqice8.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDZDeWcBlRE3YfJWYt_DCiToVnANfaj8qg"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "815750722565-3a0gc7neins0eoahdrimrfksk0sqice8.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "815750722565-0cq9366orvsk5ipivq6lijcj56u03fr7.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.void.demo"
-              }
-            }
-          ]
-        }
-      }
-    },
     {
       "client_info": {
         "mobilesdk_app_id": "1:815750722565:android:62281cd3e5df4063",
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
index e4e65227..68b506a1 100644
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
@@ -3,7 +3,7 @@
 -keep class com.twilio.common.** { *; }
 -keepattributes InnerClasses
 
--keep class com.ejada.** { *; }
+#-keep class com.ejada.** { *; }
 -keep class org.webrtc.** { *; }
 
 -keep class com.builttoroam.devicecalendar.** { *; }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 70a68707..b6188224 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.cloudsolutions.HMGPatientApp">
+    package="com.ejada.hmg">
     <!--
          io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -133,7 +133,7 @@
         android:name=".Application"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher_local"
-        android:label="Dr. Alhabib Beta"
+        android:label="Dr. Alhabib"
         android:screenOrientation="sensorPortrait"
         android:showOnLockScreen="true"
         android:usesCleartextTraffic="true"
@@ -267,6 +267,9 @@
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="AIzaSyB6TERnxIr0yJ3qG4ULBZbu0sAD4tGqtng" />
+        <meta-data
+            android:name="com.huawei.hms.client.appid"
+            android:value="appid=116912301" />
         <!--
  Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/Application.kt b/android/app/src/main/kotlin/com/ejada/hmg/Application.kt
similarity index 94%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/Application.kt
rename to android/app/src/main/kotlin/com/ejada/hmg/Application.kt
index 2520d186..32eb97cc 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/Application.kt
+++ b/android/app/src/main/kotlin/com/ejada/hmg/Application.kt
@@ -1,5 +1,5 @@
 //package com.cloud.diplomaticquarterapp
-package com.cloudsolutions.HMGPatientApp
+package com.ejada.hmg
 
 
 import io.flutter.app.FlutterApplication
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/MainActivity.kt b/android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
similarity index 95%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/MainActivity.kt
rename to android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
index fdb4d7ad..922e515f 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.cloudsolutions.HMGPatientApp
+package com.ejada.hmg
 
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -7,7 +7,8 @@ import android.util.Log
 import android.view.WindowManager
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi
-import com.cloudsolutions.HMGPatientApp.watch.samsung_watch.SamsungWatch
+import com.ejada.hmg.watch.samsung_watch.SamsungWatch
+import com.ejada.hmg.watch.huawei.HuaweiWatch
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugins.GeneratedPluginRegistrant
 
@@ -24,6 +25,7 @@ class MainActivity: FlutterFragmentActivity() {
 
         PenguinInPlatformBridge(flutterEngine, this).create()
         SamsungWatch(flutterEngine, this)
+        HuaweiWatch(flutterEngine, this)
     }
 
     override fun onRequestPermissionsResult(
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PenguinInPlatformBridge.kt b/android/app/src/main/kotlin/com/ejada/hmg/PenguinInPlatformBridge.kt
similarity index 85%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PenguinInPlatformBridge.kt
rename to android/app/src/main/kotlin/com/ejada/hmg/PenguinInPlatformBridge.kt
index 5fae68ca..c76bd379 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PenguinInPlatformBridge.kt
+++ b/android/app/src/main/kotlin/com/ejada/hmg/PenguinInPlatformBridge.kt
@@ -1,14 +1,14 @@
-package com.cloudsolutions.HMGPatientApp
+package com.ejada.hmg
 
 import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
-import com.cloudsolutions.HMGPatientApp.penguin.PenguinView
+import com.ejada.hmg.penguin.PenguinView
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodCall
-import com.cloudsolutions.HMGPatientApp.PermissionManager.HostNotificationPermissionManager
-import com.cloudsolutions.HMGPatientApp.PermissionManager.HostBgLocationManager
-import com.cloudsolutions.HMGPatientApp.PermissionManager.HostGpsStateManager
+import com.ejada.hmg.PermissionManager.HostNotificationPermissionManager
+import com.ejada.hmg.PermissionManager.HostBgLocationManager
+import com.ejada.hmg.PermissionManager.HostGpsStateManager
 import io.flutter.plugin.common.MethodChannel
 
 class PenguinInPlatformBridge(
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/AppPreferences.java b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/AppPreferences.java
similarity index 98%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/AppPreferences.java
rename to android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/AppPreferences.java
index 2f6c9722..d0127998 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/AppPreferences.java
+++ b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/AppPreferences.java
@@ -1,4 +1,4 @@
-package com.cloudsolutions.HMGPatientApp.PermissionManager;
+package com.ejada.hmg.PermissionManager;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/HostBgLocationManager.java b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/HostBgLocationManager.java
similarity index 98%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/HostBgLocationManager.java
rename to android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/HostBgLocationManager.java
index da0d8138..5bc332dc 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/HostBgLocationManager.java
+++ b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/HostBgLocationManager.java
@@ -1,4 +1,4 @@
-package com.cloudsolutions.HMGPatientApp.PermissionManager;
+package com.ejada.hmg.PermissionManager;
 
 import android.Manifest;
 import android.app.Activity;
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/HostGpsStateManager.java b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/HostGpsStateManager.java
similarity index 97%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/HostGpsStateManager.java
rename to android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/HostGpsStateManager.java
index f7f39c97..adde1206 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/HostGpsStateManager.java
+++ b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/HostGpsStateManager.java
@@ -1,4 +1,4 @@
-package com.cloudsolutions.HMGPatientApp.PermissionManager;
+package com.ejada.hmg.PermissionManager;
 
 import android.Manifest;
 import android.app.Activity;
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/HostNotificationPermissionManager.java b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/HostNotificationPermissionManager.java
similarity index 97%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/HostNotificationPermissionManager.java
rename to android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/HostNotificationPermissionManager.java
index 2dac16ca..5b9f19e6 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/HostNotificationPermissionManager.java
+++ b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/HostNotificationPermissionManager.java
@@ -1,4 +1,4 @@
-package com.cloudsolutions.HMGPatientApp.PermissionManager;
+package com.ejada.hmg.PermissionManager;
 
 import android.app.Activity;
 import android.content.pm.PackageManager;
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/PermissionHelper.kt b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/PermissionHelper.kt
similarity index 94%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/PermissionHelper.kt
rename to android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/PermissionHelper.kt
index 9a033f36..eb2f17aa 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/PermissionHelper.kt
+++ b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/PermissionHelper.kt
@@ -1,4 +1,4 @@
-package com.cloudsolutions.HMGPatientApp.PermissionManager
+package com.ejada.hmg.PermissionManager
 
 import android.Manifest
 
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/PermissionManager.kt b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/PermissionManager.kt
similarity index 96%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/PermissionManager.kt
rename to android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/PermissionManager.kt
index 6dadddb1..d8aea7bd 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/PermissionManager.kt
+++ b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/PermissionManager.kt
@@ -1,4 +1,4 @@
-package com.cloudsolutions.HMGPatientApp.PermissionManager
+package com.ejada.hmg.PermissionManager
 
 import android.app.Activity
 import android.content.Context
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/PermissionResultReceiver.kt b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/PermissionResultReceiver.kt
similarity index 87%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/PermissionResultReceiver.kt
rename to android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/PermissionResultReceiver.kt
index 7c2df4cb..c07d1ded 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/PermissionManager/PermissionResultReceiver.kt
+++ b/android/app/src/main/kotlin/com/ejada/hmg/PermissionManager/PermissionResultReceiver.kt
@@ -1,4 +1,4 @@
-package com.cloudsolutions.HMGPatientApp.PermissionManager
+package com.ejada.hmg.PermissionManager
 
 // PermissionResultReceiver.kt
 import android.content.BroadcastReceiver
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/penguin/PenguinMethod.kt b/android/app/src/main/kotlin/com/ejada/hmg/penguin/PenguinMethod.kt
similarity index 90%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/penguin/PenguinMethod.kt
rename to android/app/src/main/kotlin/com/ejada/hmg/penguin/PenguinMethod.kt
index 4807bcc7..18463d26 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/penguin/PenguinMethod.kt
+++ b/android/app/src/main/kotlin/com/ejada/hmg/penguin/PenguinMethod.kt
@@ -1,4 +1,4 @@
-package com.cloudsolutions.HMGPatientApp.penguin
+package com.ejada.hmg.penguin
 
 enum class PenguinMethod {
     //    initializePenguin("initializePenguin"),
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/penguin/PenguinNavigator.kt b/android/app/src/main/kotlin/com/ejada/hmg/penguin/PenguinNavigator.kt
similarity index 98%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/penguin/PenguinNavigator.kt
rename to android/app/src/main/kotlin/com/ejada/hmg/penguin/PenguinNavigator.kt
index 29cc82df..70889d37 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/penguin/PenguinNavigator.kt
+++ b/android/app/src/main/kotlin/com/ejada/hmg/penguin/PenguinNavigator.kt
@@ -1,4 +1,4 @@
-package com.cloudsolutions.HMGPatientApp.penguin
+package com.ejada.hmg.penguin
 
 import android.content.Context
 import com.google.gson.Gson
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/penguin/PenguinView.kt b/android/app/src/main/kotlin/com/ejada/hmg/penguin/PenguinView.kt
similarity index 97%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/penguin/PenguinView.kt
rename to android/app/src/main/kotlin/com/ejada/hmg/penguin/PenguinView.kt
index 2122e01c..5e262abb 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/penguin/PenguinView.kt
+++ b/android/app/src/main/kotlin/com/ejada/hmg/penguin/PenguinView.kt
@@ -1,4 +1,4 @@
-package com.cloudsolutions.HMGPatientApp.penguin
+package com.ejada.hmg.penguin
 
 import android.app.Activity
 import android.content.Context
@@ -12,10 +12,10 @@ import android.view.ViewGroup
 import android.widget.RelativeLayout
 import android.widget.Toast
 import androidx.annotation.RequiresApi
-import com.cloudsolutions.HMGPatientApp.PermissionManager.PermissionManager
-import com.cloudsolutions.HMGPatientApp.PermissionManager.PermissionResultReceiver
-import com.cloudsolutions.HMGPatientApp.MainActivity
-import com.cloudsolutions.HMGPatientApp.PermissionManager.PermissionHelper
+import com.ejada.hmg.PermissionManager.PermissionManager
+import com.ejada.hmg.PermissionManager.PermissionResultReceiver
+import com.ejada.hmg.MainActivity
+import com.ejada.hmg.PermissionManager.PermissionHelper
 import com.peng.pennavmap.PlugAndPlayConfiguration
 import com.peng.pennavmap.PlugAndPlaySDK
 import com.peng.pennavmap.enums.InitializationErrorType
diff --git a/android/app/src/main/kotlin/com/ejada/hmg/watch/huawei/HuaweiWatch.kt b/android/app/src/main/kotlin/com/ejada/hmg/watch/huawei/HuaweiWatch.kt
new file mode 100644
index 00000000..e04cf3f4
--- /dev/null
+++ b/android/app/src/main/kotlin/com/ejada/hmg/watch/huawei/HuaweiWatch.kt
@@ -0,0 +1,87 @@
+package com.ejada.hmg.watch.huawei
+
+import android.os.Build
+import android.util.Log
+import androidx.annotation.RequiresApi
+import com.ejada.hmg.watch.samsung_watch.model.Vitals
+import com.huawei.hms.adapter.AvailableAdapter
+import com.huawei.hms.adapter.internal.AvailableCode
+
+import com.samsung.android.sdk.health.data.HealthDataStore
+import com.samsung.android.sdk.health.data.permission.AccessType
+import com.samsung.android.sdk.health.data.permission.Permission
+import com.samsung.android.sdk.health.data.request.DataType
+import com.samsung.android.sdk.health.data.request.DataTypes
+import com.samsung.android.sdk.health.data.request.LocalTimeFilter
+import com.samsung.android.sdk.health.data.request.LocalTimeGroup
+import com.samsung.android.sdk.health.data.request.LocalTimeGroupUnit
+import com.samsung.android.sdk.health.data.request.Ordering
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
+import java.time.LocalDateTime
+import java.time.LocalTime
+import com.huawei.hms.hihealth.HuaweiHiHealth
+import com.ejada.hmg.MainActivity
+
+
+class HuaweiWatch(
+    private var flutterEngine: FlutterEngine,
+    private var mainActivity: MainActivity
+) {
+
+    private lateinit var channel: MethodChannel
+    private lateinit var dataStore: HealthDataStore
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+    private  val TAG = "HuaweiWatch"
+
+
+    private lateinit var vitals: MutableMap<String, List<Vitals>>
+    companion object {
+        private const val CHANNEL = "huawei_watch"
+
+    }
+    init{
+        create()
+    }
+
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    fun create() {
+        Log.d(TAG, "create: is called")
+//        openTok = OpenTok(mainActivity, flutterEngine)
+        channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
+        channel.setMethodCallHandler { call: MethodCall, result: MethodChannel.Result ->
+            when (call.method) {
+                "init" -> {
+                   init(result)
+                }
+
+
+                else -> {
+                    result.notImplemented()
+                }
+            }
+        }
+    }
+
+    fun init(result: MethodChannel.Result) {
+
+        Log.d(TAG, "onMethodCall:  init called")
+        val mSettingController = HuaweiHiHealth.getSettingController(mainActivity);
+        val availableAdapter = AvailableAdapter(60400312)
+        val results= availableAdapter.isHuaweiMobileServicesAvailable(mainActivity) // context indicates a context object.
+        if (results != AvailableCode.SUCCESS) {
+            availableAdapter.startResolution(mainActivity, object : AvailableAdapter.AvailableCallBack {
+                override fun onComplete(result: Int) {
+                    Log.d(TAG, "onComplete result: " + result)
+                }
+            })
+        }
+        result.success("init success")
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/watch/samsung_watch/SamsungWatch.kt b/android/app/src/main/kotlin/com/ejada/hmg/watch/samsung_watch/SamsungWatch.kt
similarity index 90%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/watch/samsung_watch/SamsungWatch.kt
rename to android/app/src/main/kotlin/com/ejada/hmg/watch/samsung_watch/SamsungWatch.kt
index 336651e4..d2366a65 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/watch/samsung_watch/SamsungWatch.kt
+++ b/android/app/src/main/kotlin/com/ejada/hmg/watch/samsung_watch/SamsungWatch.kt
@@ -1,12 +1,12 @@
-package com.cloudsolutions.HMGPatientApp.watch.samsung_watch
+package com.ejada.hmg.watch.samsung_watch
 
 
 
 import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
-import com.cloudsolutions.HMGPatientApp.MainActivity
-import com.cloudsolutions.HMGPatientApp.watch.samsung_watch.model.Vitals
+import com.ejada.hmg.MainActivity
+import com.ejada.hmg.watch.samsung_watch.model.Vitals
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodCall
 import com.samsung.android.sdk.health.data.HealthDataService
@@ -75,12 +75,22 @@ class SamsungWatch(
                         Permission.of(DataTypes.ACTIVITY_SUMMARY, AccessType.READ),
                         Permission.of(DataTypes.SLEEP, AccessType.READ),
                         Permission.of(DataTypes.BODY_TEMPERATURE, AccessType.READ),
-                        Permission.of(DataTypes.EXERCISE, AccessType.READ),
+//                        Permission.of(DataTypes.EXERCISE, AccessType.READ),
 //                        Permission.of(DataTypes.SKIN_TEMPERATURE, AccessType.READ),
 //                        Permission.of(DataTypes.NUTRITION, AccessType.READ),
 
                     )
-                    scope.launch {
+                    val typesToTest = listOf(
+                        DataTypes.HEART_RATE,
+                        DataTypes.STEPS,
+                        DataTypes.BLOOD_OXYGEN,
+                        DataTypes.ACTIVITY_SUMMARY,
+                        DataTypes.SLEEP,
+                        DataTypes.BODY_TEMPERATURE,
+//                        DataTypes.EXERCISE
+                    )
+
+                    scope.launch(Dispatchers.IO) {
                         try {
                             var granted = dataStore.getGrantedPermissions(permSet)
 
@@ -89,6 +99,17 @@ class SamsungWatch(
                                 return@launch
                             }
 
+//                            for (type in typesToTest) {
+//                                try {
+//                                    val result = dataStore.requestPermissions(
+//                                        setOf(Permission.of(type, AccessType.READ)),
+//                                        mainActivity
+//                                    )
+//                                    Log.d("PermCheck", "OK: $type and the result is $result")
+//                                } catch (e: Exception) {
+//                                    Log.e("PermCheck", "FAILED: $type -> ${e.message}")
+//                                }
+//                            }
                             granted = dataStore.requestPermissions(permSet, mainActivity)
 
                             if (granted.containsAll(permSet)) {
@@ -111,7 +132,7 @@ class SamsungWatch(
                         .setOrdering(Ordering.DESC)
                         .build()
 
-                    scope.launch {
+                    scope.launch(Dispatchers.IO) {
                         val heartRateList = dataStore.readData(readRequest).dataList
                         processHeartVital(heartRateList)
                         Log.d("TAG"," the data is ${vitals}")
@@ -128,7 +149,7 @@ class SamsungWatch(
                         .setLocalTimeFilter(localTimeFilter)
                         .setOrdering(Ordering.ASC)
                         .build()
-                    scope.launch {
+                    scope.launch(Dispatchers.IO) {
                         val sleepData = dataStore.readData(readRequest).dataList
                         processSleepVital(sleepData)
                         print("the data is $vitals")
@@ -147,7 +168,7 @@ class SamsungWatch(
                         .setOrdering(Ordering.ASC)
                         .build()
 
-                    scope.launch {
+                    scope.launch(Dispatchers.IO) {
                         val steps = dataStore.aggregateData(aggregateRequest)
                         processStepsCount(steps)
                         print("the data is $vitals")
@@ -166,7 +187,7 @@ class SamsungWatch(
                         .setOrdering(Ordering.DESC)
                         .build()
 
-                    scope.launch {
+                    scope.launch(Dispatchers.IO) {
                         val activityResult = dataStore.aggregateData(readRequest).dataList
                         processActivity(activityResult)
                         Log.d("TAG"," the data is ${vitals}")
@@ -201,7 +222,7 @@ class SamsungWatch(
                         .setOrdering(Ordering.DESC)
                         .build()
 
-                    scope.launch {
+                    scope.launch(Dispatchers.IO) {
                         val bloodOxygenList = dataStore.readData(readRequest).dataList
                         processBloodOxygen(bloodOxygenList)
                         Log.d("TAG"," the data is ${vitals}")
@@ -219,7 +240,7 @@ class SamsungWatch(
                         .setOrdering(Ordering.DESC)
                         .build()
 
-                    scope.launch {
+                    scope.launch(Dispatchers.IO) {
                         val bodyTemperatureList = dataStore.readData(readRequest).dataList
                         processBodyTemperature(bodyTemperatureList)
                         Log.d("TAG"," the data is ${vitals}")
@@ -237,7 +258,7 @@ class SamsungWatch(
                         .setOrdering(Ordering.DESC)
                         .build()
 
-                    scope.launch {
+                    scope.launch(Dispatchers.IO) {
                         val activityResult = dataStore.aggregateData(readRequest).dataList
                         processDistance(activityResult)
                         Log.d("TAG"," the data is ${vitals}")
diff --git a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/watch/samsung_watch/model/Vitals.kt b/android/app/src/main/kotlin/com/ejada/hmg/watch/samsung_watch/model/Vitals.kt
similarity index 78%
rename from android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/watch/samsung_watch/model/Vitals.kt
rename to android/app/src/main/kotlin/com/ejada/hmg/watch/samsung_watch/model/Vitals.kt
index 577ab283..982d7334 100644
--- a/android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/watch/samsung_watch/model/Vitals.kt
+++ b/android/app/src/main/kotlin/com/ejada/hmg/watch/samsung_watch/model/Vitals.kt
@@ -1,4 +1,4 @@
-package com.cloudsolutions.HMGPatientApp.watch.samsung_watch.model
+package com.ejada.hmg.watch.samsung_watch.model
 
 data class Vitals(
     var value : String = "",
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_local.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_local.png
index 06095ae4..348b5116 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_local.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_local.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_local.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_local.png
index cb15fb64..410b1b1e 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_local.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_local.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_local.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_local.png
index b5d6eb9a..bb9943af 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_local.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_local.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_local.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_local.png
index 3774c262..0b9d9359 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_local.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_local.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_local.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_local.png
index a211290c..aaa9808d 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_local.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_local.png differ
diff --git a/android/app/src/main2/AndroidManifest.xml b/android/app/src/main2/AndroidManifest.xml
index 535bd4ab..70bd757c 100644
--- a/android/app/src/main2/AndroidManifest.xml
+++ b/android/app/src/main2/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.cloudsolutions.HMGPatientApp">
+    package="com.cloudsolutions.hmg">
     <!--
          io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 4b24dd7f..29a4e9da 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -54,12 +54,24 @@ allprojects {
     }
 
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-        kotlinOptions {
-            jvmTarget = "21"
+//        kotlinOptions {
+//            jvmTarget = "21"
+//        }
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
         }
     }
 
     subprojects {
+        project.buildscript.repositories {
+            google()
+            mavenCentral()
+        }
+
+        project.repositories {
+            google()
+            mavenCentral()
+        }
         afterEvaluate {
             if (project.hasProperty("android")) {
                 project.extensions.findByName("android")?.let { androidExt ->
@@ -83,8 +95,11 @@ allprojects {
                 targetCompatibility = JavaVersion.VERSION_21.toString()
             }
             project.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-                kotlinOptions {
-                    jvmTarget = "21"
+//                kotlinOptions {
+//                    jvmTarget = "21"
+//                }
+                compilerOptions {
+                    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
                 }
             }
         }
diff --git a/android/build/reports/problems/problems-report.html b/android/build/reports/problems/problems-report.html
new file mode 100644
index 00000000..9c9cd30d
--- /dev/null
+++ b/android/build/reports/problems/problems-report.html
@@ -0,0 +1,663 @@
+<!DOCTYPE html>
+
+<html lang="en">
+<head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+                    <style type="text/css">
+                /*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
+html {
+    line-height: 1.15;
+    -ms-text-size-adjust: 100%;
+    -webkit-text-size-adjust: 100%
+}
+
+body {
+    margin: 0
+}
+
+article, aside, footer, header, nav, section {
+    display: block
+}
+
+h1 {
+    font-size: 2em;
+    margin: .67em 0
+}
+
+figcaption, figure, main {
+    display: block
+}
+
+figure {
+    margin: 1em 40px
+}
+
+hr {
+    box-sizing: content-box;
+    height: 0;
+    overflow: visible
+}
+
+pre {
+    font-family: monospace, monospace;
+    font-size: 1em
+}
+
+a {
+    background-color: transparent;
+    -webkit-text-decoration-skip: objects
+}
+
+abbr[title] {
+    border-bottom: none;
+    text-decoration: underline;
+    text-decoration: underline dotted
+}
+
+b, strong {
+    font-weight: inherit
+}
+
+b, strong {
+    font-weight: bolder
+}
+
+code, kbd, samp {
+    font-family: monospace, monospace;
+    font-size: 1em
+}
+
+dfn {
+    font-style: italic
+}
+
+mark {
+    background-color: #ff0;
+    color: #000
+}
+
+small {
+    font-size: 80%
+}
+
+sub, sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline
+}
+
+sub {
+    bottom: -.25em
+}
+
+sup {
+    top: -.5em
+}
+
+audio, video {
+    display: inline-block
+}
+
+audio:not([controls]) {
+    display: none;
+    height: 0
+}
+
+img {
+    border-style: none
+}
+
+svg:not(:root) {
+    overflow: hidden
+}
+
+button, input, optgroup, select, textarea {
+    font-family: sans-serif;
+    font-size: 100%;
+    line-height: 1.15;
+    margin: 0
+}
+
+button, input {
+    overflow: visible
+}
+
+button, select {
+    text-transform: none
+}
+
+[type=reset], [type=submit], button, html [type=button] {
+    -webkit-appearance: button
+}
+
+[type=button]::-moz-focus-inner, [type=reset]::-moz-focus-inner, [type=submit]::-moz-focus-inner, button::-moz-focus-inner {
+    border-style: none;
+    padding: 0
+}
+
+[type=button]:-moz-focusring, [type=reset]:-moz-focusring, [type=submit]:-moz-focusring, button:-moz-focusring {
+    outline: 1px dotted ButtonText
+}
+
+fieldset {
+    padding: .35em .75em .625em
+}
+
+legend {
+    box-sizing: border-box;
+    color: inherit;
+    display: table;
+    max-width: 100%;
+    padding: 0;
+    white-space: normal
+}
+
+progress {
+    display: inline-block;
+    vertical-align: baseline
+}
+
+textarea {
+    overflow: auto
+}
+
+[type=checkbox], [type=radio] {
+    box-sizing: border-box;
+    padding: 0
+}
+
+[type=number]::-webkit-inner-spin-button, [type=number]::-webkit-outer-spin-button {
+    height: auto
+}
+
+[type=search] {
+    -webkit-appearance: textfield;
+    outline-offset: -2px
+}
+
+[type=search]::-webkit-search-cancel-button, [type=search]::-webkit-search-decoration {
+    -webkit-appearance: none
+}
+
+::-webkit-file-upload-button {
+    -webkit-appearance: button;
+    font: inherit
+}
+
+details, menu {
+    display: block
+}
+
+summary {
+    display: list-item
+}
+
+canvas {
+    display: inline-block
+}
+
+template {
+    display: none
+}
+
+[hidden] {
+    display: none
+}
+
+/* configuration cache styles */
+
+.report-wrapper {
+    margin: 0;
+    padding: 0 24px;
+}
+
+.gradle-logo {
+    width: 32px;
+    height: 24px;
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAYCAYAAACbU/80AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAGAAAAAA915G0AAAD5klEQVRIDbVWC0xTZxT+emmhVUEeA1/ROh/tFAFFGK7oJisIKsNVoOwBbJPowEWHzikRxeiMRpwwjDWRBHQLIzOmiRhe22BT40TitiyaMBQFfMEeLMIEaSmk+/+rvd7be4no6Elu7n++c/5zzv845/wyOyG4iGyDgzCdNOPLM9W41n4bnmNUiHo5DNsz0hGsmcV6lbkyAOOWXJjrz4qWp1C4o3z/LqzWL4VcJB1FIHmZHn/f78a6pDcxbeIEfNvQiPwTZbDZBpC24zOEaGfDpTsgtZby6u+QlrubFWUY3nh6AH39/ahr/Bn1jZfxW3ML2js60dtvgbtcQVblj8CZM7A0PBSrol6Ft+c4KZ8iTB1nwN0//8IEP9/hA2i924Gir0/iq8oa/NvbJzLiDKiUSqTE6pGVbEBY4BxnsYAPSnwXTa3tLCZ5BF3dPdAkGNHzoFcwcaRMnC4CeZkZiAgKFE252nITC1Pew9Dj5GNEGgS4Rbb5eZ1Te7UXG6FLX4cV6zeh5kIDaDpSunL9Boyf5nLOpwT4Sx+BxWrFK8QAnTAapPRQwofcj86uLoG59cbVEOzA0NAQNh38Atn5RSjY8rFAmc/I3dyQvOx1PsSNVy7Roa3ajHDePbBYLSLn1MaGd5KFAXy07xAOl59C6elK+I73hIHcbGd6wXs8qkyH8FZcjLOI5X/9/TrOnLsAldJDUu4As1NToFFPe3IEpm/M2HigwCFnU6t4Zw6Ck1JhGRhgcXq5juXloKyqFnlHirmz5CaNcEAv59kSE9wVikcB3O78A/MSU0Fznk/H9+yAetJEnPr+B8RFLsLcGS8ia28+qQuX+WrPNNZOV+Nc6VH4+3iz89g0pEaLzRUiQ3LGDWsM8Qidq2WL0PGKKlgf74ZIeQTAfFJ6a44WIsDXh9OW/dPdY58aawC9KK6kpOgolO7JxViVSuBGXnvxksudZ5F0O5yzGYxMJnBOGaau4fnPU2RNAtCFBKFoa7akczaAptY2iWmjB33+yQa4kZwfjpi2ex3Dyf43vuAljWQ/4Btmei1WPj+q45hF4U+1J4fEizCEvNf0EWHoIW244sfzoN1RipaT2kDfdjfv3MNpojdISjmfIheE8Fnp8WR9vJ2Zr+O+bYUmO+kJ9KnIUtf9bnvY2x9wcqrrvnCJvfL8Tw4V9v9LU7PdKzJaoNdy645AR4ph1JMncZHRKrVvYyYY5kmP8iO1v2T3dk6HDtYmrgJtOnwKnaPFrg8z+BBX7QSgEyOPJfX9Qd9DFs40GgTOHbrBs2ch4bXFuEG2mmFkeD9hpUMk+NMXEe0TNtsg/Ly94DVurEAuxfwHC1WiVbe0U7MAAAAASUVORK5CYII=");
+    background-size: contain;
+}
+
+.header {
+    display: flex;
+    flex-wrap: wrap;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    padding: 24px 24px 0 24px;
+    background-color: white;
+    z-index: 1;
+}
+
+.learn-more {
+    margin-left: auto;
+    align-self: center;
+    font-size: 0.875rem;
+    font-weight: normal;
+}
+
+.title {
+    display: flex;
+    align-items: center;
+    padding: 18px 0 24px 0;
+    flex: 1 0 100%;
+}
+
+.content {
+    font-size: 0.875rem;
+    padding: 240px 0 48px;
+    overflow-x: auto;
+    white-space: nowrap;
+}
+
+.content ol:first-of-type {
+    margin: 0;
+}
+
+.tree-btn {
+    cursor: pointer;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    background-size: contain;
+    background-repeat: no-repeat;
+    vertical-align: middle;
+    margin-top: -0.2em;
+}
+
+.tree-btn.collapsed {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 192 512"><path d="M166.9 264.5l-117.8 116c-4.7 4.7-12.3 4.7-17 0l-7.1-7.1c-4.7-4.7-4.7-12.3 0-17L127.3 256 25.1 155.6c-4.7-4.7-4.7-12.3 0-17l7.1-7.1c4.7-4.7 12.3-4.7 17 0l117.8 116c4.6 4.7 4.6 12.3-.1 17z" fill="%23999999" stroke="%23999999"/></svg>');
+}
+
+.tree-btn.expanded {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512"><path d="M119.5 326.9L3.5 209.1c-4.7-4.7-4.7-12.3 0-17l7.1-7.1c4.7-4.7 12.3-4.7 17 0L128 287.3l100.4-102.2c4.7-4.7 12.3-4.7 17 0l7.1 7.1c4.7 4.7 4.7 12.3 0 17L136.5 327c-4.7 4.6-12.3 4.6-17-.1z" fill="%23999999" stroke="%23999999"/></svg>');
+}
+
+ul .tree-btn {
+    margin-right: 3px;
+}
+
+.leaf-icon {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512"><path d="M32 256 H224" stroke="%23999999" stroke-width="48" stroke-linecap="round"/></svg>');
+    background-size: contain;
+    background-repeat: no-repeat;
+    vertical-align: middle;
+    margin-top: -0.2em;
+}
+
+.invisible-text {
+    user-select: all; /* Allow the text to be selectable */
+    color: transparent; /* Hide the text */
+    text-indent: -9999px; /* Move the text out of view */
+    position: relative;
+    white-space: pre; /* Preserve meaningful whitespace in the invisible text for copying */
+}
+
+.text-for-copy {
+    display: inline-block;
+}
+
+.enum-icon {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><circle cx="512" cy="512" r="200" /></svg>');
+    background-size: contain;
+    background-repeat: no-repeat;
+    vertical-align: middle;
+    margin-inline-start: 0.5ex;
+    margin-inline-end: 0.5ex;
+    margin-top: -0.2em;
+}
+
+.error-icon {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path d="M193.94 256L296.5 153.44l21.15-21.15c3.12-3.12 3.12-8.19 0-11.31l-22.63-22.63c-3.12-3.12-8.19-3.12-11.31 0L160 222.06 36.29 98.34c-3.12-3.12-8.19-3.12-11.31 0L2.34 120.97c-3.12 3.12-3.12 8.19 0 11.31L126.06 256 2.34 379.71c-3.12 3.12-3.12 8.19 0 11.31l22.63 22.63c3.12 3.12 8.19 3.12 11.31 0L160 289.94 262.56 392.5l21.15 21.15c3.12 3.12 8.19 3.12 11.31 0l22.63-22.63c3.12-3.12 3.12-8.19 0-11.31L193.94 256z" fill="%23FC461E" stroke="%23FC461E"/></svg>');
+    background-size: contain;
+    background-repeat: no-repeat;
+    vertical-align: middle;
+    margin-inline-start: 0.5ex;
+    margin-inline-end: 0.5ex;
+    margin-top: -0.2em;
+}
+
+.advice-icon {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    background-image: url('data:image/svg+xml;utf8,<svg width="800px" height="800px" viewBox="-4.93 0 122.88 122.88" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  style="enable-background:new 0 0 113.01 122.88" xml:space="preserve"><g><path d="M44.13,102.06c-1.14,0.03-2.14-0.81-2.3-1.96c-0.17-1.2,0.64-2.31,1.82-2.54c-1.3-7.37-4.85-11.43-8.6-15.72 c-2.92-3.34-5.95-6.81-8.34-11.92c-2.35-5.03-3.64-10.23-3.6-15.63c0.05-5.4,1.42-10.96,4.4-16.71c0.02-0.04,0.04-0.07,0.06-0.11 l0,0c3.91-6.62,9.38-11.04,15.47-13.52c5.11-2.09,10.66-2.8,16.1-2.3c5.42,0.5,10.73,2.2,15.37,4.94 c5.9,3.49,10.75,8.67,13.42,15.21c1.44,3.54,2.42,7.49,2.54,11.82c0.12,4.31-0.62,8.96-2.61,13.88 c-2.66,6.59-6.18,10.68-9.47,14.51c-3.03,3.53-5.85,6.81-7.42,11.84c0.89,0.21,1.59,0.94,1.73,1.9c0.17,1.24-0.7,2.39-1.94,2.56 l-0.77,0.11c-0.14,1.09-0.23,2.26-0.27,3.51l0.25-0.04c1.24-0.17,2.39,0.7,2.56,1.94c0.17,1.24-0.7,2.39-1.94,2.56l-0.78,0.11 c0.01,0.15,0.02,0.3,0.03,0.45l0,0c0.07,0.88,0.08,1.73,0.03,2.54l0.13-0.02c1.25-0.15,2.38,0.74,2.54,1.98 c0.15,1.25-0.74,2.38-1.98,2.54l-1.68,0.21c-1.2,3.11-3.34,5.48-5.87,6.94c-1.74,1.01-3.67,1.59-5.61,1.71 c-1.97,0.12-3.96-0.25-5.78-1.13c-2.08-1.02-3.94-2.71-5.29-5.14c-0.65-0.33-1.13-0.97-1.23-1.75c-0.04-0.31-0.01-0.61,0.07-0.89 c-0.39-1.16-0.68-2.43-0.87-3.83l-0.07,0.01c-1.24,0.17-2.39-0.7-2.56-1.94c-0.17-1.24,0.7-2.39,1.94-2.56l0.54-0.08 C44.19,104.32,44.18,103.16,44.13,102.06L44.13,102.06z M2.18,58.86C1.01,58.89,0.04,57.98,0,56.81c-0.04-1.17,0.88-2.14,2.05-2.18 l8.7-0.3c1.17-0.04,2.14,0.88,2.18,2.05c0.04,1.17-0.88,2.14-2.05,2.18L2.18,58.86L2.18,58.86z M110.68,50.25 c1.16-0.12,2.2,0.73,2.32,1.89c0.12,1.16-0.73,2.2-1.89,2.32l-8.66,0.91c-1.16,0.12-2.2-0.73-2.32-1.89 c-0.12-1.16,0.73-2.2,1.89-2.32L110.68,50.25L110.68,50.25z M94.91,14.78c0.65-0.97,1.96-1.23,2.93-0.58 c0.97,0.65,1.23,1.96,0.58,2.93l-4.84,7.24c-0.65,0.97-1.96,1.23-2.93,0.58c-0.97-0.65-1.23-1.96-0.58-2.93L94.91,14.78 L94.91,14.78z M57.63,2.06c0.03-1.17,1-2.09,2.16-2.06c1.17,0.03,2.09,1,2.06,2.16l-0.22,8.7c-0.03,1.17-1,2.09-2.16,2.06 c-1.17-0.03-2.09-1-2.06-2.16L57.63,2.06L57.63,2.06z M13.88,15.53c-0.86-0.8-0.9-2.14-0.11-2.99c0.8-0.86,2.14-0.9,2.99-0.11 l6.37,5.94c0.86,0.8,0.9,2.14,0.11,2.99c-0.8,0.86-2.14,0.9-2.99,0.11L13.88,15.53L13.88,15.53z M47.88,96.95l18.49-2.63 c1.59-6.7,5.05-10.73,8.8-15.08c3.08-3.58,6.36-7.4,8.76-13.34c1.76-4.35,2.41-8.43,2.31-12.19c-0.1-3.75-0.96-7.21-2.24-10.34 c-2.3-5.63-6.51-10.11-11.65-13.15c-4.11-2.43-8.8-3.94-13.59-4.37c-4.77-0.44-9.64,0.19-14.13,2.02 c-5.26,2.15-9.99,5.97-13.39,11.72c-2.64,5.12-3.86,10.02-3.9,14.73c-0.04,4.74,1.11,9.33,3.2,13.8c2.13,4.56,4.97,7.8,7.69,10.92 C42.47,83.9,46.48,88.49,47.88,96.95L47.88,96.95z M65.62,99.02l-17.27,2.45c0.05,1.1,0.07,2.25,0.05,3.47l17.05-2.42 C65.47,101.29,65.52,100.12,65.62,99.02L65.62,99.02z M48.49,109.52c0.12,0.92,0.3,1.76,0.53,2.54l16.55-2.04 c0.11-0.86,0.13-1.77,0.05-2.74l0,0l0-0.02l-0.01-0.17L48.49,109.52L48.49,109.52z M51.37,116.36c0.64,0.67,1.35,1.19,2.1,1.55 c1.15,0.56,2.42,0.79,3.67,0.72c1.29-0.08,2.57-0.47,3.74-1.15c1.1-0.64,2.09-1.53,2.88-2.65L51.37,116.36L51.37,116.36z"/></g></svg>');
+    background-size: contain;
+    background-repeat: no-repeat;
+    vertical-align: middle;
+    margin-inline-start: 0.5ex;
+    margin-inline-end: 0.5ex;
+    margin-top: -0.2em;
+}
+
+.warning-icon {
+    display: inline-block;
+    width: 13px;
+    height: 13px;
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M270.2 160h35.5c3.4 0 6.1 2.8 6 6.2l-7.5 196c-.1 3.2-2.8 5.8-6 5.8h-20.5c-3.2 0-5.9-2.5-6-5.8l-7.5-196c-.1-3.4 2.6-6.2 6-6.2zM288 388c-15.5 0-28 12.5-28 28s12.5 28 28 28 28-12.5 28-28-12.5-28-28-28zm281.5 52L329.6 24c-18.4-32-64.7-32-83.2 0L6.5 440c-18.4 31.9 4.6 72 41.6 72H528c36.8 0 60-40 41.5-72zM528 480H48c-12.3 0-20-13.3-13.9-24l240-416c6.1-10.6 21.6-10.7 27.7 0l240 416c6.2 10.6-1.5 24-13.8 24z" fill="%23DEAD22" stroke="%23DEAD22"/></svg>');
+    background-size: contain;
+    background-repeat: no-repeat;
+    vertical-align: middle;
+    margin-inline-start: 0.3ex;
+    margin-inline-end: 1.1ex;
+    margin-top: -0.1em;
+}
+
+.documentation-button {
+    cursor: pointer;
+    display: inline-block;
+    width: 13px;
+    height: 13px;
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256 340c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zm7.67-24h-16c-6.627 0-12-5.373-12-12v-.381c0-70.343 77.44-63.619 77.44-107.408 0-20.016-17.761-40.211-57.44-40.211-29.144 0-44.265 9.649-59.211 28.692-3.908 4.98-11.054 5.995-16.248 2.376l-13.134-9.15c-5.625-3.919-6.86-11.771-2.645-17.177C185.658 133.514 210.842 116 255.67 116c52.32 0 97.44 29.751 97.44 80.211 0 67.414-77.44 63.849-77.44 107.408V304c0 6.627-5.373 12-12 12zM256 40c118.621 0 216 96.075 216 216 0 119.291-96.61 216-216 216-119.244 0-216-96.562-216-216 0-119.203 96.602-216 216-216m0-32C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8z" fill="%23999999" stroke="%23999999"/></svg>');
+    background-size: contain;
+    background-repeat: no-repeat;
+    vertical-align: middle;
+    margin-inline-start: 0.5ex;
+    margin-inline-end: 0.5ex;
+    margin-top: -0.2em;
+}
+
+.documentation-button::selection {
+    color: transparent;
+}
+
+.documentation-button:hover {
+    color: transparent;
+}
+
+.copy-button {
+    cursor: pointer;
+    display: inline-block;
+    width: 12px;
+    height: 12px;
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M433.941 193.941l-51.882-51.882A48 48 0 0 0 348.118 128H320V80c0-26.51-21.49-48-48-48h-66.752C198.643 13.377 180.858 0 160 0s-38.643 13.377-45.248 32H48C21.49 32 0 53.49 0 80v288c0 26.51 21.49 48 48 48h80v48c0 26.51 21.49 48 48 48h224c26.51 0 48-21.49 48-48V227.882a48 48 0 0 0-14.059-33.941zm-22.627 22.627a15.888 15.888 0 0 1 4.195 7.432H352v-63.509a15.88 15.88 0 0 1 7.431 4.195l51.883 51.882zM160 30c9.941 0 18 8.059 18 18s-8.059 18-18 18-18-8.059-18-18 8.059-18 18-18zM48 384c-8.822 0-16-7.178-16-16V80c0-8.822 7.178-16 16-16h66.752c6.605 18.623 24.389 32 45.248 32s38.643-13.377 45.248-32H272c8.822 0 16 7.178 16 16v48H176c-26.51 0-48 21.49-48 48v208H48zm352 96H176c-8.822 0-16-7.178-16-16V176c0-8.822 7.178-16 16-16h144v72c0 13.2 10.8 24 24 24h72v208c0 8.822-7.178 16-16 16z" fill="%23999999" stroke="%23999999"/></svg>');
+    background-size: contain;
+    background-repeat: no-repeat;
+    vertical-align: middle;
+    margin-inline-start: 0.5ex;
+    margin-top: -0.2em;
+}
+
+.groups{
+    display: flex;
+    border-bottom: 1px solid #EDEEEF;
+    flex: 1 0 100%;
+}
+
+.uncategorized {
+    display: flex;
+    border-top: 4px solid #EDEEEF;
+    flex: 1 0 100%;
+}
+
+.group-selector {
+    padding: 0 52px 24px 0;
+    font-size: 0.9rem;
+    font-weight: bold;
+    color: #999999;
+    cursor: pointer;
+}
+
+.group-selector__count {
+    margin: 0 8px;
+    border-radius: 8px;
+    background-color: #999;
+    color: #fff;
+    padding: 1px 8px 2px;
+    font-size: 0.75rem;
+}
+
+.group-selector--active {
+    color: #02303A;
+    cursor: auto;
+}
+
+.group-selector--active .group-selector__count {
+    background-color: #686868;
+}
+
+.group-selector--disabled {
+    cursor: not-allowed;
+}
+
+.accordion-header {
+    cursor: pointer;
+}
+
+.container {
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+}
+
+.stacktrace {
+    border-radius: 4px;
+    overflow-x: auto;
+    padding: 0.5rem;
+    margin-bottom: 0;
+    min-width: 1000px;
+}
+
+/* Lato (bold, regular) */
+@font-face {
+    font-display: swap;
+    font-family: Lato;
+    font-weight: 500;
+    font-style: normal;
+    src: url("https://assets.gradle.com/lato/fonts/lato-semibold/lato-semibold.woff2") format("woff2"),
+    url("https://assets.gradle.com/lato/fonts/lato-semibold/lato-semibold.woff") format("woff");
+}
+
+@font-face {
+    font-display: swap;
+    font-family: Lato;
+    font-weight: bold;
+    font-style: normal;
+    src: url("https://assets.gradle.com/lato/fonts/lato-bold/lato-bold.woff2") format("woff2"),
+    url("https://assets.gradle.com/lato/fonts/lato-bold/lato-bold.woff") format("woff");
+}
+
+* {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+html,
+body {
+    margin: 0;
+    padding: 0;
+}
+
+html {
+    font-family: "Lato", "Helvetica Neue", Arial, sans-serif;
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 1.5;
+}
+
+body {
+    color: #02303A;
+    background-color: #ffffff;
+    -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%;
+    -webkit-font-smoothing: antialiased;
+}
+
+
+/* typography */
+h1, h2, h3, h4, h5, h6 {
+    color: #02303A;
+    text-rendering: optimizeLegibility;
+    margin: 0;
+}
+
+h1 {
+    font-size: 1rem;
+}
+
+h2 {
+    font-size: 0.9rem;
+}
+
+h3 {
+    font-size: 1.125rem;
+}
+
+h4, h5, h6 {
+    font-size: 0.875rem;
+}
+
+h1 code {
+    font-weight: bold;
+}
+
+ul, ol, dl {
+    list-style-position: outside;
+    line-height: 1.6;
+    padding: 0;
+    margin: 0 0 0 20px;
+    list-style-type: none;
+}
+
+li {
+    line-height: 2;
+}
+
+a {
+    color: #1DA2BD;
+    text-decoration: none;
+    transition: all 0.3s ease, visibility 0s;
+}
+
+a:hover {
+    color: #35c1e4;
+}
+
+/* code */
+code, pre {
+    font-family: Inconsolata, Monaco, "Courier New", monospace;
+    font-style: normal;
+    font-variant-ligatures: normal;
+    font-variant-caps: normal;
+    font-variant-numeric: normal;
+    font-variant-east-asian: normal;
+    font-weight: normal;
+    font-stretch: normal;
+    color: #686868;
+}
+
+*:not(pre) > code {
+    letter-spacing: 0;
+    padding: 0.1em 0.5ex;
+    text-rendering: optimizeSpeed;
+    word-spacing: -0.15em;
+    word-wrap: break-word;
+}
+
+pre {
+    font-size: 0.75rem;
+    line-height: 1.8;
+    margin-top: 0;
+    margin-bottom: 1.5em;
+    padding: 1rem;
+}
+
+pre code {
+    background-color: transparent;
+    color: inherit;
+    line-height: 1.8;
+    font-size: 100%;
+    padding: 0;
+}
+
+a code {
+    color: #1BA8CB;
+}
+
+pre.code, pre.programlisting, pre.screen, pre.tt {
+    background-color: #f7f7f8;
+    border-radius: 4px;
+    font-size: 1em;
+    line-height: 1.45;
+    margin-bottom: 1.25em;
+    overflow-x: auto;
+    padding: 1rem;
+}
+
+li em, p em {
+    padding: 0 1px;
+}
+
+code em, tt em {
+    text-decoration: none;
+}
+
+code + .copy-button {
+    margin-inline-start: 0.2ex;
+}
+
+.java-exception {
+    font-size: 0.75rem;
+    padding-left: 24px;
+}
+
+.java-exception ul {
+    margin: 0;
+    line-height: inherit;
+}
+
+.java-exception code {
+    white-space: pre;
+}
+
+.java-exception-part-toggle {
+    user-select: none;
+    cursor: pointer;
+    border-radius: 2px;
+    padding: 0.1em 0.2em;
+    background: azure;
+    color: #686868;
+}
+
+                </style>
+    <!-- Inconsolata is used as a default monospace font in the report. -->
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Inconsolata:400,700" />
+
+    <title>Gradle Configuration Cache</title>
+</head>
+<body>
+
+<div id="playground"></div>
+
+<div class="report" id="report">
+    Loading...
+</div>
+
+<script type="text/javascript">
+function configurationCacheProblems() { return (
+// begin-report-data
+{"diagnostics":[{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":9},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":9}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":1},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":1}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('group = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":2},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":2}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('version = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"locations":[{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22},{"path":"build file '/Users/taha/.pub-cache/hosted/pub.dev/amazon_payfort-1.1.4/android/build.gradle'","line":22}],"problem":[{"text":"Space-assignment syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Space-assignment syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]}],"problemsReport":{"totalProblemCount":15,"buildName":"android","requestedTasks":"assembleDebug","documentationLink":"https://docs.gradle.org/8.12/userguide/problems-report.html","documentationLinkCaption":"Problem report","summaries":[{"problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"space-assignment-syntax-in-groovy-dsl","displayName":"Space-assignment syntax in Groovy DSL has been deprecated."}],"count":59}]}}
+// end-report-data
+);}
+</script>
+                <script type="text/javascript">
+                !function(n,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["configuration-cache-report"]=t():n["configuration-cache-report"]=t()}(this,(()=>(({70:function(){void 0===ArrayBuffer.isView&&(ArrayBuffer.isView=function(n){return null!=n&&null!=n.__proto__&&n.__proto__.__proto__===Int8Array.prototype.__proto__}),void 0===Math.imul&&(Math.imul=function(n,t){return(4294901760&n)*(65535&t)+(65535&n)*(0|t)|0}),this["configuration-cache-report"]=function(n){"use strict";var t,r,i,e,u,o,f,s,c,a,h,l,_,v,d,g,w,b,p,m,k,y,q,B,C,x,j,P,I,S,z,E,T,L,N,A,M,F,D,O,R,H,$,G,U,V,Q,Z,Y,W,K,X,J,nn,tn,rn,en,un,on,fn,sn,cn,an,hn,ln,_n,vn,dn,gn,wn,bn,pn,mn,kn,yn,qn,Bn,Cn,xn,jn,Pn,In,Sn,zn=Math.imul,En=ArrayBuffer.isView;function Tn(n,t){if(!(t>=0))throw fu(ie("Requested element count "+t+" is less than zero."));return function(n,t){if(!(t>=0))throw fu(ie("Requested element count "+t+" is less than zero."));if(0===t)return pt();if(t>=n.length)return function(n){switch(n.length){case 0:return pt();case 1:return gr(n[0]);default:return function(n){return Ar(function(n){return new qt(n,!1)}(n))}(n)}}(n);if(1===t)return gr(n[0]);var r=0,i=Nr(),e=0,u=n.length;n:for(;e<u;){var o=n[e];if(e=e+1|0,i.d(o),(r=r+1|0)===t)break n}return i}(n,Wn(n.length-t|0,0))}function Ln(n,t,r,i,e,u,o){return t=t===A?", ":t,r=r===A?"":r,i=i===A?"":i,e=e===A?-1:e,u=u===A?"...":u,o=o===A?null:o,function(n,t,r,i,e,u,o,f){r=r===A?", ":r,i=i===A?"":i,e=e===A?"":e,u=u===A?-1:u,o=o===A?"...":o,f=f===A?null:f,t.e(i);var s=0,c=0,a=n.length;n:for(;c<a;){var h=n[c];if(c=c+1|0,(s=s+1|0)>1&&t.e(r),!(u<0||s<=u))break n;Qt(t,h,f)}return u>=0&&s>u&&t.e(o),t.e(e),t}(n,bi(),t,r,i,e,u,o).toString()}function Nn(n){return n.length-1|0}function An(n,t){if(null==t){var r=0,i=n.length-1|0;if(r<=i)do{var e=r;if(r=r+1|0,null==n[e])return e}while(r<=i)}else{var u=0,o=n.length-1|0;if(u<=o)do{var f=u;if(u=u+1|0,oe(t,n[f]))return f}while(u<=o)}return-1}function Mn(n,t,r,i,e,u,o){return t=t===A?", ":t,r=r===A?"":r,i=i===A?"":i,e=e===A?-1:e,u=u===A?"...":u,o=o===A?null:o,Fn(n,bi(),t,r,i,e,u,o).toString()}function Fn(n,t,r,i,e,u,o,f){r=r===A?", ":r,i=i===A?"":i,e=e===A?"":e,u=u===A?-1:u,o=o===A?"...":o,f=f===A?null:f,t.e(i);var s=0,c=n.f();n:for(;c.g();){var a=c.h();if((s=s+1|0)>1&&t.e(r),!(u<0||s<=u))break n;Qt(t,a,f)}return u>=0&&s>u&&t.e(o),t.e(e),t}function Dn(n){if(n.i())throw mu("List is empty.");return n.j(0)}function On(n){return new Yn(n)}function Rn(n){if(Ue(n,Ti)){var t;switch(n.k()){case 0:t=pt();break;case 1:t=gr(Ue(n,Ei)?n.j(0):n.f().h());break;default:t=Hn(n)}return t}return mt(Vn(n))}function Hn(n){return Ar(n)}function $n(n){if(Ue(n,Ti)&&n.k()<=1)return Rn(n);var t=Vn(n);return function(n){var t=(n.k()/2|0)-1|0;if(t<0)return lr();var r=kt(n),i=0;if(i<=t)do{var e=i;i=i+1|0;var u=n.j(e);n.f4(e,n.j(r)),n.f4(r,u),r=r-1|0}while(e!==t)}(t),t}function Gn(n,t){if(!(t>=0))throw fu(ie("Requested element count "+t+" is less than zero."));return function(n,t){if(!(t>=0))throw fu(ie("Requested element count "+t+" is less than zero."));if(0===t)return pt();if(Ue(n,Ti)){if(t>=n.k())return Rn(n);if(1===t)return gr(function(n){if(Ue(n,Ei))return Dn(n);var t=n.f();if(!t.g())throw mu("Collection is empty.");return t.h()}(n))}var r=0,i=Nr(),e=n.f();n:for(;e.g();){var u=e.h();if(i.d(u),(r=r+1|0)===t)break n}return mt(i)}(n,Wn(n.k()-t|0,0))}function Un(n,t){if(!(t>=0))throw fu(ie("Requested element count "+t+" is less than zero."));if(0===t)return pt();var r=n.k();if(t>=r)return Rn(n);if(1===t)return gr(Qn(n));var i=Nr();if(Ue(n,li)){var e=r-t|0;if(e<r)do{var u=e;e=e+1|0,i.d(n.j(u))}while(e<r)}else for(var o=n.l(r-t|0);o.g();){var f=o.h();i.d(f)}return i}function Vn(n){return Ue(n,Ti)?Hn(n):Zn(n,Lr())}function Qn(n){if(n.i())throw mu("List is empty.");return n.j(kt(n))}function Zn(n,t){for(var r=n.f();r.g();){var i=r.h();t.d(i)}return t}function Yn(n){this.n_1=n}function Wn(n,t){return n<t?t:n}function Kn(n,t){return n>t?t:n}function Xn(n,t){return Ut().q(n,t,-1)}function Jn(n,t){return new Et(n,t)}function nt(n){var t=n.f();if(!t.g())return pt();var r=t.h();if(!t.g())return gr(r);var i=Lr();for(i.d(r);t.g();)i.d(t.h());return i}function tt(n){this.r_1=n}function rt(n,t){this.s_1=n,this.t_1=t}function it(){}function et(n){this.x_1=n,this.w_1=0}function ut(n,t){this.a1_1=n,et.call(this,n),ft().b1(t,this.a1_1.k()),this.w_1=t}function ot(){t=this}function ft(){return null==t&&new ot,t}function st(){ft(),it.call(this)}function ct(n){this.h1_1=n}function at(n,t){return t===n?"(this Map)":Oi(t)}function ht(n,t){var r;n:{for(var i=n.o().f();i.g();){var e=i.h();if(oe(e.j1(),t)){r=e;break n}}r=null}return r}function lt(){r=this}function _t(){return null==r&&new lt,r}function vt(n){this.q1_1=n,it.call(this)}function dt(){_t(),this.n1_1=null,this.o1_1=null}function gt(){i=this}function wt(){return null==i&&new gt,i}function bt(n){return n.length>0?nu(n):pt()}function pt(){return null==e&&new yt,e}function mt(n){switch(n.k()){case 0:return pt();case 1:return gr(n.j(0));default:return n}}function kt(n){return n.k()-1|0}function yt(){e=this,this.z1_1=new de(-1478467534,-1720727600)}function qt(n,t){this.b2_1=n,this.c2_1=t}function Bt(){u=this}function Ct(){return null==u&&new Bt,u}function xt(n,t){return Ue(n,Ti)?n.k():t}function jt(n,t){if(Ue(t,Ti))return n.m(t);for(var r=!1,i=t.f();i.g();){var e=i.h();n.d(e)&&(r=!0)}return r}function Pt(){}function It(n,t){this.h2_1=n,this.g2_1=n.i2_1.l(function(n,t){if(!(0<=t&&t<=n.k()))throw cu("Position index "+t+" must be in range ["+Oe(0,n.k())+"].");return n.k()-t|0}(n,t))}function St(n){st.call(this),this.i2_1=n}function zt(n){this.k2_1=n,this.j2_1=n.l2_1.f()}function Et(n,t){this.l2_1=n,this.m2_1=t}function Tt(n){for(;n.n2_1.g();){var t=n.n2_1.h();if(n.q2_1.t2_1(t)===n.q2_1.s2_1)return n.p2_1=t,n.o2_1=1,lr()}n.o2_1=0}function Lt(n){this.q2_1=n,this.n2_1=n.r2_1.f(),this.o2_1=-1,this.p2_1=null}function Nt(n,t,r){t=t===A||t,this.r2_1=n,this.s2_1=t,this.t2_1=r}function At(){return null==o&&new Mt,o}function Mt(){o=this,this.u2_1=new de(1993859828,793161749)}function Ft(n,t,r){return Dt(Dt(n,r)-Dt(t,r)|0,r)}function Dt(n,t){var r=n%t|0;return r>=0?r:r+t|0}function Ot(){f=this,this.p_1=new Ht(1,0)}function Rt(){return null==f&&new Ot,f}function Ht(n,t){Rt(),Vt.call(this,n,t,1)}function $t(n,t,r){Pt.call(this),this.d3_1=r,this.e3_1=t,this.f3_1=this.d3_1>0?n<=t:n>=t,this.g3_1=this.f3_1?n:this.e3_1}function Gt(){s=this}function Ut(){return null==s&&new Gt,s}function Vt(n,t,r){if(Ut(),0===r)throw fu("Step must be non-zero.");if(r===vr().MIN_VALUE)throw fu("Step must be greater than Int.MIN_VALUE to avoid overflow on negation.");this.z2_1=n,this.a3_1=function(n,t,r){var i;if(r>0)i=n>=t?t:t-Ft(t,n,r)|0;else{if(!(r<0))throw fu("Step is zero.");i=n<=t?t:t+Ft(n,t,0|-r)|0}return i}(n,t,r),this.b3_1=r}function Qt(n,t,r){null!=r?n.e(r(t)):null==t||Ze(t)?n.e(t):t instanceof zi?n.i3(t.h3_1):n.e(Oi(t))}function Zt(n,t,r){if(n===t)return!0;if(!(r=r!==A&&r))return!1;var i=mi(n),e=mi(t);return i===e||oe(new zi(Zi(Pi(i).toLowerCase(),0)),new zi(Zi(Pi(e).toLowerCase(),0)))}function Yt(n){return Wi(n)-1|0}function Wt(n,t,r,i){return r=r===A?0:r,(i=i!==A&&i)||"string"!=typeof n?Kt(n,t,r,Wi(n),i):n.indexOf(t,r)}function Kt(n,t,r,i,e,u){var o=(u=u!==A&&u)?Xn(Kn(r,Yt(n)),Wn(i,0)):Oe(Wn(r,0),Kn(i,Wi(n)));if("string"==typeof n&&"string"==typeof t){var f=o.z2_1,s=o.a3_1,c=o.b3_1;if(c>0&&f<=s||c<0&&s<=f)do{var a=f;if(f=f+c|0,xi(t,0,n,a,Wi(t),e))return a}while(a!==s)}else{var h=o.z2_1,l=o.a3_1,_=o.b3_1;if(_>0&&h<=l||_<0&&l<=h)do{var v=h;if(h=h+_|0,tr(t,0,n,v,Wi(t),e))return v}while(v!==l)}return-1}function Xt(n){var t=0,r=Wi(n)-1|0,i=!1;n:for(;t<=r;){var e=ki(Zi(n,i?r:t));if(i){if(!e)break n;r=r-1|0}else e?t=t+1|0:i=!0}return Ki(n,t,r+1|0)}function Jt(n,t){return ie(Ki(n,t.y2(),t.c3()+1|0))}function nr(n,t,r,i,e){r=r===A?0:r,i=i!==A&&i,rr(e=e===A?0:e);var u,o,f=nu(t);return new ur(n,r,e,(u=f,o=i,function(n,t){var r=function(n,t,r,i){if(!i&&1===t.k()){var e=function(n){if(Ue(n,Ei))return function(n){var t;switch(n.k()){case 0:throw mu("List is empty.");case 1:t=n.j(0);break;default:throw fu("List has more than one element.")}return t}(n);var t=n.f();if(!t.g())throw mu("Collection is empty.");var r=t.h();if(t.g())throw fu("Collection has more than one element.");return r}(t),u=Wt(n,e,r);return u<0?null:fr(u,e)}var o=Oe(Wn(r,0),Wi(n));if("string"==typeof n){var f=o.z2_1,s=o.a3_1,c=o.b3_1;if(c>0&&f<=s||c<0&&s<=f)do{var a,h=f;f=f+c|0;n:{for(var l=t.f();l.g();){var _=l.h();if(xi(_,0,n,h,_.length,i)){a=_;break n}}a=null}if(null!=a)return fr(h,a)}while(h!==s)}else{var v=o.z2_1,d=o.a3_1,g=o.b3_1;if(g>0&&v<=d||g<0&&d<=v)do{var w,b=v;v=v+g|0;n:{for(var p=t.f();p.g();){var m=p.h();if(tr(m,0,n,b,m.length,i)){w=m;break n}}w=null}if(null!=w)return fr(b,w)}while(b!==d)}return null}(n,u,t,o);return null==r?null:fr(r.t3_1,r.u3_1.length)}))}function tr(n,t,r,i,e,u){if(i<0||t<0||t>(Wi(n)-e|0)||i>(Wi(r)-e|0))return!1;var o=0;if(o<e)do{var f=o;if(o=o+1|0,!Zt(Zi(n,t+f|0),Zi(r,i+f|0),u))return!1}while(o<e);return!0}function rr(n){if(!(n>=0))throw fu(ie("Limit must be non-negative, but was "+n))}function ir(n){if(n.l3_1<0)n.j3_1=0,n.m3_1=null;else{var t;if(n.o3_1.r3_1>0?(n.n3_1=n.n3_1+1|0,t=n.n3_1>=n.o3_1.r3_1):t=!1,t||n.l3_1>Wi(n.o3_1.p3_1))n.m3_1=Oe(n.k3_1,Yt(n.o3_1.p3_1)),n.l3_1=-1;else{var r=n.o3_1.s3_1(n.o3_1.p3_1,n.l3_1);if(null==r)n.m3_1=Oe(n.k3_1,Yt(n.o3_1.p3_1)),n.l3_1=-1;else{var i=r.v3(),e=r.w3();n.m3_1=function(n,t){return t<=vr().MIN_VALUE?Rt().p_1:Oe(n,t-1|0)}(n.k3_1,i),n.k3_1=i+e|0,n.l3_1=n.k3_1+(0===e?1:0)|0}}n.j3_1=1}}function er(n){this.o3_1=n,this.j3_1=-1,this.k3_1=function(n,t,r){if(0>r)throw fu("Cannot coerce value to an empty range: maximum "+r+" is less than minimum 0.");return n<0?0:n>r?r:n}(n.q3_1,0,Wi(n.p3_1)),this.l3_1=this.k3_1,this.m3_1=null,this.n3_1=0}function ur(n,t,r,i){this.p3_1=n,this.q3_1=t,this.r3_1=r,this.s3_1=i}function or(n,t){this.t3_1=n,this.u3_1=t}function fr(n,t){return new or(n,t)}function sr(){}function cr(){}function ar(){}function hr(){c=this}function lr(){return null==c&&new hr,c}function _r(){a=this,this.MIN_VALUE=-2147483648,this.MAX_VALUE=2147483647,this.SIZE_BYTES=4,this.SIZE_BITS=32}function vr(){return null==a&&new _r,a}function dr(n){for(var t=[],r=n.f();r.g();)t.push(r.h());return t}function gr(n){return 0===(t=[n]).length?Lr():Ar(new qt(t,!0));var t}function wr(n){return n<0&&function(){throw yu("Index overflow has happened.")}(),n}function br(n){return void 0!==n.toArray?n.toArray():dr(n)}function pr(n){return function(n,t){for(var r=0,i=n.length;r<i;){var e=n[r];r=r+1|0,t.d(e)}return t}(t=[n],(r=t.length,i=ce(se(Zr)),function(n,t,r){zr.call(r),Zr.call(r),r.y5_1=function(n){return Ur(n,0,ce(se(Vr)))}(n)}(r,0,i),i));var t,r,i}function mr(){it.call(this)}function kr(n){this.j4_1=n,this.h4_1=0,this.i4_1=-1}function yr(n,t){this.n4_1=n,kr.call(this,n),ft().b1(t,this.n4_1.k()),this.h4_1=t}function qr(){mr.call(this),this.o4_1=0}function Br(n){this.r4_1=n}function Cr(n){this.s4_1=n}function xr(n,t){this.t4_1=n,this.u4_1=t}function jr(){zr.call(this)}function Pr(n){this.x4_1=n,zr.call(this)}function Ir(n){this.e5_1=n,mr.call(this)}function Sr(){dt.call(this),this.c5_1=null,this.d5_1=null}function zr(){mr.call(this)}function Er(){h=this;var n=Nr();n.c_1=!0,this.i5_1=n}function Tr(){return null==h&&new Er,h}function Lr(){return n=ce(se(Fr)),t=[],Fr.call(n,t),n;var n,t}function Nr(n){return t=ce(se(Fr)),r=[],Fr.call(t,r),t;var t,r}function Ar(n){return function(n,t){var r;return r=br(n),Fr.call(t,r),t}(n,ce(se(Fr)))}function Mr(n,t){return ft().e1(t,n.k()),t}function Fr(n){Tr(),qr.call(this),this.b_1=n,this.c_1=!1}function Dr(n,t,r,i,e){if(r===i)return n;var u=(r+i|0)/2|0,o=Dr(n,t,r,u,e),f=Dr(n,t,u+1|0,i,e),s=o===t?n:t,c=r,a=u+1|0,h=r;if(h<=i)do{var l=h;if(h=h+1|0,c<=u&&a<=i){var _=o[c],v=f[a];e.compare(_,v)<=0?(s[l]=_,c=c+1|0):(s[l]=v,a=a+1|0)}else c<=u?(s[l]=o[c],c=c+1|0):(s[l]=f[a],a=a+1|0)}while(l!==i);return s}function Or(n,t){return(3&n)-(3&t)|0}function Rr(){_=this}function Hr(n){this.n5_1=n,jr.call(this)}function $r(n){return function(n,t){Sr.call(t),Vr.call(t),t.t5_1=n,t.u5_1=n.w5()}(new Jr((null==_&&new Rr,_)),n),n}function Gr(){return $r(ce(se(Vr)))}function Ur(n,t,r){if($r(r),!(n>=0))throw fu(ie("Negative initial capacity: "+n));if(!(t>=0))throw fu(ie("Non-positive load factor: "+t));return r}function Vr(){this.v5_1=null}function Qr(n,t){return zr.call(t),Zr.call(t),t.y5_1=n,t}function Zr(){}function Yr(n,t){var r=Kr(n,n.h6_1.m5(t));if(null==r)return null;var i=r;if(null!=i&&Ve(i))return Wr(i,n,t);var e=i;return n.h6_1.l5(e.j1(),t)?e:null}function Wr(n,t,r){var i;n:{for(var e=0,u=n.length;e<u;){var o=n[e];if(e=e+1|0,t.h6_1.l5(o.j1(),r)){i=o;break n}}i=null}return i}function Kr(n,t){var r=n.i6_1[t];return void 0===r?null:r}function Xr(n){this.g6_1=n,this.z5_1=-1,this.a6_1=Object.keys(n.i6_1),this.b6_1=-1,this.c6_1=null,this.d6_1=!1,this.e6_1=-1,this.f6_1=null}function Jr(n){this.h6_1=n,this.i6_1=this.k6(),this.j6_1=0}function ni(){}function ti(n){this.n6_1=n,this.l6_1=null,this.m6_1=null,this.m6_1=this.n6_1.y6_1.v6_1}function ri(){v=this;var n,t=(fi(0,0,n=ce(se(si))),n);t.x6_1=!0,this.e7_1=t}function ii(){return null==v&&new ri,v}function ei(n,t,r){this.d7_1=n,xr.call(this,t,r),this.b7_1=null,this.c7_1=null}function ui(n){this.y6_1=n,jr.call(this)}function oi(){return $r(n=ce(se(si))),si.call(n),n.w6_1=Gr(),n;var n}function fi(n,t,r){return Ur(n,t,r),si.call(r),r.w6_1=Gr(),r}function si(){ii(),this.v6_1=null,this.x6_1=!1}function ci(){d=this;var n=ai(0),t=n.y5_1;(t instanceof si?t:_e()).j5(),this.f7_1=n}function ai(n){return function(n,t){return function(n,t,r){Qr(function(n,t){return fi(n,t,ce(se(si)))}(n,t),r),hi.call(r)}(n,0,t),t}(n,ce(se(hi)))}function hi(){null==d&&new ci}function li(){}function _i(){}function vi(n){_i.call(this),this.k7_1=n}function di(){gi.call(this)}function gi(){_i.call(this),this.m7_1=""}function wi(){if(!w){w=!0;var n="undefined"!=typeof process&&process.versions&&!!process.versions.node;g=n?new vi(process.stdout):new di}}function bi(){return n=ce(se(pi)),pi.call(n,""),n;var n}function pi(n){this.o7_1=void 0!==n?n:""}function mi(n){var t=Pi(n).toUpperCase();return t.length>1?n:Zi(t,0)}function ki(n){return function(n){return 9<=n&&n<=13||28<=n&&n<=32||160===n||n>4096&&(5760===n||8192<=n&&n<=8202||8232===n||8233===n||8239===n||8287===n||12288===n)}(n)}function yi(){b=this,this.q7_1=new RegExp("[\\\\^$*+?.()|[\\]{}]","g"),this.r7_1=new RegExp("[\\\\$]","g"),this.s7_1=new RegExp("\\$","g")}function qi(){return null==b&&new yi,b}function Bi(n,t){qi(),this.v7_1=n,this.w7_1=function(n){if(Ue(n,Ti)){var t;switch(n.k()){case 0:t=At();break;case 1:t=pr(Ue(n,Ei)?n.j(0):n.f().h());break;default:t=Zn(n,ai(n.k()))}return t}return function(n){switch(n.k()){case 0:return At();case 1:return pr(n.f().h());default:return n}}(Zn(n,(r=ce(se(hi)),Qr(oi(),r),hi.call(r),r)));var r}(t),this.x7_1=new RegExp(n,Mn(t,"","gu",A,A,A,Ci)),this.y7_1=null,this.z7_1=null}function Ci(n){return n.d8_1}function xi(n,t,r,i,e,u){return tr(n,t,r,i,e,u=u!==A&&u)}function ji(n,t){return n-t|0}function Pi(n){return String.fromCharCode(n)}function Ii(){p=this,this.e8_1=0,this.f8_1=65535,this.g8_1=55296,this.h8_1=56319,this.i8_1=56320,this.j8_1=57343,this.k8_1=55296,this.l8_1=57343,this.m8_1=2,this.n8_1=16}function Si(){return null==p&&new Ii,p}function zi(n){Si(),this.h3_1=n}function Ei(){}function Ti(){}function Li(){}function Ni(){}function Ai(){}function Mi(){}function Fi(){m=this}function Di(n,t){null==m&&new Fi,this.p8_1=n,this.q8_1=t}function Oi(n){var t=null==n?null:ie(n);return null==t?"null":t}function Ri(n){return new Hi(n)}function Hi(n){this.t8_1=n,this.s8_1=0}function $i(){return Qi(),k}function Gi(){return Qi(),y}function Ui(){return Qi(),q}function Vi(){return Qi(),B}function Qi(){x||(x=!0,k=new ArrayBuffer(8),y=new Float64Array($i()),new Float32Array($i()),q=new Int32Array($i()),Gi()[0]=-1,B=0!==Ui()[0]?1:0,C=1-Vi()|0)}function Zi(n,t){var r;if(Yi(n)){var i,e=n.charCodeAt(t);if(Si(),e<0?i=!0:(Si(),i=e>65535),i)throw fu("Invalid Char code: "+e);r=De(e)}else r=n.y3(t);return r}function Yi(n){return"string"==typeof n}function Wi(n){return Yi(n)?n.length:n.x3()}function Ki(n,t,r){return Yi(n)?n.substring(t,r):n.z3(t,r)}function Xi(n){return ie(n)}function Ji(n,t){var r;switch(typeof n){case"number":r="number"==typeof t?ne(n,t):t instanceof de?ne(n,t.w8()):te(n,t);break;case"string":case"boolean":r=te(n,t);break;default:r=function(n,t){return n.a4(t)}(n,t)}return r}function ne(n,t){var r;if(n<t)r=-1;else if(n>t)r=1;else if(n===t){var i;if(0!==n)i=0;else{var e=1/n;i=e===1/t?0:e<0?-1:1}r=i}else r=n!=n?t!=t?0:1:-1;return r}function te(n,t){return n<t?-1:n>t?1:0}function re(n){if(!("kotlinHashCodeValue$"in n)){var t=4294967296*Math.random()|0,r=new Object;r.value=t,r.enumerable=!1,Object.defineProperty(n,"kotlinHashCodeValue$",r)}return n.kotlinHashCodeValue$}function ie(n){return null==n?"null":function(n){return!!$e(n)||En(n)}(n)?"[...]":n.toString()}function ee(n){if(null==n)return 0;var t;switch(typeof n){case"object":t="function"==typeof n.hashCode?n.hashCode():re(n);break;case"function":t=re(n);break;case"number":t=function(n){return Qi(),(0|n)===n?Fe(n):(Gi()[0]=n,zn(Ui()[(Qi(),C)],31)+Ui()[Vi()]|0)}(n);break;case"boolean":t=n?1:0;break;default:t=ue(String(n))}return t}function ue(n){var t=0,r=0,i=n.length-1|0;if(r<=i)do{var e=r;r=r+1|0;var u=n.charCodeAt(e);t=zn(t,31)+u|0}while(e!==i);return t}function oe(n,t){return null==n?null==t:null!=t&&("object"==typeof n&&"function"==typeof n.equals?n.equals(t):n!=n?t!=t:"number"==typeof n&&"number"==typeof t?n===t&&(0!==n||1/n==1/t):n===t)}function fe(n,t){null!=Error.captureStackTrace?Error.captureStackTrace(n,t):n.stack=(new Error).stack}function se(n){return n.prototype}function ce(n){return Object.create(n)}function ae(n,t,r){Error.call(n),function(n,t,r){var i=Xe(Object.getPrototypeOf(n));if(!(1&i)){var e;if(null==t){var u;if(null!==t){var o=null==r?null:r.toString();u=null==o?A:o}else u=A;e=u}else e=t;n.message=e}2&i||(n.cause=r),n.name=Object.getPrototypeOf(n).constructor.name}(n,t,r)}function he(n){var t;return null==n?function(){throw ju()}():t=n,t}function le(){throw Iu()}function _e(){throw zu()}function ve(){j=this,this.x8_1=new de(0,-2147483648),this.y8_1=new de(-1,2147483647),this.z8_1=8,this.a9_1=64}function de(n,t){null==j&&new ve,ar.call(this),this.u8_1=n,this.v8_1=t}function ge(){return Me(),P}function we(){return Me(),I}function be(){return Me(),S}function pe(){return Me(),E}function me(){return Me(),T}function ke(n,t){if(Me(),xe(n,t))return 0;var r=Ie(n),i=Ie(t);return r&&!i?-1:!r&&i?1:Ie(qe(n,t))?-1:1}function ye(n,t){Me();var r=n.v8_1>>>16|0,i=65535&n.v8_1,e=n.u8_1>>>16|0,u=65535&n.u8_1,o=t.v8_1>>>16|0,f=65535&t.v8_1,s=t.u8_1>>>16|0,c=0,a=0,h=0,l=0;return c=(c=c+((a=(a=a+((h=(h=h+((l=l+(u+(65535&t.u8_1)|0)|0)>>>16|0)|0)+(e+s|0)|0)>>>16|0)|0)+(i+f|0)|0)>>>16|0)|0)+(r+o|0)|0,new de((h&=65535)<<16|(l&=65535),(c&=65535)<<16|(a&=65535))}function qe(n,t){return Me(),ye(n,t.e9())}function Be(n,t){if(Me(),Se(n))return ge();if(Se(t))return ge();if(xe(n,pe()))return ze(t)?pe():ge();if(xe(t,pe()))return ze(n)?pe():ge();if(Ie(n))return Ie(t)?Be(Ee(n),Ee(t)):Ee(Be(Ee(n),t));if(Ie(t))return Ee(Be(n,Ee(t)));if(Te(n,me())&&Te(t,me()))return Le(Ce(n)*Ce(t));var r=n.v8_1>>>16|0,i=65535&n.v8_1,e=n.u8_1>>>16|0,u=65535&n.u8_1,o=t.v8_1>>>16|0,f=65535&t.v8_1,s=t.u8_1>>>16|0,c=65535&t.u8_1,a=0,h=0,l=0,_=0;return l=l+((_=_+zn(u,c)|0)>>>16|0)|0,_&=65535,h=(h=h+((l=l+zn(e,c)|0)>>>16|0)|0)+((l=(l&=65535)+zn(u,s)|0)>>>16|0)|0,l&=65535,a=(a=(a=a+((h=h+zn(i,c)|0)>>>16|0)|0)+((h=(h&=65535)+zn(e,s)|0)>>>16|0)|0)+((h=(h&=65535)+zn(u,f)|0)>>>16|0)|0,h&=65535,a=a+(((zn(r,c)+zn(i,s)|0)+zn(e,f)|0)+zn(u,o)|0)|0,new de(l<<16|_,(a&=65535)<<16|h)}function Ce(n){return Me(),4294967296*n.v8_1+function(n){return Me(),n.u8_1>=0?n.u8_1:4294967296+n.u8_1}(n)}function xe(n,t){return Me(),n.v8_1===t.v8_1&&n.u8_1===t.u8_1}function je(n,t){if(Me(),t<2||36<t)throw vu("radix out of range: "+t);if(Se(n))return"0";if(Ie(n)){if(xe(n,pe())){var r=Pe(t),i=n.d9(r),e=qe(Be(i,r),n).g9();return je(i,t)+e.toString(t)}return"-"+je(Ee(n),t)}for(var u=2===t?31:t<=10?9:t<=21?7:t<=35?6:5,o=Le(Math.pow(t,u)),f=n,s="";;){var c=f.d9(o),a=qe(f,Be(c,o)).g9().toString(t);if(Se(f=c))return a+s;for(;a.length<u;)a="0"+a;s=a+s}}function Pe(n){return Me(),new de(n,n<0?-1:0)}function Ie(n){return Me(),n.v8_1<0}function Se(n){return Me(),0===n.v8_1&&0===n.u8_1}function ze(n){return Me(),!(1&~n.u8_1)}function Ee(n){return Me(),n.e9()}function Te(n,t){return Me(),ke(n,t)<0}function Le(n){if(Me(),(t=n)!=t)return ge();if(n<=-0x8000000000000000)return pe();if(n+1>=0x8000000000000000)return Me(),z;if(n<0)return Ee(Le(-n));var t,r=4294967296;return new de(n%r|0,n/r|0)}function Ne(n,t){return Me(),ke(n,t)>0}function Ae(n,t){return Me(),ke(n,t)>=0}function Me(){L||(L=!0,P=Pe(0),I=Pe(1),S=Pe(-1),z=new de(-1,2147483647),E=new de(0,-2147483648),T=Pe(16777216))}function Fe(n){return n instanceof de?n.g9():function(n){return n>2147483647?2147483647:n<-2147483648?-2147483648:0|n}(n)}function De(n){var t;return t=function(n){return n<<16>>16}(Fe(n)),function(n){return 65535&n}(t)}function Oe(n,t){return new Ht(n,t)}function Re(n,t,r,i){return He("class",n,t,r,i,null)}function He(n,t,r,i,e,u){return{kind:n,simpleName:t,associatedObjectKey:r,associatedObjects:i,suspendArity:e,$kClass$:A,iid:u}}function $e(n){return Array.isArray(n)}function Ge(n,t,r,i,e,u,o,f){null!=i&&(n.prototype=Object.create(i.prototype),n.prototype.constructor=n);var s=r(t,u,o,null==f?[]:f);n.$metadata$=s,null!=e&&((null!=s.iid?n:n.prototype).$imask$=function(n){for(var t=1,r=[],i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o=t,f=u.prototype.$imask$,s=null==f?u.$imask$:f;null!=s&&(r.push(s),o=s.length);var c=u.$metadata$.iid,a=null==c?null:(l=void 0,v=1<<(31&(h=c)),(l=new Int32Array(1+(h>>5)|0))[_=h>>5]=l[_]|v,l);null!=a&&(r.push(a),o=Math.max(o,a.length)),o>t&&(t=o)}var h,l,_,v;return function(n,t){for(var r=0,i=new Int32Array(n);r<n;){for(var e=r,u=0,o=0,f=t.length;o<f;){var s=t[o];o=o+1|0,e<s.length&&(u|=s[e])}i[e]=u,r=r+1|0}return i}(t,r)}(e))}function Ue(n,t){return function(n,t){var r=n.$imask$;return null!=r&&function(n,t){var r=t>>5;if(r>n.length)return!1;var i=1<<(31&t);return!!(n[r]&i)}(r,t)}(n,t.$metadata$.iid)}function Ve(n){return!!$e(n)&&!n.$type$}function Qe(n){var t;switch(typeof n){case"string":case"number":case"boolean":case"function":t=!0;break;default:t=n instanceof Object}return t}function Ze(n){return"string"==typeof n||Ue(n,sr)}function Ye(n,t,r,i){return He("interface",n,t,r,i,(null==N&&(N=0),N=We()+1|0,We()))}function We(){if(null!=N)return N;!function(){throw Tu("lateinit property iid has not been initialized")}()}function Ke(n,t,r,i){return He("object",n,t,r,i,null)}function Xe(n){var t=n.constructor,r=null==t?null:t.$metadata$,i=null==r?null:r.errorInfo;if(null!=i)return i;var e,u=0;if(Je(n,"message")&&(u|=1),Je(n,"cause")&&(u|=2),3!==u){var o=(e=n,Object.getPrototypeOf(e));o!=Error.prototype&&(u|=Xe(o))}return null!=r&&(r.errorInfo=u),u}function Je(n,t){return n.hasOwnProperty(t)}function nu(n){return new Fr(n)}function tu(n,t,r){for(var i=new Int32Array(r),e=0,u=0,o=0,f=0,s=n.length;f<s;){var c=Zi(n,f);f=f+1|0;var a=t[c];if(u|=(31&a)<<o,a<32){var h=e;e=h+1|0,i[h]=u,u=0,o=0}else o=o+5|0}return i}function ru(n,t){for(var r=0,i=n.length-1|0,e=-1,u=0;r<=i;)if(t>(u=n[e=(r+i|0)/2|0]))r=e+1|0;else{if(t===u)return e;i=e-1|0}return e-(t<u?1:0)|0}function iu(){M=this;var n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",t=new Int32Array(128),r=0,i=Wi(n)-1|0;if(r<=i)do{var e=r;r=r+1|0,t[Zi(n,e)]=e}while(r<=i);var u=tu("hCgBpCQGYHZH5BRpBPPPPPPRMP5BPPlCPP6BkEPPPPcPXPzBvBrB3BOiDoBHwD+E3DauCnFmBmB2D6E1BlBTiBmBlBP5BhBiBrBvBjBqBnBPRtBiCmCtBlB0BmB5BiB7BmBgEmChBZgCoEoGVpBSfRhBPqKQ2BwBYoFgB4CJuTiEvBuCuDrF5DgEgFlJ1DgFmBQtBsBRGsB+BPiBlD1EIjDPRPPPQPPPPPGQSQS/DxENVNU+B9zCwBwBPPCkDPNnBPqDYY1R8B7FkFgTgwGgwUwmBgKwBuBScmEP/BPPPPPPrBP8B7F1B/ErBqC6B7BiBmBfQsBUwCw/KwqIwLwETPcPjQgJxFgBlBsD",t,222),o=new Int32Array(u.length),f=0,s=u.length-1|0;if(f<=s)do{var c=f;f=f+1|0,o[c]=0===c?u[c]:o[c-1|0]+u[c]|0}while(f<=s);this.h9_1=o,this.i9_1=tu("aaMBXHYH5BRpBPPPPPPRMP5BPPlCPPzBDOOPPcPXPzBvBjB3BOhDmBBpB7DoDYxB+EiBP1DoExBkBQhBekBPmBgBhBctBiBMWOOXhCsBpBkBUV3Ba4BkB0DlCgBXgBtD4FSdBfPhBPpKP0BvBXjEQ2CGsT8DhBtCqDpFvD1D3E0IrD2EkBJrBDOBsB+BPiBlB1EIjDPPPPPPPPPPPGPPMNLsBNPNPKCvBvBPPCkDPBmBPhDXXgD4B6FzEgDguG9vUtkB9JcuBSckEP/BPPPPPPBPf4FrBjEhBpC3B5BKaWPrBOwCk/KsCuLqDHPbPxPsFtEaaqDL",t,222),this.j9_1=tu("GFjgggUHGGFFZZZmzpz5qB6s6020B60ptltB6smt2sB60mz22B1+vv+8BZZ5s2850BW5q1ymtB506smzBF3q1q1qB1q1q1+Bgii4wDTm74g3KiggxqM60q1q1Bq1o1q1BF1qlrqrBZ2q5wprBGFZWWZGHFsjiooLowgmOowjkwCkgoiIk7ligGogiioBkwkiYkzj2oNoi+sbkwj04DghhkQ8wgiYkgoioDsgnkwC4gikQ//v+85BkwvoIsgoyI4yguI0whiwEowri4CoghsJowgqYowgm4DkwgsY/nwnzPowhmYkg6wI8yggZswikwHgxgmIoxgqYkwgk4DkxgmIkgoioBsgssoBgzgyI8g9gL8g9kI0wgwJoxgkoC0wgioFkw/wI0w53iF4gioYowjmgBHGq1qkgwBF1q1q8qBHwghuIwghyKk0goQkwgoQk3goQHGFHkyg0pBgxj6IoinkxDswno7Ikwhz9Bo0gioB8z48Rwli0xN0mpjoX8w78pDwltoqKHFGGwwgsIHFH3q1q16BFHWFZ1q10q1B2qlwq1B1q10q1B2q1yq1B6q1gq1Biq1qhxBir1qp1Bqt1q1qB1g1q1+B//3q16B///q1qBH/qlqq9Bholqq9B1i00a1q10qD1op1HkwmigEigiy6Cptogq1Bixo1kDq7/j00B2qgoBWGFm1lz50B6s5q1+BGWhggzhwBFFhgk4//Bo2jigE8wguI8wguI8wgugUog1qoB4qjmIwwi2KgkYHHH4lBgiFWkgIWoghssMmz5smrBZ3q1y50B5sm7gzBtz1smzB5smz50BqzqtmzB5sgzqzBF2/9//5BowgoIwmnkzPkwgk4C8ys65BkgoqI0wgy6FghquZo2giY0ghiIsgh24B4ghsQ8QF/v1q1OFs0O8iCHHF1qggz/B8wg6Iznv+//B08QgohsjK0QGFk7hsQ4gB",t,222)}function eu(){return null==M&&new iu,M}function uu(){F=this,this.k9_1=new Int32Array([170,186,688,704,736,837,890,7468,7544,7579,8305,8319,8336,8560,9424,11388,42652,42864,43e3,43868]),this.l9_1=new Int32Array([1,1,9,2,5,1,1,63,1,37,1,1,13,16,26,2,2,1,2,4])}function ou(){return null==F&&new uu,F}function fu(n){var t=function(n,t){return wu(n,t),su.call(t),t}(n,ce(se(su)));return fe(t,fu),t}function su(){fe(this,su)}function cu(n){var t=function(n,t){return wu(n,t),au.call(t),t}(n,ce(se(au)));return fe(t,cu),t}function au(){fe(this,au)}function hu(n){var t=function(n,t){return wu(n,t),lu.call(t),t}(n,ce(se(lu)));return fe(t,hu),t}function lu(){fe(this,lu)}function _u(n,t){return ae(t,n),du.call(t),t}function vu(n){var t=_u(n,ce(se(du)));return fe(t,vu),t}function du(){fe(this,du)}function gu(n){return function(n){ae(n),du.call(n)}(n),bu.call(n),n}function wu(n,t){return _u(n,t),bu.call(t),t}function bu(){fe(this,bu)}function pu(){var n,t=(gu(n=ce(se(ku))),ku.call(n),n);return fe(t,pu),t}function mu(n){var t=function(n,t){return wu(n,t),ku.call(t),t}(n,ce(se(ku)));return fe(t,mu),t}function ku(){fe(this,ku)}function yu(n){var t=function(n,t){return wu(n,t),qu.call(t),t}(n,ce(se(qu)));return fe(t,yu),t}function qu(){fe(this,qu)}function Bu(){var n,t=(gu(n=ce(se(xu))),xu.call(n),n);return fe(t,Bu),t}function Cu(n){var t=function(n,t){return wu(n,t),xu.call(t),t}(n,ce(se(xu)));return fe(t,Cu),t}function xu(){fe(this,xu)}function ju(){var n,t=(gu(n=ce(se(Pu))),Pu.call(n),n);return fe(t,ju),t}function Pu(){fe(this,Pu)}function Iu(){var n,t=(gu(n=ce(se(Su))),Su.call(n),n);return fe(t,Iu),t}function Su(){fe(this,Su)}function zu(){var n,t=(gu(n=ce(se(Eu))),Eu.call(n),n);return fe(t,zu),t}function Eu(){fe(this,Eu)}function Tu(n){var t=function(n,t){return wu(n,t),Lu.call(t),t}(n,ce(se(Lu)));return fe(t,Tu),t}function Lu(){fe(this,Lu)}function Nu(n,t){var r,i=n.className;return(r="(^|.*\\s+)"+t+"($|\\s+.*)",function(n,t){return Bi.call(t,n,At()),t}(r,ce(se(Bi)))).a8(i)}function Au(n,t){this.o9_1=n,this.p9_1=t}function Mu(n){this.q9_1=n}function Fu(n,t,r){var i,e=Ff(),u=Wu(),o=Mf().ga(t),f=Wu();if(0===Wi(r))i=Lf();else{var s=n.ia_1,c=null==s?null:new Mu(s).v9(r,"Copy reference to the clipboard");i=null==c?Lf():c}return e.ja([u,o,f,i])}function Du(n){n=n===A?null:n,this.ia_1=n}function Ou(n,t,r){Yu.call(this),this.ma_1=n,this.na_1=t,this.oa_1=r}function Ru(n,t){this.ra_1=n,this.sa_1=t}function Hu(n,t){Yu.call(this),this.va_1=n,this.wa_1=t}function $u(n,t){Yu.call(this),this.xa_1=n,this.ya_1=t}function Gu(n){Yu.call(this),this.za_1=n}function Uu(n){Yu.call(this),this.ab_1=n}function Vu(n){Yu.call(this),this.bb_1=n}function Qu(n,t){Yu.call(this),this.cb_1=n,this.db_1=t}function Zu(n){Yu.call(this),this.eb_1=n}function Yu(){}function Wu(){return ro(),D}function Ku(){return ro(),O}function Xu(){return ro(),R}function Ju(){return ro(),H}function no(n){return ro(),Ff().fb(Jf(to),n)}function to(n){return ro(),n.gb(["invisible-text","text-for-copy"]),lr()}function ro(){$||($=!0,D=no("`"),O=no(" "),R=no("("),H=no(")"))}function io(n,t){Yu.call(this),this.hb_1=n,this.ib_1=t}function eo(n){Yu.call(this),this.jb_1=n}function uo(n,t){Yu.call(this),this.kb_1=n,this.lb_1=t}function oo(n){Yu.call(this),this.mb_1=n}function fo(n){Yu.call(this),this.nb_1=n}function so(n){Yu.call(this),this.ob_1=n}function co(n,t,r){Yu.call(this),this.pb_1=n,this.qb_1=t,this.rb_1=r}function ao(n){Yu.call(this),this.sb_1=n}function ho(n){Yu.call(this),this.tb_1=n}function lo(n){return n.xb_1.vb_1.k()}function _o(){if(Z)return lr();Z=!0,G=new ko("Inputs",0,"Build configuration inputs"),U=new ko("ByMessage",1,"Problems grouped by message"),V=new ko("ByLocation",2,"Problems grouped by location"),Q=new ko("IncompatibleTasks",3,"Incompatible tasks")}function vo(n){yc.call(this),this.yb_1=n}function go(n){yc.call(this),this.ac_1=n}function wo(n){yc.call(this),this.bc_1=n}function bo(n){yc.call(this),this.cc_1=n}function po(n){yo.call(this),this.dc_1=n}function mo(n,t,r,i,e,u,o,f){this.ec_1=n,this.fc_1=t,this.gc_1=r,this.hc_1=i,this.ic_1=e,this.jc_1=u,this.kc_1=o,this.lc_1=f}function ko(n,t,r){Di.call(this,n,t),this.qc_1=r}function yo(){Bc.call(this)}function qo(n,t){var r=Af(),i=Jf(Lo),e=Af().y9(Jf(No),[]),u=function(n,t){var r,i=Af(),e=Jf(Oo),u=Ff().ga("Learn more about the "),o=$f();return i.y9(e,[u,o.fb(Jf((r=t,function(n){return n.bd(r.tc_1),lr()})),t.sc_1),Ff().ga(".")])}(0,t.gc_1),o=Af().y9(Jf(Ao),[Co(0,t)]),f=Af();return r.y9(i,[e,u,o,f.y9(Jf(Mo),[Io(0,Ro(),t.lc_1,lo(t.jc_1)),Io(0,Ho(),t.lc_1,lo(t.hc_1)),Io(0,$o(),t.lc_1,lo(t.ic_1)),Io(0,Go(),t.lc_1,lo(t.kc_1))])])}function Bo(n,t){var r,i,e=Af(),u=Jf(Fo);switch(t.lc_1.q8_1){case 0:r=zo(0,t.jc_1,((i=function(n){return new wo(n)}).callableName="<init>",i));break;case 3:r=zo(0,t.kc_1,function(){var n=function(n){return new bo(n)};return n.callableName="<init>",n}());break;case 1:r=zo(0,t.hc_1,function(){var n=function(n){return new go(n)};return n.callableName="<init>",n}());break;case 2:r=zo(0,t.ic_1,function(){var n=function(n){return new vo(n)};return n.callableName="<init>",n}());break;default:le()}return e.y9(u,[r])}function Co(n,t){return Af().ja([Po(0,t),xo(0,t)])}function xo(n,t){for(var r=Af(),i=t.fc_1,e=Lr(),u=0,o=i.f();o.g();){var f=o.h(),s=u;u=s+1|0,jt(e,0===wr(s)?gr(jo(Vo(),f)):bt([Gf().ja([]),jo(Vo(),f)]))}return r.ha(e)}function jo(n,t){return Df().ja([Ic(t)])}function Po(n,t){return Nf().ja([jc().ka(t.ec_1)])}function Io(n,t,r,i){var e,u,o;return Af().y9(Jf((e=i,u=t,o=r,function(n){return n.t9("group-selector"),0===e?(n.t9("group-selector--disabled"),lr()):u.equals(o)?(n.t9("group-selector--active"),lr()):(n.u9(function(n){return function(t){return new po(n)}}(u)),lr()),lr()})),[Ff().rc(t.qc_1,[So(0,i)])])}function So(n,t){return Ff().y9(Jf(Do),[Ku(),Xu(),Ff().ga(""+t),Ju()])}function zo(n,t,r){return function(n,t,r){var i,e=Af(),u=Of();return e.ja([u.ha(ys(t,(i=r,function(n){var t,r=n.cd().ub_1;return r instanceof Hu?Nc(i,(Vo(),(t=function(n){return Eo(0,n)}).callableName="viewNode",t),n,r.va_1,r.wa_1,Cc()):r instanceof $u?Nc(i,function(){var n=function(n){return Eo(0,n)};return n.callableName="viewNode",n}(Vo()),n,r.xa_1,r.ya_1,xc()):r instanceof io?Nc(i,function(){var n=function(n){return Eo(0,n)};return n.callableName="viewNode",n}(Vo()),n,r.hb_1,r.ib_1,A,So(Vo(),n.cd().vb_1.k())):r instanceof Ou?Lc(i,n,r):Nc(i,function(){var n=function(n){return Eo(0,n)};return n.callableName="viewNode",n}(Vo()),n,r)})))])}(0,t.xb_1.uc().vc(),r)}function Eo(n,t){var r;return t instanceof eo?Sc((r=t,function(n){return n.ed("project "),n.fd(r.jb_1),lr()})):t instanceof co?Sc(function(n){return function(t){return t.ed(n.pb_1+" "),t.fd(n.qb_1),t.ed(" of "),t.fd(n.rb_1),lr()}}(t)):t instanceof so?Sc(function(n){return function(t){return t.ed("system property "),t.fd(n.ob_1),lr()}}(t)):t instanceof uo?Sc(function(n){return function(t){return t.ed("task "),t.fd(n.kb_1),t.ed(" of type "),t.fd(n.lb_1),lr()}}(t)):t instanceof fo?Sc(function(n){return function(t){return t.ed("bean of type "),t.fd(n.nb_1),lr()}}(t)):t instanceof ao?Sc(function(n){return function(t){return t.ed(n.sb_1),lr()}}(t)):t instanceof ho?Sc(function(n){return function(t){return t.ed("class "),t.fd(n.tb_1),lr()}}(t)):t instanceof Zu?Sc(function(n){return function(t){return t.ed(n.eb_1),lr()}}(t)):t instanceof Gu?Ic(t.za_1):t instanceof Qu?Qo(t):Ff().ga(ie(t))}function To(n){return n.t9("report-wrapper"),lr()}function Lo(n){return n.t9("header"),lr()}function No(n){return n.t9("gradle-logo"),lr()}function Ao(n){return n.t9("title"),lr()}function Mo(n){return n.t9("groups"),lr()}function Fo(n){return n.t9("content"),lr()}function Do(n){return n.t9("group-selector__count"),lr()}function Oo(n){return n.t9("learn-more"),lr()}function Ro(){return _o(),G}function Ho(){return _o(),U}function $o(){return _o(),V}function Go(){return _o(),Q}function Uo(){Y=this}function Vo(){return null==Y&&new Uo,Y}function Qo(n){var t;return $f().fb(Jf((t=n,function(n){return n.t9("documentation-button"),n.bd(t.cb_1),lr()})),n.db_1)}function Zo(n,t,r){this.kd_1=n,this.ld_1=t,this.md_1=r}function Yo(n,t,r){this.nd_1=n,this.od_1=t,this.pd_1=r}function Wo(n,t){for(var r=vf(n),i=t.trace,e=Nr(i.length),u=0,o=i.length;u<o;){var f,s=i[u];u=u+1|0,f=Jo(s),e.d(f)}return new Zo(t,r,e)}function Ko(n,t){var r,i=null==(r=t.kd_1.error)?null:nf(r);null==i||n.d(i)}function Xo(n){return function(n,t,r){var i=null==n.error?null:new Hu(t,r);return null==i?new $u(t,r):i}(n.kd_1,new Gu(n.ld_1),ef(n.kd_1))}function Jo(n){var t;switch(n.kind){case"Project":t=new eo(n.path);break;case"Task":t=new uo(n.path,n.type);break;case"TaskPath":t=new oo(n.path);break;case"Bean":t=new fo(n.type);break;case"Field":t=new co("field",n.name,n.declaringType);break;case"InputProperty":t=new co("input property",n.name,n.task);break;case"OutputProperty":t=new co("output property",n.name,n.task);break;case"SystemProperty":t=new so(n.name);break;case"PropertyUsage":t=new co("property",n.name,n.from);break;case"BuildLogic":t=new ao(n.location);break;case"BuildLogicClass":t=new ho(n.type);break;default:t=new Zu("Gradle runtime")}return t}function nf(n){var t=n.parts;if(null==t){var r=n.summary;return null==r?null:new Gu(vf(r))}for(var i=n.summary,e=null==i?null:vf(i),u=Lr(),o=Ri(t);o.g();){var f=rf(o.h());null==f||u.d(f)}for(var s=Mn(u,"\n"),c=Lr(),a=Ri(t);a.g();){var h=tf(a.h());null==h||c.d(h)}return new Ou(e,s,c)}function tf(n){var t=rf(n);if(null==t)return null;var r,i,e=nt(new Nt(function(n,t,r,i){var e;return Jn(nr(n,["\r\n","\n","\r"],A,r=r!==A&&r,i=i===A?0:i),(e=n,function(n){return Jt(e,n)}))}(t),!0,lf));return new Ru(e,(r=!(null==n.internalText),i=e.k(),r&&i>1?ps():null))}function rf(n){var t=n.text;return null==t?n.internalText:t}function ef(n){var t=n.documentationLink;return null==t?null:new Qu(t,"")}function uf(n,t){return new cs(of(n,jf().sd(t),ps()))}function of(n,t,r){return new ks(n,function(n,t){var r,i=Jn(On(n.o()),If);return nt(Jn(new rt(i,new ff(_f)),(r=t,function(n){return of(n.v3(),n.w3().wd_1,r)})))}(t,1===Pf(t)?ms():ps()),0===Pf(t)?ps():r)}function ff(n){this.td_1=n}function sf(n){var t=Lr(),r=n.ld_1,i=Dn(r.ca_1).fa_1,e=ie(Xt(Ze(i)?i:_e())),u=r.vd(function(n,t){var r;if(!(t>=0))throw fu(ie("Requested element count "+t+" is less than zero."));if(0===t)return Rn(n);if(Ue(n,Ti)){var i=n.k()-t|0;if(i<=0)return pt();if(1===i)return gr(function(n){if(Ue(n,Ei))return Qn(n);var t=n.f();if(!t.g())throw mu("Collection is empty.");for(var r=t.h();t.g();)r=t.h();return r}(n));if(r=Nr(),Ue(n,Ei)){if(Ue(n,li)){var e=t,u=n.k();if(e<u)do{var o=e;e=e+1|0,r.d(n.j(o))}while(e<u)}else for(var f=n.l(t);f.g();){var s=f.h();r.d(s)}return r}}else r=Lr();for(var c=0,a=n.f();a.g();){var h=a.h();c>=t?r.d(h):c=c+1|0}return mt(r)}(r.ca_1,1));return t.d(new io(new Zu(e),ef(n.kd_1))),t.d(new Gu(u)),t.m(n.md_1),t.j5()}function cf(n){var t=Lr(),r=n.ld_1,i=r.vd(r.ca_1);return t.d(new $u(new Gu(i),ef(n.kd_1))),t.j5()}function af(n){var t=Lr();return t.d(Xo(n)),t.m(n.md_1),Ko(t,n),t.j5()}function hf(n){var t=Lr();return t.m(new St(n.md_1)),t.d(Xo(n)),Ko(t,n),t.j5()}function lf(n){return Wi(n)>0}function _f(n,t){return function(n,t){return n===t?0:null==n?-1:null==t?1:Ji(null!=n&&("string"==(i=typeof(r=n))||"boolean"===i||function(n){return"number"==typeof n||n instanceof de}(r)||Ue(r,cr))?n:_e(),t);var r,i}(Oi(n.v3()),Oi(t.v3()))}function vf(n){var t;return Bf().qd((t=n,function(n){for(var r=t,i=0,e=r.length;i<e;){var u=r[i];i=i+1|0;var o=u.text;null==o||n.ed(o);var f=u.name;null==f||(n.fd(f),lr())}return lr()}))}function df(n,t){return(0!==(r=n)?r.toString():"No")+" "+gf(t,n)+" "+wf(n)+" found";var r}function gf(n,t){return t<2?n:n+"s"}function wf(n){return n<=1?"was":"were"}function bf(n,t){this.sc_1=n,this.tc_1=t}function pf(n){kf.call(this),this.fa_1=n}function mf(n,t){kf.call(this),this.da_1=n,this.ea_1=t}function kf(){}function yf(){this.dd_1=Lr()}function qf(){W=this}function Bf(){return null==W&&new qf,W}function Cf(n){Bf(),this.ca_1=n}function xf(){K=this}function jf(){return null==K&&new xf,K}function Pf(n){return n.k()}function If(n){var t=n.j1(),r=n.i1();return fr(t,new Sf(Ue(r,Ni)?r:_e()))}function Sf(n){jf(),this.wd_1=n}function zf(n,t,r){var i;Tf(t,n,r),i="Component mounted at #"+n.id+".",wi(),(wi(),g).j7(i)}function Ef(n){var t=document.getElementById(n);if(null==t)throw hu("'"+n+"' element missing");return t}function Tf(n,t,r){var i,e,u;i=n.z9(r),e=t,u=function(n,t,r){return function(i){return Tf(n,r,n.ba(i,t)),lr()}}(n,r,t),fs(),e.innerHTML="",us(e,i,u)}function Lf(){return fs(),X}function Nf(){return fs(),J}function Af(){return fs(),nn}function Mf(){return fs(),tn}function Ff(){return fs(),rn}function Df(){return fs(),en}function Of(){return fs(),un}function Rf(){return fs(),on}function Hf(){return fs(),fn}function $f(){return fs(),sn}function Gf(){return fs(),cn}function Uf(n){this.x9_1=n}function Vf(){an=this}function Qf(){return null==an&&new Vf,an}function Zf(){hn=this,Xf.call(this)}function Yf(){return null==hn&&new Zf,hn}function Wf(n,t,r,i){t=t===A?pt():t,r=r===A?null:r,i=i===A?pt():i,Xf.call(this),this.be_1=n,this.ce_1=t,this.de_1=r,this.ee_1=i}function Kf(){}function Xf(){Qf()}function Jf(n){fs();var t,r=Lr();return n(new ns((t=r,function(n){return t.d(n),lr()}))),r}function ns(n){this.r9_1=n}function ts(n,t){es.call(this),this.fe_1=n,this.ge_1=t}function rs(n){es.call(this),this.he_1=n}function is(n,t){es.call(this),this.ie_1=n,this.je_1=t}function es(){}function us(n,t,r){if(fs(),t instanceof Wf)!function(n,t,r){var i=function(n,t,r){var i=n.createElement(t);return r(i),i}(he(n.ownerDocument),t,r);n.appendChild(i)}(n,t.be_1,(e=t,u=r,function(n){for(var t=e.ce_1.f();t.g();)os(n,t.h(),u);var r=e.de_1;null==r||function(n,t){n.appendChild(he(n.ownerDocument).createTextNode(t))}(n,r);for(var i=e.ee_1.f();i.g();)us(n,i.h(),u);return lr()}));else if(t instanceof Kf){var i=t instanceof Kf?t:_e();us(n,i.ke_1,function(n,t){return function(r){return n(t.le_1(r)),lr()}}(r,i))}else if(oe(t,Yf()))return lr();var e,u}function os(n,t,r){var i,e;fs(),t instanceof is?n.setAttribute(t.ie_1,t.je_1):t instanceof rs?function(n,t){for(var r=Lr(),i=0,e=t.length;i<e;){var u=t[i];i=i+1|0,Nu(n,u)||r.d(u)}var o=r;if(!o.i()){var f=n.className,s=ie(Xt(Ze(f)?f:_e())),c=bi();c.p7(s),0!==Wi(s)&&c.p7(" "),Fn(o,c," "),n.className=c.toString()}}(n,[t.he_1]):t instanceof ts&&n.addEventListener(t.fe_1,(i=r,e=t,function(n){return n.stopPropagation(),i(e.ge_1(n)),lr()}))}function fs(){ln||(ln=!0,X=Yf(),new Uf("hr"),J=new Uf("h1"),new Uf("h2"),nn=new Uf("div"),new Uf("pre"),tn=new Uf("code"),rn=new Uf("span"),en=new Uf("small"),un=new Uf("ol"),on=new Uf("ul"),fn=new Uf("li"),sn=new Uf("a"),cn=new Uf("br"),new Uf("p"))}function ss(n){as.call(this),this.ne_1=n}function cs(n){this.xb_1=n}function as(){}function hs(n){return n.me(A,A,n.wb_1.ad())}function ls(){_n=this}function _s(){return null==_n&&new ls,_n}function vs(){if(gn)return lr();gn=!0,vn=new ws("Collapsed",0),dn=new ws("Expanded",1)}function ds(n){bs.call(this),this.ve_1=n}function gs(n,t,r){bs.call(this),this.se_1=n,this.te_1=t,this.ue_1=r}function ws(n,t){Di.call(this,n,t)}function bs(){}function ps(){return vs(),vn}function ms(){return vs(),dn}function ks(n,t,r){t=t===A?pt():t,r=r===A?ps():r,this.ub_1=n,this.vb_1=t,this.wb_1=r}function ys(n,t){return nt(Jn(n,(r=t,function(n){return function(n,t){var r,i=n.cd(),e=Hf(),u=t(n),o=i.vb_1;r=null==(i.wb_1.equals(ms())&&!o.i()?o:null)?null:function(n,t){return Rf().ha(function(n,t){return ys(n.vc(),t)}(n,t))}(n,t);var f=r;return e.ja([u,null==f?Lf():f])}(n,r)})));var r}function qs(){if(kn)return lr();kn=!0,bn=new Bs("ByMessage",0,"Messages"),pn=new Bs("ByGroup",1,"Group"),mn=new Bs("ByFileLocation",2,"Locations")}function Bs(n,t,r){Di.call(this,n,t),this.cf_1=r}function Cs(n,t){this.df_1=n,this.ef_1=t}function xs(n,t){this.ff_1=n,this.gf_1=t}function js(n){return new ks(new Gu(Bf().rd(n+" more problem"+(n>1?"s have":" has")+" been skipped")))}function Ps(n,t,r,i){var e,u,o=n.v1(t);if(null==o){var f=Lr(),s=fr(new ks(new Vs(Bf().qd((u=t,function(n){return n.fd(u),lr()}))),f,ms()),f);n.h5(t,s),e=s}else e=o;e.u3_1.d(Es(r,i))}function Is(n,t,r,i){var e;if(t=t===A?Lr():t,r=r===A?oi():r,i===A){var u=wn;wn=u+1|0,e=u}else e=i;i=e,this.hf_1=n,this.if_1=t,this.jf_1=r,this.kf_1=i}function Ss(n,t){if(t.i())return null;for(var r,i=n,e=null,u=t.f();u.g();){var o=u.h();r=e;var f,s=i,c=o.ef_1+" ("+o.df_1+")",a=s.v1(c);if(null==a){var h=Lr(),l=new Is(new ks(new Vs(Bf().qd(Fs(o))),h,ms()),h);s.h5(c,l),f=l}else f=a;e=f,null==r||he(r).if_1.u(he(e).hf_1)||he(r).if_1.d(he(e).hf_1),i=he(e).jf_1}return e}function zs(n,t){if(n.k()===t.length){var r;n:{var i=function(n,t){var r=t.length,i=xt(n,10),e=Nr(Math.min(i,r)),u=0,o=n.f();t:for(;o.g();){var f,s=o.h();if(u>=r)break t;var c=u;u=c+1|0,f=fr(s,t[c]),e.d(f)}return e}(n,t);if(Ue(i,Ti)&&i.i())r=!0;else{for(var e=i.f();e.g();){var u=e.h();if(u.t3_1.df_1!==u.u3_1.name||u.t3_1.ef_1!==u.u3_1.displayName){r=!1;break n}}r=!0}}return r}return!1}function Es(n,t,r){var i=function(n,t,r){t=t===A?null:t;var i=Ns(function(n,t){return n&&null!=t.contextualLabel?he(t.contextualLabel):Ts(t)}(r=r!==A&&r,n),t).j5();return Ls(n,new Gu(i))}(n,t=t===A?null:t,r=r!==A&&r),e=function(n,t,r){r=r!==A&&r;var i,e=n.problemDetails;if(null==e)i=null;else{var u,o=e[0].text,f=null==o?null:function(n,t,r,i){if(r=r!==A&&r,i=i===A?0:i,1===t.length){var e=t[0];if(0!==Wi(e))return function(n,t,r,i){rr(i);var e=0,u=Wt(n,t,e,r);if(-1===u||1===i)return gr(ie(n));var o,f=i>0,s=Nr(f&&Kn(i,10));n:do{var c;if(c=ie(Ki(n,e,u)),s.d(c),e=u+t.length|0,f&&s.k()===(i-1|0))break n;u=Wt(n,t,e,r)}while(-1!==u);return o=ie(Ki(n,e,Wi(n))),s.d(o),s}(n,e,r,i)}for(var u=function(n){return new tt(n)}(nr(n,t,A,r,i)),o=Nr(xt(u,10)),f=u.f();f.g();){var s;s=Jt(n,f.h()),o.d(s)}return o}(o,["\n"]);if(null==f)u=null;else{for(var s=Nr(xt(f,10)),c=f.f();c.g();){var a,h=c.h();a=Ms(n)?Bf().qd(Os(h)):Bf().rd(h),s.d(a)}u=s}var l,_=u;if(null==_)l=null;else{for(var v=Nr(xt(_,10)),d=_.f();d.g();){var g;g=new ks(new Gu(d.h())),v.d(g)}l=v}var w=null==l?null:Hn(l);i=null==w?Lr():w}var b=i,p=null==b?Lr():b;r||null==n.contextualLabel||p.d(new ks(new Gu(Bf().rd(he(n.contextualLabel)))));var m=function(n){var t=n.solutions;if(null==t||0===t.length)return null;for(var r=new Vu(Bf().rd("Solutions")),i=he(n.solutions),e=Nr(i.length),u=0,o=i.length;u<o;){var f,s=i[u];u=u+1|0,f=new ks(new Uu(vf(s))),e.d(f)}return new ks(r,e)}(n);null==m||p.d(m);var k,y=n.error,q=null==y?null:nf(y);if(null==q||p.d(new ks(q)),t){var B=n.locations;k=!(null==B||0===B.length)}else k=!1;return k&&p.d(function(n){var t,r=n.locations;if(null==r)t=null;else{for(var i=Nr(r.length),e=Ri(r);e.g();){var u,o=e.h();u=new ks(new Gu(Bf().qd(Rs(o)))),i.d(u)}t=i}var f=t;return new ks(new Zu("Locations"),null==f?pt():f)}(n)),p}(n,null==t,r);return new ks(i,e)}function Ts(n){return function(n){if(0===n.length)throw mu("Array is empty.");return n[Nn(n)]}(n.problemId).displayName}function Ls(n,t){var r;switch(n.severity){case"WARNING":var i=n.documentationLink;r=new $u(t,null==i?null:new Qu(i,""));break;case"ERROR":var e=n.documentationLink;r=new Hu(t,null==e?null:new Qu(e,""));break;case"ADVICE":var u=n.documentationLink;r=new Qs(t,null==u?null:new Qu(u,""));break;default:console.error("no severity "+n.severity),r=t}return r}function Ns(n,t){t=t===A?null:t;var r,i=new yf;if(i.ed(n),null==t);else{if(null!=t.line){var e=As(t);i.xd(e+(null==(r=t).line||null==r.length?"":"-"+r.length),""+t.path+e)}var u=t.taskPath;null==u||i.fd(u);var o=t.pluginId;null!=o&&i.fd(o)}return i}function As(n){var t;if(null==n.line)t=null;else{var r,i=":"+n.line,e=n.column;t=i+(null==(r=null==e?null:":"+e)?"":r)}return null==t?"":t}function Ms(n){var t,r,i=n.problemId;n:{for(var e=0,u=i.length;e<u;){var o=i[e];if(e=e+1|0,"compilation"===o.name){r=o;break n}}r=null}if(null!=r){var f,s=n.problemId;n:{for(var c=0,a=s.length;c<a;){var h=s[c];if(c=c+1|0,"java"===h.name){f=h;break n}}f=null}t=!(null==f)}else t=!1;return t}function Fs(n){return function(t){return t.ed(n.ef_1),t.fd(n.df_1),lr()}}function Ds(n){return n.name}function Os(n){return function(t){return t.xd(function(n,t,r,i){i=i!==A&&i;var e=new RegExp(qi().t7(" "),i?"gui":"gu"),u=qi().u7(" ");return n.replace(e,u)}(n),""),lr()}}function Rs(n){return function(t){return t.ed("- "),t.fd(""+n.path+As(n)),lr()}}function Hs(){return qs(),bn}function $s(){return qs(),pn}function Gs(){return qs(),mn}function Us(n){Zs.call(this),this.lf_1=n}function Vs(n,t){t=t!==A&&t,Zs.call(this),this.mf_1=n,this.nf_1=t}function Qs(n,t){t=t===A?null:t,Yu.call(this),this.of_1=n,this.pf_1=t}function Zs(){Yu.call(this)}function Ys(n){yc.call(this),this.qf_1=n}function Ws(n){yc.call(this),this.rf_1=n}function Ks(n){yc.call(this),this.sf_1=n}function Xs(n){nc.call(this),this.tf_1=n}function Js(n,t,r,i,e,u,o,f){this.uf_1=n,this.vf_1=t,this.wf_1=r,this.xf_1=i,this.yf_1=e,this.zf_1=u,this.ag_1=o,this.bg_1=f}function nc(){Bc.call(this)}function tc(n,t){var r=Lr();lo(t.xf_1)>0&&r.d(fc(0,Hs(),t.bg_1,t.ag_1)),lo(t.yf_1)>0&&r.d(fc(0,$s(),t.bg_1,t.ag_1)),lo(t.zf_1)>0&&r.d(fc(0,Gs(),t.bg_1,t.ag_1));var i=Af(),e=Jf(hc),u=Af().y9(Jf(lc),[]),o=function(n,t){var r,i=Af(),e=Jf(wc),u=Ff().ga("Learn more about "),o=$f();return i.y9(e,[u,o.fb(Jf((r=t,function(n){return n.bd(r.tc_1),lr()})),t.sc_1),Ff().ga(".")])}(0,t.wf_1),f=Af().y9(Jf(_c),[ic(0,t)]),s=Af();return i.y9(e,[u,o,f,s.zd(Jf(vc),r)])}function rc(n,t){var r,i,e=Af(),u=Jf(dc);switch(t.bg_1.q8_1){case 0:r=sc(0,t.xf_1,((i=function(n){return new Ys(n)}).callableName="<init>",i));break;case 1:r=sc(0,t.yf_1,function(){var n=function(n){return new Ws(n)};return n.callableName="<init>",n}());break;case 2:r=sc(0,t.zf_1,function(){var n=function(n){return new Ks(n)};return n.callableName="<init>",n}());break;default:le()}return e.y9(u,[r])}function ic(n,t){return Af().ja([oc(0,t),ec(0,t)])}function ec(n,t){for(var r=Af(),i=t.vf_1,e=Lr(),u=0,o=i.f();o.g();){var f=o.h(),s=u;u=s+1|0,jt(e,0===wr(s)?gr(uc(pc(),f)):bt([Gf().ja([]),uc(pc(),f)]))}return r.ha(e)}function uc(n,t){return Df().ja([Ic(t)])}function oc(n,t){return Nf().ja([jc().ka(t.uf_1)])}function fc(n,t,r,i){var e,u,o,f;return Af().y9(Jf((e=i,u=t,o=r,function(n){return n.t9("group-selector"),0===e?(n.t9("group-selector--disabled"),lr()):u.equals(o)?(n.t9("group-selector--active"),lr()):(n.u9(function(n){return function(t){return new Xs(n)}}(u)),lr()),lr()})),[Ff().rc(t.cf_1,[(f=i,Ff().y9(Jf(gc),[Ku(),Xu(),Ff().ga(""+f),Ju()]))])])}function sc(n,t,r){return function(n,t,r){var i,e=Af(),u=Of();return e.ja([u.ha(ys(t,(i=r,function(n){return function(n,t,r,i){var e,u;return t instanceof Us?Ic(Bf().rd(t.lf_1)):t instanceof Vs?Af().y9(Jf((u=t,function(n){return u.nf_1&&(n.t9("uncategorized"),lr()),lr()})),[Af().ja([zc(r,i),Ic(t.mf_1)])]):t instanceof Ou?Lc(i,r,t):t instanceof Gu?Ic(t.za_1):t instanceof Uu?Af().ja([(Vc(),xn),Ic(t.ab_1)]):t instanceof Vu?Af().ja([zc(r,i),Ic(t.bb_1)]):t instanceof Hu?Nc(i,((e=function(n){return cc(0,n)}).callableName="viewIt",e),r,t.va_1,t.wa_1,Cc()):t instanceof Qs?Nc(i,function(){var n=function(n){return cc(0,n)};return n.callableName="viewIt",n}(),r,t.of_1,t.pf_1,(Vc(),Bn)):t instanceof $u?Nc(i,function(){var n=function(n){return cc(0,n)};return n.callableName="viewIt",n}(),r,t.xa_1,t.ya_1,xc()):t instanceof Zu?Af().ja([zc(r,i),Ic(Bf().rd(t.eb_1))]):Ff().ga("Unknown node type viewNode: "+t)}(pc(),n.cd().ub_1,n,i)})))])}(0,t.xb_1.uc().vc(),r)}function cc(n,t){var r;if(t instanceof Qu)r=Qo(t);else if(t instanceof Zu)r=Ic(Bf().rd(t.eb_1));else if(t instanceof Gu)r=Ic(t.za_1);else{var i="Unknown node type viewIt: "+t;console.error(i),r=Ff().ga(i)}return r}function ac(n){return n.t9("report-wrapper"),lr()}function hc(n){return n.t9("header"),lr()}function lc(n){return n.t9("gradle-logo"),lr()}function _c(n){return n.t9("title"),lr()}function vc(n){return n.t9("groups"),lr()}function dc(n){return n.t9("content"),lr()}function gc(n){return n.t9("group-selector__count"),lr()}function wc(n){return n.t9("learn-more"),lr()}function bc(){yn=this,document.title="Gradle Problem Report"}function pc(){return null==yn&&new bc,yn}function mc(n,t,r){return n.pe(t.zb().oe(),r)}function kc(n){Bc.call(this),this.hd_1=n}function yc(){Bc.call(this)}function qc(n,t){Bc.call(this),this.wc_1=n,this.xc_1=t}function Bc(){}function Cc(){return Vc(),qn}function xc(){return Vc(),Cn}function jc(){return Vc(),jn}function Pc(){return Vc(),Pn}function Ic(n){return Vc(),Pc().ka(n)}function Sc(n){return Vc(),Pc().ka(Bf().qd(n))}function zc(n,t){return Vc(),n.cd().ye()?Ac(n,t):function(n){return Vc(),Ff().fb(Jf(Gc),Mc(n))}(n)}function Ec(n,t,r,i){var e,u,o;return Vc(),Ff().fb(Jf((e=r,u=t,o=i,function(n){return n.t9("java-exception-part-toggle"),n.u9(function(n,t){return function(r){return new qc(n,t())}}(u,o)),n.s9("Click to "+function(n){var t;switch(Vc(),n.q8_1){case 0:t="show";break;case 1:t="hide";break;default:le()}return t}(e)),lr()})),"("+n+" internal "+gf("line",n)+" "+function(n){var t;switch(Vc(),n.q8_1){case 0:t="hidden";break;case 1:t="shown";break;default:le()}return t}(r)+")")}function Tc(n,t){t=t===A?Lf():t,Vc();for(var r=Rf(),i=Nr(xt(n,10)),e=0,u=n.f();u.g();){var o,f=e;e=f+1|0,s=u.h(),c=(c=0===wr(f)?t:Lf())===A?Lf():c,Vc(),o=Hf().ja([Mf().ga(s),c]),i.d(o)}var s,c;return r.ha(i)}function Lc(n,t,r){Vc();var i,e,u,o=Af(),f=Ac(t,n),s=Ff().ga("Exception"),c=Ff().ja([(Vc(),In).v9(r.na_1,"Copy exception to the clipboard")]),a=null==r.ma_1?null:Ff().ga(" "),h=null==a?Lf():a,l=r.ma_1,_=null==l?null:Ic(l),v=null==_?Lf():_;switch(t.cd().wb_1.q8_1){case 0:i=Lf();break;case 1:i=function(n,t){Vc();for(var r=Af(),i=Jf(Uc),e=n.oa_1,u=Nr(xt(e,10)),o=0,f=e.f();f.g();){var s,c=f.h(),a=o;o=a+1|0;var h,l=wr(a);if(null!=c.sa_1){var _,v=Ec(c.ra_1.k(),l,c.sa_1,t),d=c.sa_1;switch(null==d?-1:d.q8_1){case 0:_=Tc(Un(c.ra_1,1),v);break;case 1:_=Tc(c.ra_1,v);break;default:le()}h=_}else h=Tc(c.ra_1);s=h,u.d(s)}return r.zd(i,u)}(r,(e=n,u=t,function(){return e(new ss(u))}));break;default:le()}return o.ja([f,s,c,h,v,i])}function Nc(n,t,r,i,e,u,o){e=e===A?null:e,u=u===A?Lf():u,o=o===A?Lf():o,Vc();var f=Af(),s=zc(r,n),c=t(i),a=null==e?null:t(e);return f.ja([s,u,c,null==a?Lf():a,o])}function Ac(n,t){var r,i;return Vc(),Ff().fb(Jf((r=n,i=t,function(n){return n.gb(["invisible-text","tree-btn"]),r.cd().wb_1===ps()&&(n.t9("collapsed"),lr()),r.cd().wb_1===ms()&&(n.t9("expanded"),lr()),n.s9("Click to "+function(n){var t;switch(Vc(),n.q8_1){case 0:t="expand";break;case 1:t="collapse";break;default:le()}return t}(r.cd().wb_1)),n.u9(function(n,t){return function(r){return n(new ss(t))}}(i,r)),lr()})),Mc(n))}function Mc(n){return Vc(),function(n,t){var r;if(!(t>=0))throw fu(ie("Count 'n' must be non-negative, but was "+t+"."));switch(t){case 0:r="";break;case 1:r=ie(n);break;default:var i="";if(0!==Wi(n))for(var e=ie(n),u=t;1&~u||(i+=e),0!=(u=u>>>1|0);)e+=e;return i}return r}("    ",n.we()-1|0)+"- "}function Fc(n){return Vc(),n.gb(["invisible-text","error-icon"]),lr()}function Dc(n){return Vc(),n.gb(["invisible-text","advice-icon"]),lr()}function Oc(n){return Vc(),n.gb(["invisible-text","warning-icon"]),lr()}function Rc(n){return Vc(),n.gb(["invisible-text","enum-icon"]),lr()}function Hc(n){return Vc(),new kc(n)}function $c(n){return Vc(),new kc(n)}function Gc(n){return Vc(),n.gb(["invisible-text","leaf-icon"]),lr()}function Uc(n){return Vc(),n.t9("java-exception"),lr()}function Vc(){if(!Sn){Sn=!0;var n=Ff();qn=n.fb(Jf(Fc),"[error] ");var t=Ff();Bn=t.fb(Jf(Dc),"[advice] ");var r=Ff();Cn=r.fb(Jf(Oc),"[warn]  ");var i=Ff();xn=i.fb(Jf(Rc),"[enum]  "),jn=new Du,Pn=new Du(Hc),In=new Mu($c)}}return Ge(Yn,A,Re),Ge(tt,A,Re),Ge(rt,A,Re),Ge(Ti,"Collection",Ye),Ge(it,"AbstractCollection",Re,A,[Ti]),Ge(et,"IteratorImpl",Re),Ge(ut,"ListIteratorImpl",Re,et),Ge(ot,"Companion",Ke),Ge(Ei,"List",Ye,A,[Ti]),Ge(st,"AbstractList",Re,it,[it,Ei]),Ge(ct,A,Re),Ge(lt,"Companion",Ke),Ge(vt,A,Re,it),Ge(Ni,"Map",Ye),Ge(dt,"AbstractMap",Re,A,[Ni]),Ge(gt,"Companion",Ke),Ge(li,"RandomAccess",Ye),Ge(yt,"EmptyList",Ke,A,[Ei,li]),Ge(qt,"ArrayAsCollection",Re,A,[Ti]),Ge(Bt,"EmptyIterator",Ke),Ge(Pt,"IntIterator",Re),Ge(It,A,Re),Ge(St,"ReversedListReadOnly",Re,st),Ge(zt,A,Re),Ge(Et,"TransformingSequence",Re),Ge(Lt,A,Re),Ge(Nt,"FilteringSequence",Re),Ge(Mi,"Set",Ye,A,[Ti]),Ge(Mt,"EmptySet",Ke,A,[Mi]),Ge(Ot,"Companion",Ke),Ge(Vt,"IntProgression",Re),Ge(Ht,"IntRange",Re,Vt),Ge($t,"IntProgressionIterator",Re,Pt),Ge(Gt,"Companion",Ke),Ge(er,A,Re),Ge(ur,"DelimitedRangesSequence",Re),Ge(or,"Pair",Re),Ge(sr,"CharSequence",Ye),Ge(cr,"Comparable",Ye),Ge(ar,"Number",Re),Ge(hr,"Unit",Ke),Ge(_r,"IntCompanionObject",Ke),Ge(mr,"AbstractMutableCollection",Re,it,[it,Ti]),Ge(kr,"IteratorImpl",Re),Ge(yr,"ListIteratorImpl",Re,kr),Ge(qr,"AbstractMutableList",Re,mr,[mr,Ei,Ti]),Ge(Br,A,Re),Ge(Cr,A,Re),Ge(Li,"Entry",Ye),Ge(Ai,"MutableEntry",Ye,A,[Li]),Ge(xr,"SimpleEntry",Re,A,[Ai]),Ge(zr,"AbstractMutableSet",Re,mr,[mr,Ti,Mi]),Ge(jr,"AbstractEntrySet",Re,zr),Ge(Pr,A,Re,zr),Ge(Ir,A,Re,mr),Ge(Sr,"AbstractMutableMap",Re,dt,[dt,Ni]),Ge(Er,"Companion",Ke),Ge(Fr,"ArrayList",Re,qr,[qr,Ei,Ti,li]),Ge(Rr,"HashCode",Ke),Ge(Hr,"EntrySet",Re,jr),Ge(Vr,"HashMap",Re,Sr,[Sr,Ni]),Ge(Zr,"HashSet",Re,zr,[zr,Ti,Mi]),Ge(Xr,A,Re),Ge(ni,"InternalMap",Ye),Ge(Jr,"InternalHashCodeMap",Re,A,[ni]),Ge(ti,"EntryIterator",Re),Ge(ri,"Companion",Ke),Ge(ei,"ChainEntry",Re,xr),Ge(ui,"EntrySet",Re,jr),Ge(si,"LinkedHashMap",Re,Vr,[Vr,Ni]),Ge(ci,"Companion",Ke),Ge(hi,"LinkedHashSet",Re,Zr,[Zr,Ti,Mi]),Ge(_i,"BaseOutput",Re),Ge(vi,"NodeJsOutput",Re,_i),Ge(gi,"BufferedOutput",Re,_i),Ge(di,"BufferedOutputToConsoleLog",Re,gi),Ge(pi,"StringBuilder",Re,A,[sr]),Ge(yi,"Companion",Ke),Ge(Bi,"Regex",Re),Ge(Ii,"Companion",Ke),Ge(zi,"Char",Re,A,[cr]),Ge(Fi,"Companion",Ke),Ge(Di,"Enum",Re,A,[cr]),Ge(Hi,A,Re),Ge(ve,"Companion",Ke),Ge(de,"Long",Re,ar,[ar,cr]),Ge(iu,"Letter",Ke),Ge(uu,"OtherLowercase",Ke),Ge(du,"Exception",Re,Error),Ge(bu,"RuntimeException",Re,du),Ge(su,"IllegalArgumentException",Re,bu),Ge(au,"IndexOutOfBoundsException",Re,bu),Ge(lu,"IllegalStateException",Re,bu),Ge(ku,"NoSuchElementException",Re,bu),Ge(qu,"ArithmeticException",Re,bu),Ge(xu,"UnsupportedOperationException",Re,bu),Ge(Pu,"NullPointerException",Re,bu),Ge(Su,"NoWhenBranchMatchedException",Re,bu),Ge(Eu,"ClassCastException",Re,bu),Ge(Lu,"UninitializedPropertyAccessException",Re,bu),Ge(Au,"Model",Re),Ge(Mu,"CopyButtonComponent",Re),Ge(Du,"PrettyTextComponent",Re),Ge(Yu,"ProblemNode",Re),Ge(Ou,"Exception",Re,Yu),Ge(Ru,"StackTracePart",Re),Ge(Hu,"Error",Re,Yu),Ge($u,"Warning",Re,Yu),Ge(Gu,"Message",Re,Yu),Ge(Uu,"ListElement",Re,Yu),Ge(Vu,"TreeNode",Re,Yu),Ge(Qu,"Link",Re,Yu),Ge(Zu,"Label",Re,Yu),Ge(io,"Info",Re,Yu),Ge(eo,"Project",Re,Yu),Ge(uo,"Task",Re,Yu),Ge(oo,"TaskPath",Re,Yu),Ge(fo,"Bean",Re,Yu),Ge(so,"SystemProperty",Re,Yu),Ge(co,"Property",Re,Yu),Ge(ao,"BuildLogic",Re,Yu),Ge(ho,"BuildLogicClass",Re,Yu),Ge(Bc,"BaseIntent",Re),Ge(yc,"TreeIntent",Re,Bc),Ge(vo,"TaskTreeIntent",Re,yc),Ge(go,"MessageTreeIntent",Re,yc),Ge(wo,"InputTreeIntent",Re,yc),Ge(bo,"IncompatibleTaskTreeIntent",Re,yc),Ge(yo,"Intent",Re,Bc),Ge(po,"SetTab",Re,yo),Ge(mo,"Model",Re),Ge(ko,"Tab",Re,Di),Ge(Uo,"ConfigurationCacheReportPage",Ke),Ge(Zo,"ImportedProblem",Re),Ge(Yo,"ImportedDiagnostics",Re),Ge(ff,"sam$kotlin_Comparator$0",Re),Ge(bf,"LearnMore",Re),Ge(kf,"Fragment",Re),Ge(pf,"Text",Re,kf),Ge(mf,"Reference",Re,kf),Ge(yf,"Builder",Re),Ge(qf,"Companion",Ke),Ge(Cf,"PrettyText",Re),Ge(xf,"Companion",Ke),Ge(Sf,"Trie",Re),Ge(Uf,"ViewFactory",Re),Ge(Vf,"Companion",Ke),Ge(Xf,"View",Re),Ge(Zf,"Empty",Ke,Xf),Ge(Wf,"Element",Re,Xf),Ge(Kf,"MappedView",Re,Xf),Ge(ns,"Attributes",Re),Ge(es,"Attribute",Re),Ge(ts,"OnEvent",Re,es),Ge(rs,"ClassName",Re,es),Ge(is,"Named",Re,es),Ge(as,"Intent",Re),Ge(ss,"Toggle",Re,as),Ge(cs,"Model",Re),Ge(ls,"TreeView",Ke),Ge(bs,"Focus",Re),Ge(ds,"Original",Re,bs),Ge(gs,"Child",Re,bs),Ge(ws,"ViewState",Re,Di),Ge(ks,"Tree",Re),Ge(Bs,"Tab",Re,Di),Ge(Cs,"ProblemIdElement",Re),Ge(xs,"ProblemSummary",Re),Ge(Is,"ProblemNodeGroup",Re),Ge(Zs,"ProblemApiNode",Re,Yu),Ge(Us,"Text",Re,Zs),Ge(Vs,"ProblemIdNode",Re,Zs),Ge(Qs,"Advice",Re,Yu),Ge(Ys,"MessageTreeIntent",Re,yc),Ge(Ws,"ProblemIdTreeIntent",Re,yc),Ge(Ks,"FileLocationTreeIntent",Re,yc),Ge(nc,"Intent",Re,Bc),Ge(Xs,"SetTab",Re,nc),Ge(Js,"Model",Re),Ge(bc,"ProblemsReportPage",Ke),Ge(kc,"Copy",Re,Bc),Ge(qc,"ToggleStackTracePart",Re,Bc),se(Yn).f=function(){return this.n_1.f()},se(tt).f=function(){return this.r_1.f()},se(rt).f=function(){var n,t,r=function(n,t){for(var r=n.f();r.g();){var i=r.h();t.d(i)}return t}(this.s_1,Lr());return n=r,t=this.t_1,function(n,t){if(n.k()<=1)return lr();var r=br(n);!function(n,t){if(function(){if(null!=l)return l;l=!1;var n=[],t=0;if(t<600)do{var r=t;t=t+1|0,n.push(r)}while(t<600);var i=Or;n.sort(i);var e=1,u=n.length;if(e<u)do{var o=e;e=e+1|0;var f=n[o-1|0],s=n[o];if((3&f)==(3&s)&&f>=s)return!1}while(e<u);return l=!0,!0}()){var r=(i=t,function(n,t){return i.compare(n,t)});n.sort(r)}else!function(n,t,r,i){var e=n.length,u=function(n){var t=0,r=n.length-1|0;if(t<=r)do{var i=t;t=t+1|0,n[i]=null}while(i!==r);return n}(Array(e)),o=Dr(n,u,0,r,i);if(o!==n){var f=0;if(f<=r)do{var s=f;f=f+1|0,n[s]=o[s]}while(s!==r)}}(n,0,Nn(n),t);var i}(r,t);var i=0,e=r.length;if(i<e)do{var u=i;i=i+1|0,n.f4(u,r[u])}while(i<e)}(n,t),r.f()},se(it).u=function(n){var t;n:if(Ue(this,Ti)&&this.i())t=!1;else{for(var r=this.f();r.g();)if(oe(r.h(),n)){t=!0;break n}t=!1}return t},se(it).v=function(n){var t;n:if(Ue(n,Ti)&&n.i())t=!0;else{for(var r=n.f();r.g();){var i=r.h();if(!this.u(i)){t=!1;break n}}t=!0}return t},se(it).i=function(){return 0===this.k()},se(it).toString=function(){return Mn(this,", ","[","]",A,A,(n=this,function(t){return t===n?"(this Collection)":Oi(t)}));var n},se(it).toArray=function(){return dr(this)},se(et).g=function(){return this.w_1<this.x_1.k()},se(et).h=function(){if(!this.g())throw pu();var n=this.w_1;return this.w_1=n+1|0,this.x_1.j(n)},se(ut).c1=function(){return this.w_1>0},se(ut).d1=function(){if(!this.c1())throw pu();return this.w_1=this.w_1-1|0,this.a1_1.j(this.w_1)},se(ot).e1=function(n,t){if(n<0||n>=t)throw cu("index: "+n+", size: "+t)},se(ot).b1=function(n,t){if(n<0||n>t)throw cu("index: "+n+", size: "+t)},se(ot).f1=function(n){for(var t=1,r=n.f();r.g();){var i=r.h(),e=zn(31,t),u=null==i?null:ee(i);t=e+(null==u?0:u)|0}return t},se(ot).g1=function(n,t){if(n.k()!==t.k())return!1;for(var r=t.f(),i=n.f();i.g();)if(!oe(i.h(),r.h()))return!1;return!0},se(st).f=function(){return new et(this)},se(st).l=function(n){return new ut(this,n)},se(st).equals=function(n){return n===this||!(null==n||!Ue(n,Ei))&&ft().g1(this,n)},se(st).hashCode=function(){return ft().f1(this)},se(ct).g=function(){return this.h1_1.g()},se(ct).h=function(){return this.h1_1.h().i1()},se(lt).k1=function(n){var t=n.j1(),r=null==t?null:ee(t),i=null==r?0:r,e=n.i1(),u=null==e?null:ee(e);return i^(null==u?0:u)},se(lt).l1=function(n){return Oi(n.j1())+"="+Oi(n.i1())},se(lt).m1=function(n,t){return!(null==t||!Ue(t,Li))&&!!oe(n.j1(),t.j1())&&oe(n.i1(),t.i1())},se(vt).r1=function(n){return this.q1_1.s1(n)},se(vt).u=function(n){return!(null!=n&&!Qe(n))&&this.r1(null==n||Qe(n)?n:_e())},se(vt).f=function(){return new ct(this.q1_1.o().f())},se(vt).k=function(){return this.q1_1.k()},se(dt).t1=function(n){return!(null==ht(this,n))},se(dt).s1=function(n){var t;n:{var r=this.o();if(Ue(r,Ti)&&r.i())t=!1;else{for(var i=r.f();i.g();)if(oe(i.h().i1(),n)){t=!0;break n}t=!1}}return t},se(dt).u1=function(n){if(null==n||!Ue(n,Li))return!1;var t=n.j1(),r=n.i1(),i=(Ue(this,Ni)?this:_e()).v1(t);return!(!oe(r,i)||null==i&&!(Ue(this,Ni)?this:_e()).t1(t))},se(dt).equals=function(n){if(n===this)return!0;if(null==n||!Ue(n,Ni))return!1;if(this.k()!==n.k())return!1;var t;n:{var r=n.o();if(Ue(r,Ti)&&r.i())t=!0;else{for(var i=r.f();i.g();){var e=i.h();if(!this.u1(e)){t=!1;break n}}t=!0}}return t},se(dt).v1=function(n){var t=ht(this,n);return null==t?null:t.i1()},se(dt).hashCode=function(){return ee(this.o())},se(dt).i=function(){return 0===this.k()},se(dt).k=function(){return this.o().k()},se(dt).toString=function(){var n;return Mn(this.o(),", ","{","}",A,A,(n=this,function(t){return n.p1(t)}))},se(dt).p1=function(n){return at(this,n.j1())+"="+at(this,n.i1())},se(dt).w1=function(){return null==this.o1_1&&(this.o1_1=new vt(this)),he(this.o1_1)},se(gt).x1=function(n){for(var t=0,r=n.f();r.g();){var i=r.h(),e=t,u=null==i?null:ee(i);t=e+(null==u?0:u)|0}return t},se(gt).y1=function(n,t){return n.k()===t.k()&&n.v(t)},se(yt).equals=function(n){return!(null==n||!Ue(n,Ei))&&n.i()},se(yt).hashCode=function(){return 1},se(yt).toString=function(){return"[]"},se(yt).k=function(){return 0},se(yt).i=function(){return!0},se(yt).a2=function(n){return n.i()},se(yt).v=function(n){return this.a2(n)},se(yt).j=function(n){throw cu("Empty list doesn't contain element at index "+n+".")},se(yt).f=function(){return Ct()},se(yt).l=function(n){if(0!==n)throw cu("Index: "+n);return Ct()},se(qt).k=function(){return this.b2_1.length},se(qt).i=function(){return 0===this.b2_1.length},se(qt).d2=function(n){return function(n,t){return An(n,t)>=0}(this.b2_1,n)},se(qt).e2=function(n){var t;n:if(Ue(n,Ti)&&n.i())t=!0;else{for(var r=n.f();r.g();){var i=r.h();if(!this.d2(i)){t=!1;break n}}t=!0}return t},se(qt).v=function(n){return this.e2(n)},se(qt).f=function(){return Ri(this.b2_1)},se(Bt).g=function(){return!1},se(Bt).c1=function(){return!1},se(Bt).h=function(){throw pu()},se(Bt).d1=function(){throw pu()},se(Pt).h=function(){return this.f2()},se(It).g=function(){return this.g2_1.c1()},se(It).c1=function(){return this.g2_1.g()},se(It).h=function(){return this.g2_1.d1()},se(It).d1=function(){return this.g2_1.h()},se(St).k=function(){return this.i2_1.k()},se(St).j=function(n){return this.i2_1.j(function(n,t){if(!(0<=t&&t<=kt(n)))throw cu("Element index "+t+" must be in range ["+Oe(0,kt(n))+"].");return kt(n)-t|0}(this,n))},se(St).f=function(){return this.l(0)},se(St).l=function(n){return new It(this,n)},se(zt).h=function(){return this.k2_1.m2_1(this.j2_1.h())},se(zt).g=function(){return this.j2_1.g()},se(Et).f=function(){return new zt(this)},se(Lt).h=function(){if(-1===this.o2_1&&Tt(this),0===this.o2_1)throw pu();var n=this.p2_1;return this.p2_1=null,this.o2_1=-1,null==n||Qe(n)?n:_e()},se(Lt).g=function(){return-1===this.o2_1&&Tt(this),1===this.o2_1},se(Nt).f=function(){return new Lt(this)},se(Mt).equals=function(n){return!(null==n||!Ue(n,Mi))&&n.i()},se(Mt).hashCode=function(){return 0},se(Mt).toString=function(){return"[]"},se(Mt).k=function(){return 0},se(Mt).i=function(){return!0},se(Mt).a2=function(n){return n.i()},se(Mt).v=function(n){return this.a2(n)},se(Mt).f=function(){return Ct()},se(Ht).y2=function(){return this.z2_1},se(Ht).c3=function(){return this.a3_1},se(Ht).i=function(){return this.z2_1>this.a3_1},se(Ht).equals=function(n){return n instanceof Ht&&(!(!this.i()||!n.i())||this.z2_1===n.z2_1&&this.a3_1===n.a3_1)},se(Ht).hashCode=function(){return this.i()?-1:zn(31,this.z2_1)+this.a3_1|0},se(Ht).toString=function(){return this.z2_1+".."+this.a3_1},se($t).g=function(){return this.f3_1},se($t).f2=function(){var n=this.g3_1;if(n===this.e3_1){if(!this.f3_1)throw pu();this.f3_1=!1}else this.g3_1=this.g3_1+this.d3_1|0;return n},se(Gt).q=function(n,t,r){return new Vt(n,t,r)},se(Vt).f=function(){return new $t(this.z2_1,this.a3_1,this.b3_1)},se(Vt).i=function(){return this.b3_1>0?this.z2_1>this.a3_1:this.z2_1<this.a3_1},se(Vt).equals=function(n){return n instanceof Vt&&(!(!this.i()||!n.i())||this.z2_1===n.z2_1&&this.a3_1===n.a3_1&&this.b3_1===n.b3_1)},se(Vt).hashCode=function(){return this.i()?-1:zn(31,zn(31,this.z2_1)+this.a3_1|0)+this.b3_1|0},se(Vt).toString=function(){return this.b3_1>0?this.z2_1+".."+this.a3_1+" step "+this.b3_1:this.z2_1+" downTo "+this.a3_1+" step "+(0|-this.b3_1)},se(er).h=function(){if(-1===this.j3_1&&ir(this),0===this.j3_1)throw pu();var n=this.m3_1,t=n instanceof Ht?n:_e();return this.m3_1=null,this.j3_1=-1,t},se(er).g=function(){return-1===this.j3_1&&ir(this),1===this.j3_1},se(ur).f=function(){return new er(this)},se(or).toString=function(){return"("+this.t3_1+", "+this.u3_1+")"},se(or).v3=function(){return this.t3_1},se(or).w3=function(){return this.u3_1},se(or).hashCode=function(){var n=null==this.t3_1?0:ee(this.t3_1);return zn(n,31)+(null==this.u3_1?0:ee(this.u3_1))|0},se(or).equals=function(n){if(this===n)return!0;if(!(n instanceof or))return!1;var t=n instanceof or?n:_e();return!!oe(this.t3_1,t.t3_1)&&!!oe(this.u3_1,t.u3_1)},se(hr).toString=function(){return"kotlin.Unit"},se(_r).b4=function(){return this.MIN_VALUE},se(_r).c4=function(){return this.MAX_VALUE},se(_r).d4=function(){return this.SIZE_BYTES},se(_r).e4=function(){return this.SIZE_BITS},se(mr).m=function(n){this.g4();for(var t=!1,r=n.f();r.g();){var i=r.h();this.d(i)&&(t=!0)}return t},se(mr).toJSON=function(){return this.toArray()},se(mr).g4=function(){},se(kr).g=function(){return this.h4_1<this.j4_1.k()},se(kr).h=function(){if(!this.g())throw pu();var n=this.h4_1;return this.h4_1=n+1|0,this.i4_1=n,this.j4_1.j(this.i4_1)},se(yr).c1=function(){return this.h4_1>0},se(yr).d1=function(){if(!this.c1())throw pu();return this.h4_1=this.h4_1-1|0,this.i4_1=this.h4_1,this.n4_1.j(this.i4_1)},se(qr).d=function(n){return this.g4(),this.p4(this.k(),n),!0},se(qr).f=function(){return new kr(this)},se(qr).u=function(n){return this.q4(n)>=0},se(qr).q4=function(n){var t=0,r=kt(this);if(t<=r)do{var i=t;if(t=t+1|0,oe(this.j(i),n))return i}while(i!==r);return-1},se(qr).l=function(n){return new yr(this,n)},se(qr).equals=function(n){return n===this||!(null==n||!Ue(n,Ei))&&ft().g1(this,n)},se(qr).hashCode=function(){return ft().f1(this)},se(Br).g=function(){return this.r4_1.g()},se(Br).h=function(){return this.r4_1.h().j1()},se(Cr).g=function(){return this.s4_1.g()},se(Cr).h=function(){return this.s4_1.h().i1()},se(xr).j1=function(){return this.t4_1},se(xr).i1=function(){return this.u4_1},se(xr).v4=function(n){var t=this.u4_1;return this.u4_1=n,t},se(xr).hashCode=function(){return _t().k1(this)},se(xr).toString=function(){return _t().l1(this)},se(xr).equals=function(n){return _t().m1(this,n)},se(jr).u=function(n){return this.w4(n)},se(Pr).y4=function(n){throw Cu("Add is not supported on keys")},se(Pr).d=function(n){return this.y4(null==n||Qe(n)?n:_e())},se(Pr).z4=function(n){return this.x4_1.t1(n)},se(Pr).u=function(n){return!(null!=n&&!Qe(n))&&this.z4(null==n||Qe(n)?n:_e())},se(Pr).f=function(){return new Br(this.x4_1.o().f())},se(Pr).k=function(){return this.x4_1.k()},se(Pr).g4=function(){return this.x4_1.g4()},se(Ir).f5=function(n){throw Cu("Add is not supported on values")},se(Ir).d=function(n){return this.f5(null==n||Qe(n)?n:_e())},se(Ir).r1=function(n){return this.e5_1.s1(n)},se(Ir).u=function(n){return!(null!=n&&!Qe(n))&&this.r1(null==n||Qe(n)?n:_e())},se(Ir).f=function(){return new Cr(this.e5_1.o().f())},se(Ir).k=function(){return this.e5_1.k()},se(Ir).g4=function(){return this.e5_1.g4()},se(Sr).g5=function(){return null==this.c5_1&&(this.c5_1=new Pr(this)),he(this.c5_1)},se(Sr).w1=function(){return null==this.d5_1&&(this.d5_1=new Ir(this)),he(this.d5_1)},se(Sr).g4=function(){},se(zr).equals=function(n){return n===this||!(null==n||!Ue(n,Mi))&&wt().y1(this,n)},se(zr).hashCode=function(){return wt().x1(this)},se(Fr).j5=function(){return this.g4(),this.c_1=!0,this.k()>0?this:Tr().i5_1},se(Fr).k=function(){return this.b_1.length},se(Fr).j=function(n){var t=this.b_1[Mr(this,n)];return null==t||Qe(t)?t:_e()},se(Fr).f4=function(n,t){this.g4(),Mr(this,n);var r=this.b_1[n];this.b_1[n]=t;var i=r;return null==i||Qe(i)?i:_e()},se(Fr).d=function(n){return this.g4(),this.b_1.push(n),this.o4_1=this.o4_1+1|0,!0},se(Fr).p4=function(n,t){this.g4(),this.b_1.splice(function(n,t){return ft().b1(t,n.k()),t}(this,n),0,t),this.o4_1=this.o4_1+1|0},se(Fr).m=function(n){if(this.g4(),n.i())return!1;for(var t,r,i,e=(t=this,r=n.k(),i=t.k(),t.b_1.length=t.k()+r|0,i),u=0,o=n.f();o.g();){var f=o.h(),s=u;u=s+1|0;var c=wr(s);this.b_1[e+c|0]=f}return this.o4_1=this.o4_1+1|0,!0},se(Fr).q4=function(n){return An(this.b_1,n)},se(Fr).toString=function(){return Ln(this.b_1,", ","[","]",A,A,Xi)},se(Fr).k5=function(){return[].slice.call(this.b_1)},se(Fr).toArray=function(){return this.k5()},se(Fr).g4=function(){if(this.c_1)throw Bu()},se(Rr).l5=function(n,t){return oe(n,t)},se(Rr).m5=function(n){var t=null==n?null:ee(n);return null==t?0:t},se(Hr).o5=function(n){throw Cu("Add is not supported on entries")},se(Hr).d=function(n){return this.o5(null!=n&&Ue(n,Ai)?n:_e())},se(Hr).w4=function(n){return this.n5_1.u1(n)},se(Hr).f=function(){return this.n5_1.t5_1.f()},se(Hr).k=function(){return this.n5_1.k()},se(Vr).t1=function(n){return this.t5_1.z4(n)},se(Vr).s1=function(n){var t;n:{var r=this.t5_1;if(Ue(r,Ti)&&r.i())t=!1;else{for(var i=r.f();i.g();){var e=i.h();if(this.u5_1.l5(e.i1(),n)){t=!0;break n}}t=!1}}return t},se(Vr).o=function(){return null==this.v5_1&&(this.v5_1=this.x5()),he(this.v5_1)},se(Vr).x5=function(){return new Hr(this)},se(Vr).v1=function(n){return this.t5_1.v1(n)},se(Vr).h5=function(n,t){return this.t5_1.h5(n,t)},se(Vr).k=function(){return this.t5_1.k()},se(Zr).d=function(n){return null==this.y5_1.h5(n,this)},se(Zr).u=function(n){return this.y5_1.t1(n)},se(Zr).i=function(){return this.y5_1.i()},se(Zr).f=function(){return this.y5_1.g5().f()},se(Zr).k=function(){return this.y5_1.k()},se(Xr).g=function(){return-1===this.z5_1&&(this.z5_1=function(n){if(null!=n.c6_1&&n.d6_1){var t=n.c6_1.length;if(n.e6_1=n.e6_1+1|0,n.e6_1<t)return 0}if(n.b6_1=n.b6_1+1|0,n.b6_1<n.a6_1.length){n.c6_1=n.g6_1.i6_1[n.a6_1[n.b6_1]];var r=n,i=n.c6_1;return r.d6_1=null!=i&&Ve(i),n.e6_1=0,0}return n.c6_1=null,1}(this)),0===this.z5_1},se(Xr).h=function(){if(!this.g())throw pu();var n=this.d6_1?this.c6_1[this.e6_1]:this.c6_1;return this.f6_1=n,this.z5_1=-1,n},se(Jr).w5=function(){return this.h6_1},se(Jr).k=function(){return this.j6_1},se(Jr).h5=function(n,t){var r=this.h6_1.m5(n),i=Kr(this,r);if(null==i)this.i6_1[r]=new xr(n,t);else{if(null==i||!Ve(i)){var e,u=i;return this.h6_1.l5(u.j1(),n)?u.v4(t):(e=[u,new xr(n,t)],this.i6_1[r]=e,this.j6_1=this.j6_1+1|0,null)}var o=i,f=Wr(o,this,n);if(null!=f)return f.v4(t);o.push(new xr(n,t))}return this.j6_1=this.j6_1+1|0,null},se(Jr).z4=function(n){return!(null==Yr(this,n))},se(Jr).v1=function(n){var t=Yr(this,n);return null==t?null:t.i1()},se(Jr).f=function(){return new Xr(this)},se(ti).g=function(){return!(null===this.m6_1)},se(ti).h=function(){if(!this.g())throw pu();var n=he(this.m6_1);this.l6_1=n;var t,r=n.b7_1;return t=r!==this.n6_1.y6_1.v6_1?r:null,this.m6_1=t,n},se(ei).v4=function(n){return this.d7_1.g4(),se(xr).v4.call(this,n)},se(ui).o5=function(n){throw Cu("Add is not supported on entries")},se(ui).d=function(n){return this.o5(null!=n&&Ue(n,Ai)?n:_e())},se(ui).w4=function(n){return this.y6_1.u1(n)},se(ui).f=function(){return new ti(this)},se(ui).k=function(){return this.y6_1.k()},se(ui).g4=function(){return this.y6_1.g4()},se(si).j5=function(){var n;if(this.g4(),this.x6_1=!0,this.k()>0)n=this;else{var t=ii().e7_1;n=Ue(t,Ni)?t:_e()}return n},se(si).t1=function(n){return this.w6_1.t1(n)},se(si).s1=function(n){var t=this.v6_1;if(null==t)return!1;var r=t;do{if(oe(r.i1(),n))return!0;r=he(r.b7_1)}while(r!==this.v6_1);return!1},se(si).x5=function(){return new ui(this)},se(si).v1=function(n){var t=this.w6_1.v1(n);return null==t?null:t.i1()},se(si).h5=function(n,t){this.g4();var r=this.w6_1.v1(n);if(null==r){var i=new ei(this,n,t);return this.w6_1.h5(n,i),function(n,t){if(null!=n.b7_1||null!=n.c7_1)throw hu(ie("Check failed."));var r=t.v6_1;if(null==r)t.v6_1=n,n.b7_1=n,n.c7_1=n;else{var i=r.c7_1;if(null==i)throw hu(ie("Required value was null."));var e=i;n.c7_1=e,n.b7_1=r,r.c7_1=n,e.b7_1=n}}(i,this),null}return r.v4(t)},se(si).k=function(){return this.w6_1.k()},se(si).g4=function(){if(this.x6_1)throw Bu()},se(hi).g4=function(){return this.y5_1.g4()},se(_i).h7=function(){this.i7("\n")},se(_i).j7=function(n){this.i7(n),this.h7()},se(vi).i7=function(n){var t=String(n);this.k7_1.write(t)},se(di).i7=function(n){var t=String(n),r=t.lastIndexOf("\n",0);if(r>=0){var i=this.m7_1;this.m7_1=i+t.substring(0,r),this.n7();var e=r+1|0;t=t.substring(e)}this.m7_1=this.m7_1+t},se(di).n7=function(){console.log(this.m7_1),this.m7_1=""},se(gi).i7=function(n){var t=this.m7_1;this.m7_1=t+String(n)},se(pi).x3=function(){return this.o7_1.length},se(pi).y3=function(n){var t=this.o7_1;if(!(n>=0&&n<=Yt(t)))throw cu("index: "+n+", length: "+this.x3()+"}");return Zi(t,n)},se(pi).z3=function(n,t){return this.o7_1.substring(n,t)},se(pi).i3=function(n){return this.o7_1=this.o7_1+new zi(n),this},se(pi).e=function(n){return this.o7_1=this.o7_1+Oi(n),this},se(pi).p7=function(n){var t=this.o7_1;return this.o7_1=t+(null==n?"null":n),this},se(pi).toString=function(){return this.o7_1},se(yi).t7=function(n){var t=this.q7_1;return n.replace(t,"\\$&")},se(yi).u7=function(n){var t=this.s7_1;return n.replace(t,"$$$$")},se(Bi).a8=function(n){this.x7_1.lastIndex=0;var t=this.x7_1.exec(ie(n));return null!=t&&0===t.index&&this.x7_1.lastIndex===Wi(n)},se(Bi).toString=function(){return this.x7_1.toString()},se(zi).o8=function(n){return ji(this.h3_1,n)},se(zi).a4=function(n){return function(n,t){return ji(n.h3_1,t instanceof zi?t.h3_1:_e())}(this,n)},se(zi).equals=function(n){return function(n,t){return t instanceof zi&&n===t.h3_1}(this.h3_1,n)},se(zi).hashCode=function(){return this.h3_1},se(zi).toString=function(){return Pi(this.h3_1)},se(Di).r8=function(n){return Ji(this.q8_1,n.q8_1)},se(Di).a4=function(n){return this.r8(n instanceof Di?n:_e())},se(Di).equals=function(n){return this===n},se(Di).hashCode=function(){return re(this)},se(Di).toString=function(){return this.p8_1},se(Hi).g=function(){return!(this.s8_1===this.t8_1.length)},se(Hi).h=function(){if(this.s8_1===this.t8_1.length)throw mu(""+this.s8_1);var n=this.s8_1;return this.s8_1=n+1|0,this.t8_1[n]},se(de).b9=function(n){return ke(this,n)},se(de).a4=function(n){return this.b9(n instanceof de?n:_e())},se(de).c9=function(n){return ye(this,n)},se(de).d9=function(n){return function(n,t){if(Me(),Se(t))throw vu("division by zero");if(Se(n))return ge();if(xe(n,pe())){if(xe(t,we())||xe(t,be()))return pe();if(xe(t,pe()))return we();var r=function(n){Me();return new de(n.u8_1>>>1|n.v8_1<<31,n.v8_1>>1)}(n),i=function(n){Me();return new de(n.u8_1<<1,n.v8_1<<1|n.u8_1>>>31)}(r.d9(t));return xe(i,ge())?Ie(t)?we():be():ye(i,qe(n,Be(t,i)).d9(t))}if(xe(t,pe()))return ge();if(Ie(n))return Ie(t)?Ee(n).d9(Ee(t)):Ee(Ee(n).d9(t));if(Ie(t))return Ee(n.d9(Ee(t)));for(var e=ge(),u=n;Ae(u,t);){for(var o=Ce(u)/Ce(t),f=Math.max(1,Math.floor(o)),s=Math.ceil(Math.log(f)/Math.LN2),c=s<=48?1:Math.pow(2,s-48),a=Le(f),h=Be(a,t);Ie(h)||Ne(h,u);)h=Be(a=Le(f-=c),t);Se(a)&&(a=we()),e=ye(e,a),u=qe(u,h)}return e}(this,n)},se(de).e9=function(){return this.f9().c9(new de(1,0))},se(de).f9=function(){return new de(~this.u8_1,~this.v8_1)},se(de).g9=function(){return this.u8_1},se(de).w8=function(){return Ce(this)},se(de).valueOf=function(){return this.w8()},se(de).equals=function(n){return n instanceof de&&xe(this,n)},se(de).hashCode=function(){return Me(),this.u8_1^this.v8_1},se(de).toString=function(){return je(this,10)},se(Au).toString=function(){return"Model(text="+this.o9_1+", tooltip="+this.p9_1+")"},se(Au).hashCode=function(){var n=ue(this.o9_1);return zn(n,31)+ue(this.p9_1)|0},se(Au).equals=function(n){if(this===n)return!0;if(!(n instanceof Au))return!1;var t=n instanceof Au?n:_e();return this.o9_1===t.o9_1&&this.p9_1===t.p9_1},se(Mu).v9=function(n,t){return this.w9(new Au(n,t))},se(Mu).w9=function(n){var t,r;return Df().y9(Jf((t=n,r=this,function(n){return n.s9(t.p9_1),n.t9("copy-button"),n.u9(function(n,t){return function(r){return n.q9_1(t.o9_1)}}(r,t)),lr()})),[])},se(Mu).z9=function(n){return this.w9(n instanceof Au?n:_e())},se(Mu).aa=function(n,t){return t},se(Mu).ba=function(n,t){var r=null==n||Qe(n)?n:_e();return this.aa(r,t instanceof Au?t:_e())},se(Du).ka=function(n){return function(n,t){for(var r=Ff(),i=t.ca_1,e=Nr(xt(i,10)),u=i.f();u.g();){var o,f,s=u.h();s instanceof pf?f=Ff().ga(s.fa_1):s instanceof mf?f=Fu(n,s.da_1,s.ea_1):le(),o=f,e.d(o)}return r.ha(e)}(this,n)},se(Du).z9=function(n){return this.ka(n instanceof Cf?n:_e())},se(Du).la=function(n,t){return t},se(Du).ba=function(n,t){var r=null==n||Qe(n)?n:_e();return this.la(r,t instanceof Cf?t:_e())},se(Ou).pa=function(n,t,r){return new Ou(n,t,r)},se(Ou).qa=function(n,t,r,i){return n=n===A?this.ma_1:n,t=t===A?this.na_1:t,r=r===A?this.oa_1:r,i===A?this.pa(n,t,r):i.pa.call(this,n,t,r)},se(Ou).toString=function(){return"Exception(summary="+this.ma_1+", fullText="+this.na_1+", parts="+this.oa_1+")"},se(Ou).hashCode=function(){var n=null==this.ma_1?0:this.ma_1.hashCode();return n=zn(n,31)+ue(this.na_1)|0,zn(n,31)+ee(this.oa_1)|0},se(Ou).equals=function(n){if(this===n)return!0;if(!(n instanceof Ou))return!1;var t=n instanceof Ou?n:_e();return!!oe(this.ma_1,t.ma_1)&&this.na_1===t.na_1&&!!oe(this.oa_1,t.oa_1)},se(Ru).ta=function(n,t){return new Ru(n,t)},se(Ru).ua=function(n,t,r){return n=n===A?this.ra_1:n,t=t===A?this.sa_1:t,r===A?this.ta(n,t):r.ta.call(this,n,t)},se(Ru).toString=function(){return"StackTracePart(lines="+this.ra_1+", state="+this.sa_1+")"},se(Ru).hashCode=function(){var n=ee(this.ra_1);return zn(n,31)+(null==this.sa_1?0:this.sa_1.hashCode())|0},se(Ru).equals=function(n){if(this===n)return!0;if(!(n instanceof Ru))return!1;var t=n instanceof Ru?n:_e();return!!oe(this.ra_1,t.ra_1)&&!!oe(this.sa_1,t.sa_1)},se(Hu).toString=function(){return"Error(label="+this.va_1+", docLink="+this.wa_1+")"},se(Hu).hashCode=function(){var n=ee(this.va_1);return zn(n,31)+(null==this.wa_1?0:ee(this.wa_1))|0},se(Hu).equals=function(n){if(this===n)return!0;if(!(n instanceof Hu))return!1;var t=n instanceof Hu?n:_e();return!!oe(this.va_1,t.va_1)&&!!oe(this.wa_1,t.wa_1)},se($u).toString=function(){return"Warning(label="+this.xa_1+", docLink="+this.ya_1+")"},se($u).hashCode=function(){var n=ee(this.xa_1);return zn(n,31)+(null==this.ya_1?0:ee(this.ya_1))|0},se($u).equals=function(n){if(this===n)return!0;if(!(n instanceof $u))return!1;var t=n instanceof $u?n:_e();return!!oe(this.xa_1,t.xa_1)&&!!oe(this.ya_1,t.ya_1)},se(Gu).toString=function(){return"Message(prettyText="+this.za_1+")"},se(Gu).hashCode=function(){return this.za_1.hashCode()},se(Gu).equals=function(n){if(this===n)return!0;if(!(n instanceof Gu))return!1;var t=n instanceof Gu?n:_e();return!!this.za_1.equals(t.za_1)},se(Uu).toString=function(){return"ListElement(prettyText="+this.ab_1+")"},se(Uu).hashCode=function(){return this.ab_1.hashCode()},se(Uu).equals=function(n){if(this===n)return!0;if(!(n instanceof Uu))return!1;var t=n instanceof Uu?n:_e();return!!this.ab_1.equals(t.ab_1)},se(Vu).toString=function(){return"TreeNode(prettyText="+this.bb_1+")"},se(Vu).hashCode=function(){return this.bb_1.hashCode()},se(Vu).equals=function(n){if(this===n)return!0;if(!(n instanceof Vu))return!1;var t=n instanceof Vu?n:_e();return!!this.bb_1.equals(t.bb_1)},se(Qu).toString=function(){return"Link(href="+this.cb_1+", label="+this.db_1+")"},se(Qu).hashCode=function(){var n=ue(this.cb_1);return zn(n,31)+ue(this.db_1)|0},se(Qu).equals=function(n){if(this===n)return!0;if(!(n instanceof Qu))return!1;var t=n instanceof Qu?n:_e();return this.cb_1===t.cb_1&&this.db_1===t.db_1},se(Zu).toString=function(){return"Label(text="+this.eb_1+")"},se(Zu).hashCode=function(){return ue(this.eb_1)},se(Zu).equals=function(n){if(this===n)return!0;if(!(n instanceof Zu))return!1;var t=n instanceof Zu?n:_e();return this.eb_1===t.eb_1},se(io).toString=function(){return"Info(label="+this.hb_1+", docLink="+this.ib_1+")"},se(io).hashCode=function(){var n=ee(this.hb_1);return zn(n,31)+(null==this.ib_1?0:ee(this.ib_1))|0},se(io).equals=function(n){if(this===n)return!0;if(!(n instanceof io))return!1;var t=n instanceof io?n:_e();return!!oe(this.hb_1,t.hb_1)&&!!oe(this.ib_1,t.ib_1)},se(eo).toString=function(){return"Project(path="+this.jb_1+")"},se(eo).hashCode=function(){return ue(this.jb_1)},se(eo).equals=function(n){if(this===n)return!0;if(!(n instanceof eo))return!1;var t=n instanceof eo?n:_e();return this.jb_1===t.jb_1},se(uo).toString=function(){return"Task(path="+this.kb_1+", type="+this.lb_1+")"},se(uo).hashCode=function(){var n=ue(this.kb_1);return zn(n,31)+ue(this.lb_1)|0},se(uo).equals=function(n){if(this===n)return!0;if(!(n instanceof uo))return!1;var t=n instanceof uo?n:_e();return this.kb_1===t.kb_1&&this.lb_1===t.lb_1},se(oo).toString=function(){return"TaskPath(path="+this.mb_1+")"},se(oo).hashCode=function(){return ue(this.mb_1)},se(oo).equals=function(n){if(this===n)return!0;if(!(n instanceof oo))return!1;var t=n instanceof oo?n:_e();return this.mb_1===t.mb_1},se(fo).toString=function(){return"Bean(type="+this.nb_1+")"},se(fo).hashCode=function(){return ue(this.nb_1)},se(fo).equals=function(n){if(this===n)return!0;if(!(n instanceof fo))return!1;var t=n instanceof fo?n:_e();return this.nb_1===t.nb_1},se(so).toString=function(){return"SystemProperty(name="+this.ob_1+")"},se(so).hashCode=function(){return ue(this.ob_1)},se(so).equals=function(n){if(this===n)return!0;if(!(n instanceof so))return!1;var t=n instanceof so?n:_e();return this.ob_1===t.ob_1},se(co).toString=function(){return"Property(kind="+this.pb_1+", name="+this.qb_1+", owner="+this.rb_1+")"},se(co).hashCode=function(){var n=ue(this.pb_1);return n=zn(n,31)+ue(this.qb_1)|0,zn(n,31)+ue(this.rb_1)|0},se(co).equals=function(n){if(this===n)return!0;if(!(n instanceof co))return!1;var t=n instanceof co?n:_e();return this.pb_1===t.pb_1&&this.qb_1===t.qb_1&&this.rb_1===t.rb_1},se(ao).toString=function(){return"BuildLogic(location="+this.sb_1+")"},se(ao).hashCode=function(){return ue(this.sb_1)},se(ao).equals=function(n){if(this===n)return!0;if(!(n instanceof ao))return!1;var t=n instanceof ao?n:_e();return this.sb_1===t.sb_1},se(ho).toString=function(){return"BuildLogicClass(type="+this.tb_1+")"},se(ho).hashCode=function(){return ue(this.tb_1)},se(ho).equals=function(n){if(this===n)return!0;if(!(n instanceof ho))return!1;var t=n instanceof ho?n:_e();return this.tb_1===t.tb_1},se(vo).zb=function(){return this.yb_1},se(vo).toString=function(){return"TaskTreeIntent(delegate="+this.yb_1+")"},se(vo).hashCode=function(){return ee(this.yb_1)},se(vo).equals=function(n){if(this===n)return!0;if(!(n instanceof vo))return!1;var t=n instanceof vo?n:_e();return!!oe(this.yb_1,t.yb_1)},se(go).zb=function(){return this.ac_1},se(go).toString=function(){return"MessageTreeIntent(delegate="+this.ac_1+")"},se(go).hashCode=function(){return ee(this.ac_1)},se(go).equals=function(n){if(this===n)return!0;if(!(n instanceof go))return!1;var t=n instanceof go?n:_e();return!!oe(this.ac_1,t.ac_1)},se(wo).zb=function(){return this.bc_1},se(wo).toString=function(){return"InputTreeIntent(delegate="+this.bc_1+")"},se(wo).hashCode=function(){return ee(this.bc_1)},se(wo).equals=function(n){if(this===n)return!0;if(!(n instanceof wo))return!1;var t=n instanceof wo?n:_e();return!!oe(this.bc_1,t.bc_1)},se(bo).zb=function(){return this.cc_1},se(bo).toString=function(){return"IncompatibleTaskTreeIntent(delegate="+this.cc_1+")"},se(bo).hashCode=function(){return ee(this.cc_1)},se(bo).equals=function(n){if(this===n)return!0;if(!(n instanceof bo))return!1;var t=n instanceof bo?n:_e();return!!oe(this.cc_1,t.cc_1)},se(po).toString=function(){return"SetTab(tab="+this.dc_1+")"},se(po).hashCode=function(){return this.dc_1.hashCode()},se(po).equals=function(n){if(this===n)return!0;if(!(n instanceof po))return!1;var t=n instanceof po?n:_e();return!!this.dc_1.equals(t.dc_1)},se(mo).mc=function(n,t,r,i,e,u,o,f){return new mo(n,t,r,i,e,u,o,f)},se(mo).nc=function(n,t,r,i,e,u,o,f,s){return n=n===A?this.ec_1:n,t=t===A?this.fc_1:t,r=r===A?this.gc_1:r,i=i===A?this.hc_1:i,e=e===A?this.ic_1:e,u=u===A?this.jc_1:u,o=o===A?this.kc_1:o,f=f===A?this.lc_1:f,s===A?this.mc(n,t,r,i,e,u,o,f):s.mc.call(this,n,t,r,i,e,u,o,f)},se(mo).toString=function(){return"Model(heading="+this.ec_1+", summary="+this.fc_1+", learnMore="+this.gc_1+", messageTree="+this.hc_1+", locationTree="+this.ic_1+", inputTree="+this.jc_1+", incompatibleTaskTree="+this.kc_1+", tab="+this.lc_1+")"},se(mo).hashCode=function(){var n=this.ec_1.hashCode();return n=zn(n,31)+ee(this.fc_1)|0,n=zn(n,31)+this.gc_1.hashCode()|0,n=zn(n,31)+this.hc_1.hashCode()|0,n=zn(n,31)+this.ic_1.hashCode()|0,n=zn(n,31)+this.jc_1.hashCode()|0,n=zn(n,31)+this.kc_1.hashCode()|0,zn(n,31)+this.lc_1.hashCode()|0},se(mo).equals=function(n){if(this===n)return!0;if(!(n instanceof mo))return!1;var t=n instanceof mo?n:_e();return!!(this.ec_1.equals(t.ec_1)&&oe(this.fc_1,t.fc_1)&&this.gc_1.equals(t.gc_1)&&this.hc_1.equals(t.hc_1)&&this.ic_1.equals(t.ic_1)&&this.jc_1.equals(t.jc_1)&&this.kc_1.equals(t.kc_1)&&this.lc_1.equals(t.lc_1))},se(Uo).gd=function(n,t){var r,i;return n instanceof vo?r=t.nc(A,A,A,A,_s().id(n.yb_1,t.ic_1)):n instanceof go?r=t.nc(A,A,A,_s().id(n.ac_1,t.hc_1)):n instanceof wo?r=t.nc(A,A,A,A,A,_s().id(n.bc_1,t.jc_1)):n instanceof bo?r=t.nc(A,A,A,A,A,A,_s().id(n.cc_1,t.kc_1)):n instanceof qc?r=function(n,t,r,i){var e;return r instanceof go?e=n.nc(A,A,A,mc(n.hc_1,r,i)):r instanceof vo?e=n.nc(A,A,A,A,mc(n.ic_1,r,i)):r instanceof wo?e=n.nc(A,A,A,A,A,mc(n.jc_1,r,i)):r instanceof bo?e=n.nc(A,A,A,A,A,A,mc(n.kc_1,r,i)):(console.error("Unhandled tree intent: "+r),e=n),e}(t,0,n.xc_1,(i=n,function(n){var t;if(!(n instanceof Ou))throw fu(ie("Failed requirement."));for(var r=n.oa_1,e=i.wc_1,u=Nr(xt(r,10)),o=0,f=r.f();f.g();){var s,c,a=f.h(),h=o;if(o=h+1|0,e===wr(h)){var l=a.sa_1;c=a.ua(A,null==l?null:l.ad())}else c=a;s=c,u.d(s)}return t=u,n.qa(A,A,t)})):n instanceof kc?(window.navigator.clipboard.writeText(n.hd_1),r=t):n instanceof po?r=t.nc(A,A,A,A,A,A,A,n.dc_1):(console.error("Unhandled intent: "+n),r=t),r},se(Uo).ba=function(n,t){var r=n instanceof Bc?n:_e();return this.gd(r,t instanceof mo?t:_e())},se(Uo).jd=function(n){return Af().y9(Jf(To),[qo(0,n),Bo(0,n)])},se(Uo).z9=function(n){return this.jd(n instanceof mo?n:_e())},se(Zo).toString=function(){return"ImportedProblem(problem="+this.kd_1+", message="+this.ld_1+", trace="+this.md_1+")"},se(Zo).hashCode=function(){var n=ee(this.kd_1);return n=zn(n,31)+this.ld_1.hashCode()|0,zn(n,31)+ee(this.md_1)|0},se(Zo).equals=function(n){if(this===n)return!0;if(!(n instanceof Zo))return!1;var t=n instanceof Zo?n:_e();return!!oe(this.kd_1,t.kd_1)&&!!this.ld_1.equals(t.ld_1)&&!!oe(this.md_1,t.md_1)},se(ff).ud=function(n,t){return this.td_1(n,t)},se(ff).compare=function(n,t){return this.ud(n,t)},se(bf).toString=function(){return"LearnMore(text="+this.sc_1+", documentationLink="+this.tc_1+")"},se(bf).hashCode=function(){var n=ue(this.sc_1);return zn(n,31)+ue(this.tc_1)|0},se(bf).equals=function(n){if(this===n)return!0;if(!(n instanceof bf))return!1;var t=n instanceof bf?n:_e();return this.sc_1===t.sc_1&&this.tc_1===t.tc_1},se(pf).toString=function(){return"Text(text="+this.fa_1+")"},se(pf).hashCode=function(){return ue(this.fa_1)},se(pf).equals=function(n){if(this===n)return!0;if(!(n instanceof pf))return!1;var t=n instanceof pf?n:_e();return this.fa_1===t.fa_1},se(mf).toString=function(){return"Reference(name="+this.da_1+", clipboardString="+this.ea_1+")"},se(mf).hashCode=function(){var n=ue(this.da_1);return zn(n,31)+ue(this.ea_1)|0},se(mf).equals=function(n){if(this===n)return!0;if(!(n instanceof mf))return!1;var t=n instanceof mf?n:_e();return this.da_1===t.da_1&&this.ea_1===t.ea_1},se(yf).ed=function(n){return this.dd_1.d(new pf(n)),this},se(yf).xd=function(n,t){return this.dd_1.d(new mf(n,t)),this},se(yf).fd=function(n,t,r){return t=t===A?n:t,r===A?this.xd(n,t):r.xd.call(this,n,t)},se(yf).j5=function(){return new Cf(Rn(this.dd_1))},se(qf).rd=function(n){return new Cf(gr(new pf(n)))},se(qf).qd=function(n){var t=new yf;return n(t),t.j5()},se(Cf).vd=function(n){return new Cf(n)},se(Cf).toString=function(){return"PrettyText(fragments="+this.ca_1+")"},se(Cf).hashCode=function(){return ee(this.ca_1)},se(Cf).equals=function(n){if(this===n)return!0;if(!(n instanceof Cf))return!1;var t=n instanceof Cf?n:_e();return!!oe(this.ca_1,t.ca_1)},se(xf).sd=function(n){return function(n){for(var t=Gr(),r=n.f();r.g();)for(var i=t,e=r.h().f();e.g();){var u,o=e.h(),f=i,s=f.v1(o);if(null==s){var c=Gr();f.h5(o,c),u=c}else u=s;i=u instanceof Vr?u:_e()}return t}(n)},se(Sf).toString=function(){return"Trie(nestedMaps="+this.wd_1+")"},se(Sf).hashCode=function(){return ee(this.wd_1)},se(Sf).equals=function(n){return function(n,t){return t instanceof Sf&&!!oe(n,t instanceof Sf?t.wd_1:_e())}(this.wd_1,n)},se(Uf).ga=function(n){return Qf().yd(this.x9_1,A,n)},se(Uf).ha=function(n){return Qf().yd(this.x9_1,A,A,n)},se(Uf).ja=function(n){return Qf().yd(this.x9_1,A,A,nu(n))},se(Uf).y9=function(n,t){return Qf().yd(this.x9_1,n,A,nu(t))},se(Uf).zd=function(n,t){return Qf().yd(this.x9_1,n,A,t)},se(Uf).fb=function(n,t){return Qf().yd(this.x9_1,n,t)},se(Uf).rc=function(n,t){return Qf().yd(this.x9_1,A,n,nu(t))},se(Uf).toString=function(){return"ViewFactory(elementName="+this.x9_1+")"},se(Uf).hashCode=function(){return ue(this.x9_1)},se(Uf).equals=function(n){if(this===n)return!0;if(!(n instanceof Uf))return!1;var t=n instanceof Uf?n:_e();return this.x9_1===t.x9_1},se(Vf).ae=function(n,t,r,i){return new Wf(n,t,r,i)},se(Vf).yd=function(n,t,r,i,e){return t=t===A?pt():t,r=r===A?null:r,i=i===A?pt():i,e===A?this.ae(n,t,r,i):e.ae.call(this,n,t,r,i)},se(Wf).toString=function(){return"Element(elementName="+this.be_1+", attributes="+this.ce_1+", innerText="+this.de_1+", children="+this.ee_1+")"},se(Wf).hashCode=function(){var n=ue(this.be_1);return n=zn(n,31)+ee(this.ce_1)|0,n=zn(n,31)+(null==this.de_1?0:ue(this.de_1))|0,zn(n,31)+ee(this.ee_1)|0},se(Wf).equals=function(n){if(this===n)return!0;if(!(n instanceof Wf))return!1;var t=n instanceof Wf?n:_e();return this.be_1===t.be_1&&!!oe(this.ce_1,t.ce_1)&&this.de_1==t.de_1&&!!oe(this.ee_1,t.ee_1)},se(ns).u9=function(n){return this.r9_1(new ts("click",n))},se(ns).t9=function(n){return this.r9_1(new rs(n))},se(ns).gb=function(n){for(var t=0,r=n.length;t<r;){var i=n[t];t=t+1|0,this.r9_1(new rs(i))}return lr()},se(ns).s9=function(n){return this.r9_1(new is("title",n))},se(ns).bd=function(n){return this.r9_1(new is("href",n))},se(ss).oe=function(){return this.ne_1},se(ss).toString=function(){return"Toggle(focus="+this.ne_1+")"},se(ss).hashCode=function(){return ee(this.ne_1)},se(ss).equals=function(n){if(this===n)return!0;if(!(n instanceof ss))return!1;var t=n instanceof ss?n:_e();return!!oe(this.ne_1,t.ne_1)},se(cs).pe=function(n,t){return this.re(n.qe((r=t,function(n){return n.me(r(n.ub_1))})));var r},se(cs).re=function(n){return new cs(n)},se(cs).toString=function(){return"Model(tree="+this.xb_1+")"},se(cs).hashCode=function(){return this.xb_1.hashCode()},se(cs).equals=function(n){if(this===n)return!0;if(!(n instanceof cs))return!1;var t=n instanceof cs?n:_e();return!!this.xb_1.equals(t.xb_1)},se(ls).id=function(n,t){var r;if(n instanceof ss){var i=n.oe();r=t.re(i.qe(hs))}else le();return r},se(ds).cd=function(){return this.ve_1},se(ds).we=function(){return 0},se(ds).qe=function(n){return n(this.ve_1)},se(ds).toString=function(){return"Original(tree="+this.ve_1+")"},se(ds).hashCode=function(){return this.ve_1.hashCode()},se(ds).equals=function(n){if(this===n)return!0;if(!(n instanceof ds))return!1;var t=n instanceof ds?n:_e();return!!this.ve_1.equals(t.ve_1)},se(gs).cd=function(){return this.ue_1},se(gs).we=function(){return this.se_1.we()+1|0},se(gs).qe=function(n){return this.se_1.qe((t=this,r=n,function(n){for(var i,e=n.vb_1,u=t.te_1,o=Nr(xt(e,10)),f=0,s=e.f();s.g();){var c,a=s.h(),h=f;f=h+1|0,c=u===wr(h)?r(a):a,o.d(c)}return i=o,n.me(A,i)}));var t,r},se(gs).toString=function(){return"Child(parent="+this.se_1+", index="+this.te_1+", tree="+this.ue_1+")"},se(gs).hashCode=function(){var n=ee(this.se_1);return n=zn(n,31)+this.te_1|0,zn(n,31)+this.ue_1.hashCode()|0},se(gs).equals=function(n){if(this===n)return!0;if(!(n instanceof gs))return!1;var t=n instanceof gs?n:_e();return!!oe(this.se_1,t.se_1)&&this.te_1===t.te_1&&!!this.ue_1.equals(t.ue_1)},se(ws).ad=function(){var n;switch(this.q8_1){case 0:n=ms();break;case 1:n=ps();break;default:le()}return n},se(bs).vc=function(){var n,t;return Jn(On(Oe(0,this.cd().vb_1.k()-1|0)),(n=this,(t=function(t){return n.xe(t)}).callableName="child",t))},se(bs).xe=function(n){return new gs(this,n,this.cd().vb_1.j(n))},se(ks).uc=function(){return new ds(this)},se(ks).ye=function(){return!this.vb_1.i()},se(ks).ze=function(n,t,r){return new ks(n,t,r)},se(ks).me=function(n,t,r,i){return n=n===A?this.ub_1:n,t=t===A?this.vb_1:t,r=r===A?this.wb_1:r,i===A?this.ze(n,t,r):i.ze.call(this,n,t,r)},se(ks).toString=function(){return"Tree(label="+this.ub_1+", children="+this.vb_1+", state="+this.wb_1+")"},se(ks).hashCode=function(){var n=null==this.ub_1?0:ee(this.ub_1);return n=zn(n,31)+ee(this.vb_1)|0,zn(n,31)+this.wb_1.hashCode()|0},se(ks).equals=function(n){if(this===n)return!0;if(!(n instanceof ks))return!1;var t=n instanceof ks?n:_e();return!!oe(this.ub_1,t.ub_1)&&!!oe(this.vb_1,t.vb_1)&&!!this.wb_1.equals(t.wb_1)},se(Cs).toString=function(){return"ProblemIdElement(name="+this.df_1+", displayName="+this.ef_1+")"},se(Cs).hashCode=function(){var n=ue(this.df_1);return zn(n,31)+ue(this.ef_1)|0},se(Cs).equals=function(n){if(this===n)return!0;if(!(n instanceof Cs))return!1;var t=n instanceof Cs?n:_e();return this.df_1===t.df_1&&this.ef_1===t.ef_1},se(xs).toString=function(){return"ProblemSummary(problemId="+this.ff_1+", count="+this.gf_1+")"},se(xs).hashCode=function(){var n=ee(this.ff_1);return zn(n,31)+this.gf_1|0},se(xs).equals=function(n){if(this===n)return!0;if(!(n instanceof xs))return!1;var t=n instanceof xs?n:_e();return!!oe(this.ff_1,t.ff_1)&&this.gf_1===t.gf_1},se(Is).toString=function(){return"ProblemNodeGroup(tree="+this.hf_1+", children="+this.if_1+", childGroups="+this.jf_1+", id="+this.kf_1+")"},se(Is).hashCode=function(){var n=this.hf_1.hashCode();return n=zn(n,31)+ee(this.if_1)|0,n=zn(n,31)+ee(this.jf_1)|0,zn(n,31)+this.kf_1|0},se(Is).equals=function(n){if(this===n)return!0;if(!(n instanceof Is))return!1;var t=n instanceof Is?n:_e();return!!this.hf_1.equals(t.hf_1)&&!!oe(this.if_1,t.if_1)&&!!oe(this.jf_1,t.jf_1)&&this.kf_1===t.kf_1},se(Us).toString=function(){return"Text(text="+this.lf_1+")"},se(Us).hashCode=function(){return ue(this.lf_1)},se(Us).equals=function(n){if(this===n)return!0;if(!(n instanceof Us))return!1;var t=n instanceof Us?n:_e();return this.lf_1===t.lf_1},se(Vs).toString=function(){return"ProblemIdNode(prettyText="+this.mf_1+", separator="+this.nf_1+")"},se(Vs).hashCode=function(){var n=this.mf_1.hashCode();return zn(n,31)+(0|this.nf_1)|0},se(Vs).equals=function(n){if(this===n)return!0;if(!(n instanceof Vs))return!1;var t=n instanceof Vs?n:_e();return!!this.mf_1.equals(t.mf_1)&&this.nf_1===t.nf_1},se(Qs).toString=function(){return"Advice(label="+this.of_1+", docLink="+this.pf_1+")"},se(Qs).hashCode=function(){var n=ee(this.of_1);return zn(n,31)+(null==this.pf_1?0:ee(this.pf_1))|0},se(Qs).equals=function(n){if(this===n)return!0;if(!(n instanceof Qs))return!1;var t=n instanceof Qs?n:_e();return!!oe(this.of_1,t.of_1)&&!!oe(this.pf_1,t.pf_1)},se(Ys).zb=function(){return this.qf_1},se(Ys).toString=function(){return"MessageTreeIntent(delegate="+this.qf_1+")"},se(Ys).hashCode=function(){return ee(this.qf_1)},se(Ys).equals=function(n){if(this===n)return!0;if(!(n instanceof Ys))return!1;var t=n instanceof Ys?n:_e();return!!oe(this.qf_1,t.qf_1)},se(Ws).zb=function(){return this.rf_1},se(Ws).toString=function(){return"ProblemIdTreeIntent(delegate="+this.rf_1+")"},se(Ws).hashCode=function(){return ee(this.rf_1)},se(Ws).equals=function(n){if(this===n)return!0;if(!(n instanceof Ws))return!1;var t=n instanceof Ws?n:_e();return!!oe(this.rf_1,t.rf_1)},se(Ks).zb=function(){return this.sf_1},se(Ks).toString=function(){return"FileLocationTreeIntent(delegate="+this.sf_1+")"},se(Ks).hashCode=function(){return ee(this.sf_1)},se(Ks).equals=function(n){if(this===n)return!0;if(!(n instanceof Ks))return!1;var t=n instanceof Ks?n:_e();return!!oe(this.sf_1,t.sf_1)},se(Xs).toString=function(){return"SetTab(tab="+this.tf_1+")"},se(Xs).hashCode=function(){return this.tf_1.hashCode()},se(Xs).equals=function(n){if(this===n)return!0;if(!(n instanceof Xs))return!1;var t=n instanceof Xs?n:_e();return!!this.tf_1.equals(t.tf_1)},se(Js).cg=function(n,t,r,i,e,u,o,f){return new Js(n,t,r,i,e,u,o,f)},se(Js).dg=function(n,t,r,i,e,u,o,f,s){return n=n===A?this.uf_1:n,t=t===A?this.vf_1:t,r=r===A?this.wf_1:r,i=i===A?this.xf_1:i,e=e===A?this.yf_1:e,u=u===A?this.zf_1:u,o=o===A?this.ag_1:o,f=f===A?this.bg_1:f,s===A?this.cg(n,t,r,i,e,u,o,f):s.cg.call(this,n,t,r,i,e,u,o,f)},se(Js).toString=function(){return"Model(heading="+this.uf_1+", summary="+this.vf_1+", learnMore="+this.wf_1+", messageTree="+this.xf_1+", problemIdTree="+this.yf_1+", fileLocationTree="+this.zf_1+", problemCount="+this.ag_1+", tab="+this.bg_1+")"},se(Js).hashCode=function(){var n=this.uf_1.hashCode();return n=zn(n,31)+ee(this.vf_1)|0,n=zn(n,31)+this.wf_1.hashCode()|0,n=zn(n,31)+this.xf_1.hashCode()|0,n=zn(n,31)+this.yf_1.hashCode()|0,n=zn(n,31)+this.zf_1.hashCode()|0,n=zn(n,31)+this.ag_1|0,zn(n,31)+this.bg_1.hashCode()|0},se(Js).equals=function(n){if(this===n)return!0;if(!(n instanceof Js))return!1;var t=n instanceof Js?n:_e();return!!(this.uf_1.equals(t.uf_1)&&oe(this.vf_1,t.vf_1)&&this.wf_1.equals(t.wf_1)&&this.xf_1.equals(t.xf_1)&&this.yf_1.equals(t.yf_1)&&this.zf_1.equals(t.zf_1)&&this.ag_1===t.ag_1&&this.bg_1.equals(t.bg_1))},se(bc).eg=function(n,t){var r,i;return n instanceof Ks?r=t.dg(A,A,A,A,A,_s().id(n.sf_1,t.zf_1)):n instanceof Ws?r=t.dg(A,A,A,A,_s().id(n.rf_1,t.yf_1)):n instanceof Ys?r=t.dg(A,A,A,_s().id(n.qf_1,t.xf_1)):n instanceof qc?r=function(n,t,r,i){var e;return r instanceof Ys?e=n.dg(A,A,A,mc(n.xf_1,r,i)):r instanceof Ws?e=n.dg(A,A,A,A,mc(n.yf_1,r,i)):r instanceof Ks?e=n.dg(A,A,A,A,A,mc(n.zf_1,r,i)):(console.error("Unhandled tree intent: "+r),e=n),e}(t,0,n.xc_1,(i=n,function(n){var t;if(!(n instanceof Ou))throw fu(ie("Failed requirement."));for(var r=n.oa_1,e=i.wc_1,u=Nr(xt(r,10)),o=0,f=r.f();f.g();){var s,c,a=f.h(),h=o;if(o=h+1|0,e===wr(h)){var l=a.sa_1;c=a.ua(A,null==l?null:l.ad())}else c=a;s=c,u.d(s)}return t=u,n.qa(A,A,t)})):n instanceof kc?(window.navigator.clipboard.writeText(n.hd_1),r=t):n instanceof Xs?r=t.dg(A,A,A,A,A,A,A,n.tf_1):(console.error("Unhandled intent: "+n),r=t),r},se(bc).ba=function(n,t){var r=n instanceof Bc?n:_e();return this.eg(r,t instanceof Js?t:_e())},se(bc).fg=function(n){return Af().y9(Jf(ac),[tc(0,n),rc(0,n)])},se(bc).z9=function(n){return this.fg(n instanceof Js?n:_e())},se(kc).toString=function(){return"Copy(text="+this.hd_1+")"},se(kc).hashCode=function(){return ue(this.hd_1)},se(kc).equals=function(n){if(this===n)return!0;if(!(n instanceof kc))return!1;var t=n instanceof kc?n:_e();return this.hd_1===t.hd_1},se(qc).toString=function(){return"ToggleStackTracePart(partIndex="+this.wc_1+", location="+this.xc_1+")"},se(qc).hashCode=function(){var n=this.wc_1;return zn(n,31)+ee(this.xc_1)|0},se(qc).equals=function(n){if(this===n)return!0;if(!(n instanceof qc))return!1;var t=n instanceof qc?n:_e();return this.wc_1===t.wc_1&&!!oe(this.xc_1,t.xc_1)},se(Jr).k6=function(){var n=Object.create(null);return n.foo=1,delete n.foo,lr(),n},l=null,wn=0,function(){var n=configurationCacheProblems();if(null==n.problemsReport)zf(Ef("report"),Vo(),function(n){var t,r,i,e,u,o,f,s,c,a,h=function(n){for(var t=Lr(),r=Lr(),i=Lr(),e=0,u=n.length;e<u;){var o=n[e];e=e+1|0;var f,s=o.input,c=null==s?null:r.d(Wo(s,o));if(null==c){var a=o.incompatibleTask;f=null==a?null:i.d(Wo(a,o))}else f=c;if(null==f){var h=he(o.problem);t.d(Wo(h,o))}}return new Yo(t,r,i)}(n.diagnostics),l=n.totalProblemCount;return new mo((f=(t=n).buildName,s=t.requestedTasks,c=null==s?null:Wt(s," ",A,r=r!==A&&r)>=0,a=null==c||c,Bf().qd((i=t,e=f,u=s,o=a,function(n){n.ed(function(n){var t;if(Wi(n)>0){var r,i=Zi(n,0);r=function(n){return 97<=n&&n<=122||!(ji(n,128)<0)&&function(n){var t;return t=1===function(n){var t=n,r=ru(eu().h9_1,t),i=eu().h9_1[r],e=(i+eu().i9_1[r]|0)-1|0,u=eu().j9_1[r];if(t>e)return 0;var o=3&u;if(0===o){var f=2,s=i,c=0;if(c<=1)do{if(c=c+1|0,(s=s+(u>>f&127)|0)>t)return 3;if((s=s+(u>>(f=f+7|0)&127)|0)>t)return 0;f=f+7|0}while(c<=1);return 3}if(u<=7)return o;var a=t-i|0;return u>>zn(2,u<=31?a%2|0:a)&3}(n)||function(n){var t=ru(ou().k9_1,n);return t>=0&&n<(ou().k9_1[t]+ou().l9_1[t]|0)}(n),t}(n)}(i)?function(n){return function(n){var t=Pi(n).toUpperCase();if(t.length>1){var r;if(329===n)r=t;else{var i=Zi(t,0),e=t.substring(1).toLowerCase();r=Pi(i)+e}return r}return Pi(function(n){return function(n){var t=n;return 452<=t&&t<=460||497<=t&&t<=499?De(zn(3,(t+1|0)/3|0)):4304<=t&&t<=4346||4349<=t&&t<=4351?n:mi(n)}(n)}(n))}(n)}(i):Pi(i),t=ie(r)+n.substring(1)}else t=n;return t}(i.cacheAction)+" the configuration cache for ");var t=e;null==t||n.fd(t),null==e||n.ed(" build and ");var r=u;return null==(null==r?null:n.fd(r))&&n.ed("default"),n.ed(o?" tasks":" task"),lr()}))),function(n,t){var r=n.cacheActionDescription,i=null==r?null:vf(r),e=Bf().rd(function(n){var t=n.od_1.k(),r=df(t,"build configuration input");return t>0?r+" and will cause the cache to be discarded when "+(t<=1?"its":"their")+" value change":r}(t)),u=Bf().rd(function(n,t){var r=n.totalProblemCount,i=t.nd_1.k(),e=df(r,"problem");return r>i?e+", only the first "+i+" "+wf(i)+" included in this report":e}(n,t));return function(n,t){for(var r=0,i=n.length;r<i;){var e=n[r];r=r+1|0,null!=e&&t.d(e)}return t}([i,e,u],Lr())}(n,h),new bf("Gradle Configuration Cache",n.documentationLink),uf(new Zu(Ho().qc_1),Jn(On(h.nd_1),af)),uf(new Zu($o().qc_1),function(n){return Jn(On(n),hf)}(h.nd_1)),uf(new Zu(Ro().qc_1),Jn(On(h.od_1),sf)),uf(new Zu(Go().qc_1),Jn(On(h.pd_1),cf)),0===l?Ro():Ho())}(n));else{var t=n.problemsReport;zf(Ef("report"),pc(),function(n,t){for(var r=n.summaries,i=Nr(r.length),e=0,u=r.length;e<u;){var o,f=r[e];e=e+1|0;for(var s=f.problemId,c=Nr(s.length),a=0,h=s.length;a<h;){var l,_=s[a];a=a+1|0,l=new Cs(_.name,_.displayName),c.d(l)}o=new xs(c,f.count),i.d(o)}for(var v=i,d=function(n,t){for(var r=oi(),i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o,f=Ln(u.problemId,":",A,A,A,A,Ds),s=r.v1(f);if(null==s){var c=Lr();r.h5(f,c),o=c}else o=s;o.d(u)}for(var a=r.o(),h=Nr(xt(a,10)),l=a.f();l.g();){for(var _,v=l.h(),d=v.i1(),g=Nr(xt(d,10)),w=d.f();w.g();){var b;b=Es(w.h(),null,!0),g.d(b)}var p,m=Hn(g),k=Dn(v.i1()),y=Ls(k,new Gu(Ns(Ts(k)).ed(" ("+v.i1().k()+")").j5()));n:{for(var q=t.f();q.g();){var B=q.h();if(zs(B.ff_1,k.problemId)){p=B;break n}}p=null}var C=p;null==C||m.d(js(C.gf_1)),_=new ks(y,m),h.d(_)}var x=h;return new cs(new ks(new Us("message tree root"),x))}(t,v),g=function(n,t){for(var r=function(){var n=Lr();return new Is(new ks(new Vs(Bf().rd("Ungrouped"),!0),n),n,oi())}(),i=oi(),e=0,u=n.length;e<u;){var o=n[e];e=e+1|0;for(var f=$n(Tn(o.problemId,1)),s=Nr(xt(f,10)),c=f.f();c.g();){var a,h=c.h();a=new Cs(h.name,h.displayName),s.d(a)}var l=Ss(i,s),_=Es(o);null==l?r.if_1.d(_):l.if_1.d(_)}for(var v=Nr(xt(t,10)),d=t.f();d.g();){var g,w=d.h();g=new xs($n(Gn(w.ff_1,1)),w.gf_1),v.d(g)}for(var b=oi(),p=v.f();p.g();){var m,k=p.h(),y=k.ff_1,q=b.v1(y);if(null==q){var B=Lr();b.h5(y,B),m=B}else m=q;m.d(k)}for(var C=b.o(),x=Nr(xt(C,10)),j=C.f();j.g();){for(var P,I=j.h(),S=I.j1(),z=0,E=I.i1().f();E.g();)z=z+E.h().gf_1|0;P=new xs(S,z),x.d(P)}for(var T=x.f();T.g();){var L=T.h(),N=Ss(i,L.ff_1),A=null==N?null:N.if_1;null==A||A.d(js(L.gf_1))}for(var M=i.w1(),F=Nr(xt(M,10)),D=M.f();D.g();){var O;O=D.h().hf_1,F.d(O)}var R=function(n,t){var r=Nr(n.k());return r.m(n),r.d(t),r}(F,r.hf_1);return new cs(new ks(new Us("group tree root"),R))}(t,v),w=0,b=v.f();b.g();)w=w+b.h().gf_1|0;var p=function(n,t){for(var r=Lr(),i=oi(),e=0,u=n.length;e<u;){var o=n[e];e=e+1|0;var f=o.locations;if(null==f||0===f.length)r.d(Es(o));else{var s,c=o.locations;if(null==c)s=null;else{for(var a=Lr(),h=Ri(c);h.g();){var l=h.h();null!=l.path&&a.d(l)}s=a}if(null==s);else for(var _=s.f();_.g();){var v=_.h();Ps(i,he(v.path),o,v)}var d,g=o.locations;if(null==g)d=null;else{for(var w=Lr(),b=Ri(g);b.g();){var p=b.h();null!=p.pluginId&&w.d(p)}d=w}if(null==d);else for(var m=d.f();m.g();){var k=m.h();Ps(i,he(k.pluginId),o,k)}var y,q=o.locations;if(null==q)y=null;else{for(var B=Lr(),C=Ri(q);C.g();){var x=C.h();null!=x.taskPath&&B.d(x)}y=B}if(null==y);else for(var j=y.f();j.g();){var P=j.h();Ps(i,he(P.taskPath),o,P)}}}var I=function(n,t,r){for(var i=n.w1(),e=Nr(xt(i,10)),u=i.f();u.g();){var o;o=u.h().t3_1,e.d(o)}var f=Hn(e);return t.i()||f.d(new ks(new Vs(Bf().rd("no location"),!0),t)),r>0&&f.d(js(r)),f}(i,r,t);return new cs(new ks(new Us("text"),I))}(t,w);return new Js(Bf().rd("Problems Report"),function(n,t){var r,i,e,u=n.description,o=null==u?null:gr(vf(u));return r=null==o?gr(Bf().qd((i=t,e=n,function(n){n.ed(i.length+" problems have been reported during the execution");var t=e.buildName;null==t||(n.ed(" of build "),n.fd(t));var r=e.requestedTasks;return null==r||(n.ed(" for the following tasks:"),n.fd(r),lr()),lr()}))):o,r}(n,t),new bf("reporting problems",n.documentationLink),d,g,p,t.length,function(n,t,r){return lo(r)>0?Gs():lo(n)>0?Hs():lo(t)>0?$s():Hs()}(d,g,p))}(t,n.diagnostics))}}(),n}(void 0===this["configuration-cache-report"]?{}:this["configuration-cache-report"])}}[70](),{}))));
+//# sourceMappingURL=configuration-cache-report.js.map
+                </script>
+
+</body>
+</html>
diff --git a/android/gradle.properties b/android/gradle.properties
index f47e3b3a..0e253cc0 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,10 +1,18 @@
 #org.gradle.jvmargs=-xmx4608m
 android.enableR8=true
+android.enableR8.fullMode=true
 android.enableJetifier=true
 android.useDeprecatedNdk=true
-org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1024m -XX:MaxMetaspaceSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 android.useAndroidX=true
 android.enableImpeller=false
+# This builtInKotlin flag was added automatically by Flutter migrator
+android.builtInKotlin=false
+# This newDsl flag was added automatically by Flutter migrator
+android.newDsl=false
+
+# Enabled parallel sync for Gradle 9.4+
+org.gradle.tooling.parallel=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 2299155e..4ee62d8f 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 #distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index 1c91fb7c..434a4219 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -16,14 +16,34 @@ pluginManagement {
     }
 }
 
+dependencyResolutionManagement {
+//    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
+    repositoriesMode.set(RepositoriesMode.PREFER_PROJECT)
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            url = uri("https://storage.googleapis.com/download.flutter.io")
+        }
+        // Huawei HMS repo
+        maven {
+            url = uri("https://developer.huawei.com/repo/")
+        }
+        // Mapbox repo
+        maven {
+            url = uri("https://api.mapbox.com/downloads/v2/releases/maven")
+        }
+    }
+}
+
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
 //    id("com.android.application") version "8.9.3" apply false
     // START: FlutterFire Configuration
     id("com.google.gms.google-services") version("4.4.1") apply false
     // END: FlutterFire Configuration
-    id("com.android.application") version "8.9.3" apply false
-    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+    id("com.android.application") version "8.11.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
 }
 
 include(":app")
diff --git a/assets/images/svg/Icon-migrate.svg b/assets/images/svg/Icon-migrate.svg
new file mode 100644
index 00000000..b8dc647f
--- /dev/null
+++ b/assets/images/svg/Icon-migrate.svg
@@ -0,0 +1,10 @@
+<svg width="120" height="120" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="120" height="120" rx="60" fill="#ED1C2B" fill-opacity="0.0784314"/>
+<rect x="27" y="45" width="18" height="30" rx="3" fill="white"/>
+<rect x="27" y="45" width="18" height="30" rx="3" stroke="#ED1C2B" stroke-width="2"/>
+<rect x="30" y="52" width="12" height="16" rx="2" fill="#ED1C2B" fill-opacity="0.101961"/>
+<path d="M55.333 59.9992H64.6674M60.0002 64.6664L64.6674 59.9992L60.0002 55.332" stroke="#ED1C2B" stroke-width="2" stroke-linecap="round"/>
+<rect x="75" y="45" width="18" height="30" rx="3" fill="white"/>
+<rect x="75" y="45" width="18" height="30" rx="3" stroke="#ED1C2B" stroke-width="2"/>
+<rect x="78" y="52" width="12" height="16" rx="2" fill="#ED1C2B" fill-opacity="0.101961"/>
+</svg>
diff --git a/assets/json/default_occasion_config.json b/assets/json/default_occasion_config.json
new file mode 100644
index 00000000..fe51488c
--- /dev/null
+++ b/assets/json/default_occasion_config.json
@@ -0,0 +1 @@
+[]
diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json
index 911856ab..f0e3c730 100644
--- a/assets/langs/ar-SA.json
+++ b/assets/langs/ar-SA.json
@@ -1533,6 +1533,7 @@
   "vatPercent": "ضريبة القيمة المضافة (15%)",
   "proceedToPayment": "المتابعة للدفع",
   "supportedSmartWatches": "كيف تعمل؟",
+  "smartwatchHowItWorks": "كيف تعمل الساعة الذكية",
   "pleaseMakeSureSamsungWatchConnected": "يرجى التأكد من أن ساعة Samsung الخاصة بك متصلة بهاتفك، ومتزامنة ومحدثة بشكل نشط.",
   "beforeSyncingDataFollowInstructions": "قبل مزامنة البيانات، يرجى التأكد من اتباع التعليمات بشكل صحيح.",
   "viewWatchInstructions": "عرض تعليمات الساعة",
@@ -1544,6 +1545,18 @@
   "seconds": "ثواني",
   "secs": "ثواني",
   "noAllergiesDataFound": "لم يتم العثور على بيانات الحساسية...",
+  "allHealthData": "جميع البيانات الصحية",
+  "activityCalories": "سعرات النشاط",
+  "activityCaloriesDescription": "توفر حلقات النشاط مرجعًا بصريًا سريعًا لمدى نشاطك خلال كل يوم.",
+  "steps": "الخطوات",
+  "distanceCovered": "المسافة المقطوعة",
+  "distanceCoveredDescription": "المسافة المقطوعة على مدار اليوم",
+  "sleepScore": "مؤشر النوم",
+  "sleepScoreDescription": "يتتبع هذا عدد ساعات نومك خلال اليوم",
+  "bloodOxygen": "أكسجين الدم",
+  "bloodOxygenTrackingDescription": "يتتبع هذا مستوى أكسجين الدم لمراقبة السجل الصحي وتحديثه",
+  "bodyTemperature": "درجة حرارة الجسم",
+  "bodyTemperatureTrackingDescription": "يتتبع هذا درجة حرارة الجسم لمراقبة السجل الصحي وتحديثه",
   "heartRateDescription": "معدل ضربات قلبك يشير إلى عدد المرات التي ينبض فيها قلبك في الدقيقة",
   "bloodOxygenDescription": "مستوى الأكسجين في الدم يشير إلى كمية الأكسجين التي تحملها خلايا الدم الحمراء",
   "stepsDescription": "عدد الخطوات المتخذة على مدار اليوم",
@@ -2050,5 +2063,12 @@
   "liveCareTermsConditions46": "13-3\tإذا تبين أن أي بند أو جزء من أي بند من هذه الشروط والأحكام باطل أو غير قابل للإنفاذ أو غير صالح، فسيتم فصله عن هذه الشروط والأحكام، تاركاً باقي الشروط سارية المفعول بكامل الأثر والنفاذ، بشرط ألا يغير فصل ذلك البند من الطبيعة الأساسية لهذه الشروط والأحكام.",
   "liveCareTermsHeading16": "14.\tالشكاوى",
   "liveCareTermsConditions47": "خدمات الرعاية الصحية عن بُعد الخاصة بنا سوف تكون لتخصصات طبية محددة أو لمواعيد المتابعة أو إعادة صرف الدواء. ",
-  "liveCareTermsConditions48": "إذا كانت لديك أي شكاوى أو مخاوف بشأن التطبيق و/أو موقع الويب أو خدماتنا أو كيفية تعاملنا مع معلوماتك الشخصية، فيرجى التواصل معنا على: EServices.HMG@drsulaimanalhabib.com أو الاتصال على الرقم: 9553 525 011"
+  "liveCareTermsConditions48": "إذا كانت لديك أي شكاوى أو مخاوف بشأن التطبيق و/أو موقع الويب أو خدماتنا أو كيفية تعاملنا مع معلوماتك الشخصية، فيرجى التواصل معنا على: EServices.HMG@drsulaimanalhabib.com أو الاتصال على الرقم: 9553 525 011",
+  "importantNotice": "تنبيه هام",
+  "appDecommissionedText": "تم إيقاف هذا الإصدار من تطبيق الحبيب الطبي.\nللاستمرار في الاستفادة من الخدمات الصحية والسجلات الطبية، يرجى تحميل التطبيق الجديد.",
+  "appDecommissionedSubText": "نعتذر بشدة عن الإزعاج الناتج عن هذا الانتقال.",
+  "downloadApp": "حمل التطبيق",
+  "unread": "غير مقروء",
+  "read": "مقروءة",
+  "pendingMedicalReportRequest": "لديك بالفعل طلب معلّق للحصول على تقرير طبي خاص بهذا الموعد. يرجى الانتظار حتى اكتمال الطلب قبل تقديم طلب جديد."
 }
diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json
index aaafb124..06a2742c 100644
--- a/assets/langs/en-US.json
+++ b/assets/langs/en-US.json
@@ -1526,6 +1526,7 @@
   "vatPercent": "VAT (15%)",
   "proceedToPayment": "Proceed to Payment",
   "supportedSmartWatches": "Supported Smart Watches",
+  "smartwatchHowItWorks": "How does it work",
   "pleaseMakeSureSamsungWatchConnected": "Please make sure that your Samsung Watch is connected to your Phone, is actively synced & updated.",
   "beforeSyncingDataFollowInstructions": "Before syncing data, please make sure that you have followed the instructions properly.",
   "viewWatchInstructions": "View watch instructions",
@@ -1537,6 +1538,18 @@
   "seconds": "Seconds",
   "secs": "Secs",
   "noAllergiesDataFound": "No allergies data found...",
+  "allHealthData": "All Health Data",
+  "activityCalories": "Activity Calories",
+  "activityCaloriesDescription": "Activity rings give you a quick visual reference of how active you are each day.",
+  "steps": "Steps",
+  "distanceCovered": "Distance Covered",
+  "distanceCoveredDescription": "Distance covered throughout the day",
+  "sleepScore": "Sleep Score",
+  "sleepScoreDescription": "This keeps track of how many hours you sleep in a day",
+  "bloodOxygen": "Blood Oxygen",
+  "bloodOxygenTrackingDescription": "This tracks your blood oxygen to monitor and update your health history",
+  "bodyTemperature": "Body Temperature",
+  "bodyTemperatureTrackingDescription": "This tracks your body temperature to monitor and update your health history",
   "heartRateDescription": "Your heart rate indicates how many times your heart beats per minute",
   "bloodOxygenDescription": "Blood oxygen level indicates how much oxygen your red blood cells are carrying",
   "stepsDescription": "Number of steps taken throughout the day",
@@ -2040,7 +2053,14 @@
   "liveCareTermsConditions46": "13.3 If any clause or part of any clause of these Terms & Conditions is found to be void, unenforceable or invalid, then it will be severed from these Terms & Conditions, leaving the remainder in full force and effect, provided that the severance has not altered the basic nature of these Terms & Conditions. ",
   "liveCareTermsHeading16": "14. COMPLAINTS",
   "liveCareTermsConditions47": "Our Telehealth Services will be for specific medical specialties or follow-up or medication refill appointments.",
-  "liveCareTermsConditions48": "If you have any complaints or concerns about the Application and or the Website, Our Services, or how we handle your personal information please contact us on: EServices.HMG@drsulaimanalhabib.com or call 011 525 9553"
+  "liveCareTermsConditions48": "If you have any complaints or concerns about the Application and or the Website, Our Services, or how we handle your personal information please contact us on: EServices.HMG@drsulaimanalhabib.com or call 011 525 9553",
+  "importantNotice": "Important Notice",
+  "appDecommissionedText": "This version of our healthcare application has been officially discontinued. To ensure uninterrupted access to your clinical records, we are transitioning all patients back to our main platform.",
+  "appDecommissionedSubText": "We sincerely apologize for the inconvenience of this transition.",
+  "downloadApp": "Download App",
+  "unread": "Unread",
+  "read": "Read",
+  "pendingMedicalReportRequest": "You already have a pending medical report request for this appointment. Please wait for the request to be completed before submitting a new one."
 }
 
 
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 1dc6cf76..391a902b 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -20,7 +20,5 @@
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>13.0</string>
 </dict>
 </plist>
diff --git a/ios/GoogleService-Info.plist b/ios/GoogleService-Info.plist
index a9b1f53a..633037cb 100644
--- a/ios/GoogleService-Info.plist
+++ b/ios/GoogleService-Info.plist
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CLIENT_ID</key>
+	<string>815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt</string>
 	<key>ANDROID_CLIENT_ID</key>
 	<string>815750722565-m14h8mkosm7cnq6uh6rhqr54dn02d705.apps.googleusercontent.com</string>
 	<key>API_KEY</key>
@@ -11,11 +15,11 @@
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
-	<string>com.cloudsolutions.HMGPatientApp</string>
+	<string>com.HMG.HMG-Smartphone</string>
 	<key>PROJECT_ID</key>
 	<string>api-project-815750722565</string>
 	<key>STORAGE_BUCKET</key>
-	<string>api-project-815750722565.firebasestorage.app</string>
+	<string>api-project-815750722565.appspot.com</string>
 	<key>IS_ADS_ENABLED</key>
 	<false></false>
 	<key>IS_ANALYTICS_ENABLED</key>
@@ -27,7 +31,7 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:815750722565:ios:34ec03c09e02e21f3c186c</string>
+	<string>1:815750722565:ios:328ec247a81a2ca23c186c</string>
 	<key>DATABASE_URL</key>
 	<string>https://api-project-815750722565.firebaseio.com</string>
 </dict>
diff --git a/ios/Podfile b/ios/Podfile
index a74c7fb2..e0283052 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -59,7 +59,7 @@ post_install do |installer|
                  'PERMISSION_NOTIFICATIONS=1',
               ]
       build_configuration.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64 i386'
-      build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
+      build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0'
       build_configuration.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES'
             xcconfig_path = build_configuration.base_configuration_reference.real_path
             xcconfig = File.read(xcconfig_path)
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index f52d12fc..c0d2bb74 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -3,15 +3,15 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
-		37D27FAF2C38AC83B852680C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A83C76CFF9D3F92EDE3B22B4 /* Pods_Runner.framework */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		478CFA942E638C8E0064F3D7 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 478CFA932E638C8E0064F3D7 /* GoogleService-Info.plist */; };
+		5D5A1F80D389375644C4D0DC /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 56E413AB2A2E9765749CACD1 /* Pods_Runner.framework */; };
 		61243B492EC5FA3700D46FA0 /* PenguinModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61243B422EC5FA3700D46FA0 /* PenguinModel.swift */; };
 		61243B4C2EC5FA3700D46FA0 /* HMGPenguinInPlatformBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61243B3D2EC5FA3700D46FA0 /* HMGPenguinInPlatformBridge.swift */; };
 		61243B502EC5FA3700D46FA0 /* PenguinView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61243B452EC5FA3700D46FA0 /* PenguinView.swift */; };
@@ -26,6 +26,7 @@
 		76B1D2542F91BF8000DBBD1B /* PenguinINRenderer.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 76B1D24F2F91BF8000DBBD1B /* PenguinINRenderer.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		76B1D2552F91BF8000DBBD1B /* PenNavUI.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76B1D2502F91BF8000DBBD1B /* PenNavUI.xcframework */; };
 		76B1D2562F91BF8000DBBD1B /* PenNavUI.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 76B1D2502F91BF8000DBBD1B /* PenNavUI.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -55,18 +56,27 @@
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		76B714E4300E58B2004DE37A /* Embed Foundation Extensions */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 13;
+			files = (
+			);
+			name = "Embed Foundation Extensions";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		05E1B2A0E6844572ADA81174 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		3EAE1F31D8D0AA94CA6C11EB /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		478CFA932E638C8E0064F3D7 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		478CFA952E6E20A60064F3D7 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
+		56E413AB2A2E9765749CACD1 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		61243B3D2EC5FA3700D46FA0 /* HMGPenguinInPlatformBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HMGPenguinInPlatformBridge.swift; sourceTree = "<group>"; };
 		61243B422EC5FA3700D46FA0 /* PenguinModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PenguinModel.swift; sourceTree = "<group>"; };
 		61243B432EC5FA3700D46FA0 /* PenguinNavigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PenguinNavigator.swift; sourceTree = "<group>"; };
@@ -80,8 +90,10 @@
 		76B1D24E2F91BF8000DBBD1B /* Penguin.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Penguin.xcframework; path = Frameworks/Penguin.xcframework; sourceTree = "<group>"; };
 		76B1D24F2F91BF8000DBBD1B /* PenguinINRenderer.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = PenguinINRenderer.xcframework; path = Frameworks/PenguinINRenderer.xcframework; sourceTree = "<group>"; };
 		76B1D2502F91BF8000DBBD1B /* PenNavUI.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = PenNavUI.xcframework; path = Frameworks/PenNavUI.xcframework; sourceTree = "<group>"; };
+		76B714CF300E58B1004DE37A /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
+		76B714D1300E58B1004DE37A /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
+		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		7BEF44ABFEF585D64D3F266C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -89,7 +101,9 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		A83C76CFF9D3F92EDE3B22B4 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		BCE5BC40273DCC009E2FACB7 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		C6416282AC56269448D7DA99 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		C6FD350374F47AFA34911C58 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -97,10 +111,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
 				76B1D2512F91BF8000DBBD1B /* Penguin.xcframework in Frameworks */,
 				76B1D2552F91BF8000DBBD1B /* PenNavUI.xcframework in Frameworks */,
 				76B1D2532F91BF8000DBBD1B /* PenguinINRenderer.xcframework in Frameworks */,
-				37D27FAF2C38AC83B852680C /* Pods_Runner.framework in Frameworks */,
+				5D5A1F80D389375644C4D0DC /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -141,7 +156,9 @@
 				76B1D24E2F91BF8000DBBD1B /* Penguin.xcframework */,
 				76B1D24F2F91BF8000DBBD1B /* PenguinINRenderer.xcframework */,
 				76B1D2502F91BF8000DBBD1B /* PenNavUI.xcframework */,
-				A83C76CFF9D3F92EDE3B22B4 /* Pods_Runner.framework */,
+				76B714CF300E58B1004DE37A /* WidgetKit.framework */,
+				76B714D1300E58B1004DE37A /* SwiftUI.framework */,
+				56E413AB2A2E9765749CACD1 /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -149,9 +166,9 @@
 		79DD2093A1D9674C94359FC8 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				3EAE1F31D8D0AA94CA6C11EB /* Pods-Runner.debug.xcconfig */,
-				05E1B2A0E6844572ADA81174 /* Pods-Runner.release.xcconfig */,
-				7BEF44ABFEF585D64D3F266C /* Pods-Runner.profile.xcconfig */,
+				BCE5BC40273DCC009E2FACB7 /* Pods-Runner.debug.xcconfig */,
+				C6416282AC56269448D7DA99 /* Pods-Runner.release.xcconfig */,
+				C6FD350374F47AFA34911C58 /* Pods-Runner.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -159,6 +176,7 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
+				78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -233,21 +251,25 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				EA10FC42B68E41E75A052FAA /* [CP] Check Pods Manifest.lock */,
+				511FFA76807DE636962DBF91 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				765A5A922F35CD8B0003FF7D /* Embed Frameworks */,
+				76B714E4300E58B2004DE37A /* Embed Foundation Extensions */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				5D78F615DF2D966539B34DE2 /* [CP] Embed Pods Frameworks */,
-				4AA9AE39AD56A64A1F16E548 /* [CP] Copy Pods Resources */,
+				C7E5B2C65EE0A4D64ECC826B /* [CP] Embed Pods Frameworks */,
+				DF2C78ED8C8F648520DF8C43 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = Runner;
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			productName = Runner;
 			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
 			productType = "com.apple.product-type.application";
@@ -259,6 +281,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
+				LastSwiftUpdateCheck = 2610;
 				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
@@ -281,6 +304,9 @@
 				Base,
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
+			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
+			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -329,85 +355,77 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
 		};
-		4AA9AE39AD56A64A1F16E548 /* [CP] Copy Pods Resources */ = {
+		511FFA76807DE636962DBF91 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
-			name = "[CP] Copy Pods Resources";
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		5D78F615DF2D966539B34DE2 /* [CP] Embed Pods Frameworks */ = {
+		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
 			inputPaths = (
 			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
+			name = "Run Script";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
+		C7E5B2C65EE0A4D64ECC826B /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "Run Script";
-			outputPaths = (
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
 		};
-		EA10FC42B68E41E75A052FAA /* [CP] Check Pods Manifest.lock */ = {
+		DF2C78ED8C8F648520DF8C43 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -509,7 +527,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -537,8 +555,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.0.12;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.HMGPatientApp;
+				MARKETING_VERSION = 4.6.044;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -643,7 +661,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -694,7 +712,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -724,8 +742,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.0.12;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.HMGPatientApp;
+				MARKETING_VERSION = 4.6.044;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -754,8 +772,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.0.12;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.HMGPatientApp;
+				MARKETING_VERSION = 4.6.044;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -798,6 +816,20 @@
 			defaultConfigurationName = Debug;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCLocalSwiftPackageReference section */
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCLocalSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 00000000..6cf27c0f
--- /dev/null
+++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,194 @@
+{
+  "pins" : [
+    {
+      "identity" : "abseil-cpp-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/abseil-cpp-binary.git",
+      "state" : {
+        "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5",
+        "version" : "1.2024072200.0"
+      }
+    },
+    {
+      "identity" : "app-check",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/app-check.git",
+      "state" : {
+        "revision" : "3e33dd27dd4c69bd81c7c81fe61d8ccf58846902",
+        "version" : "11.3.1"
+      }
+    },
+    {
+      "identity" : "dkcamera",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKCamera",
+      "state" : {
+        "branch" : "master",
+        "revision" : "5c691d11014b910aff69f960475d70e65d9dcc96"
+      }
+    },
+    {
+      "identity" : "dkimagepickercontroller",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKImagePickerController",
+      "state" : {
+        "branch" : "4.3.9",
+        "revision" : "0bdfeacefa308545adde07bef86e349186335915"
+      }
+    },
+    {
+      "identity" : "dkphotogallery",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKPhotoGallery",
+      "state" : {
+        "branch" : "master",
+        "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d"
+      }
+    },
+    {
+      "identity" : "firebase-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/firebase-ios-sdk",
+      "state" : {
+        "revision" : "fdc352fabaf5916e7faa1f96ad02b1957e93e5a5",
+        "version" : "11.15.0"
+      }
+    },
+    {
+      "identity" : "flutterfire",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/flutterfire",
+      "state" : {
+        "revision" : "dadb0fd27bc9afe4dee4f23326a4a9ba238258ac",
+        "version" : "3.15.2-firebase-core-swift"
+      }
+    },
+    {
+      "identity" : "google-ads-on-device-conversion-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk",
+      "state" : {
+        "revision" : "a2d0f1f1666de591eb1a811f40b1706f5c63a2ed",
+        "version" : "2.3.0"
+      }
+    },
+    {
+      "identity" : "googleappmeasurement",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleAppMeasurement.git",
+      "state" : {
+        "revision" : "45ce435e9406d3c674dd249a042b932bee006f60",
+        "version" : "11.15.0"
+      }
+    },
+    {
+      "identity" : "googledatatransport",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleDataTransport.git",
+      "state" : {
+        "revision" : "ba3358d3c3dbae8ef230b58a46b97ad65e84e974",
+        "version" : "10.1.1"
+      }
+    },
+    {
+      "identity" : "googleutilities",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleUtilities.git",
+      "state" : {
+        "revision" : "9f183ae842be978784f2963a343682e0c46d8fb3",
+        "version" : "8.1.2"
+      }
+    },
+    {
+      "identity" : "grpc-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/grpc-binary.git",
+      "state" : {
+        "revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6",
+        "version" : "1.69.1"
+      }
+    },
+    {
+      "identity" : "gtm-session-fetcher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/gtm-session-fetcher.git",
+      "state" : {
+        "revision" : "c756a29784521063b6a1202907e2cc47f41b667c",
+        "version" : "4.5.0"
+      }
+    },
+    {
+      "identity" : "interop-ios-for-google-sdks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
+      "state" : {
+        "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe",
+        "version" : "101.0.0"
+      }
+    },
+    {
+      "identity" : "leveldb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/leveldb.git",
+      "state" : {
+        "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
+        "version" : "1.22.5"
+      }
+    },
+    {
+      "identity" : "nanopb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/nanopb.git",
+      "state" : {
+        "revision" : "3851d94a41890dea16dc3db34caf60e585cb4163",
+        "version" : "2.30910.1"
+      }
+    },
+    {
+      "identity" : "promises",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/promises.git",
+      "state" : {
+        "revision" : "f4a19a3c313dc2616c70bb49d29a799fb16be837",
+        "version" : "2.4.1"
+      }
+    },
+    {
+      "identity" : "sdwebimage",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/SDWebImage",
+      "state" : {
+        "revision" : "2de3a496eaf6df9a1312862adcfd54acd73c39c0",
+        "version" : "5.21.7"
+      }
+    },
+    {
+      "identity" : "swift-protobuf",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-protobuf.git",
+      "state" : {
+        "revision" : "55d7a1cc5666b85c13464aea1c4b4a90feccb4c8",
+        "version" : "1.38.1"
+      }
+    },
+    {
+      "identity" : "swiftygif",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kirualex/SwiftyGif.git",
+      "state" : {
+        "revision" : "4430cbc148baa3907651d40562d96325426f409a",
+        "version" : "5.4.5"
+      }
+    },
+    {
+      "identity" : "tocropviewcontroller",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/TimOliver/TOCropViewController",
+      "state" : {
+        "revision" : "d4a6d8100f4b886fdbc8ae399bf144ff3e9afb7e",
+        "version" : "2.8.0"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index e3773d42..c3fedb29 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -5,6 +5,24 @@
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Prepare Flutter Framework Script"
+               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+                     BuildableName = "Runner.app"
+                     BlueprintName = "Runner"
+                     ReferencedContainer = "container:Runner.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
diff --git a/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 00000000..6cf27c0f
--- /dev/null
+++ b/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,194 @@
+{
+  "pins" : [
+    {
+      "identity" : "abseil-cpp-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/abseil-cpp-binary.git",
+      "state" : {
+        "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5",
+        "version" : "1.2024072200.0"
+      }
+    },
+    {
+      "identity" : "app-check",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/app-check.git",
+      "state" : {
+        "revision" : "3e33dd27dd4c69bd81c7c81fe61d8ccf58846902",
+        "version" : "11.3.1"
+      }
+    },
+    {
+      "identity" : "dkcamera",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKCamera",
+      "state" : {
+        "branch" : "master",
+        "revision" : "5c691d11014b910aff69f960475d70e65d9dcc96"
+      }
+    },
+    {
+      "identity" : "dkimagepickercontroller",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKImagePickerController",
+      "state" : {
+        "branch" : "4.3.9",
+        "revision" : "0bdfeacefa308545adde07bef86e349186335915"
+      }
+    },
+    {
+      "identity" : "dkphotogallery",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKPhotoGallery",
+      "state" : {
+        "branch" : "master",
+        "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d"
+      }
+    },
+    {
+      "identity" : "firebase-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/firebase-ios-sdk",
+      "state" : {
+        "revision" : "fdc352fabaf5916e7faa1f96ad02b1957e93e5a5",
+        "version" : "11.15.0"
+      }
+    },
+    {
+      "identity" : "flutterfire",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/flutterfire",
+      "state" : {
+        "revision" : "dadb0fd27bc9afe4dee4f23326a4a9ba238258ac",
+        "version" : "3.15.2-firebase-core-swift"
+      }
+    },
+    {
+      "identity" : "google-ads-on-device-conversion-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk",
+      "state" : {
+        "revision" : "a2d0f1f1666de591eb1a811f40b1706f5c63a2ed",
+        "version" : "2.3.0"
+      }
+    },
+    {
+      "identity" : "googleappmeasurement",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleAppMeasurement.git",
+      "state" : {
+        "revision" : "45ce435e9406d3c674dd249a042b932bee006f60",
+        "version" : "11.15.0"
+      }
+    },
+    {
+      "identity" : "googledatatransport",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleDataTransport.git",
+      "state" : {
+        "revision" : "ba3358d3c3dbae8ef230b58a46b97ad65e84e974",
+        "version" : "10.1.1"
+      }
+    },
+    {
+      "identity" : "googleutilities",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleUtilities.git",
+      "state" : {
+        "revision" : "9f183ae842be978784f2963a343682e0c46d8fb3",
+        "version" : "8.1.2"
+      }
+    },
+    {
+      "identity" : "grpc-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/grpc-binary.git",
+      "state" : {
+        "revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6",
+        "version" : "1.69.1"
+      }
+    },
+    {
+      "identity" : "gtm-session-fetcher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/gtm-session-fetcher.git",
+      "state" : {
+        "revision" : "c756a29784521063b6a1202907e2cc47f41b667c",
+        "version" : "4.5.0"
+      }
+    },
+    {
+      "identity" : "interop-ios-for-google-sdks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
+      "state" : {
+        "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe",
+        "version" : "101.0.0"
+      }
+    },
+    {
+      "identity" : "leveldb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/leveldb.git",
+      "state" : {
+        "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
+        "version" : "1.22.5"
+      }
+    },
+    {
+      "identity" : "nanopb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/nanopb.git",
+      "state" : {
+        "revision" : "3851d94a41890dea16dc3db34caf60e585cb4163",
+        "version" : "2.30910.1"
+      }
+    },
+    {
+      "identity" : "promises",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/promises.git",
+      "state" : {
+        "revision" : "f4a19a3c313dc2616c70bb49d29a799fb16be837",
+        "version" : "2.4.1"
+      }
+    },
+    {
+      "identity" : "sdwebimage",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/SDWebImage",
+      "state" : {
+        "revision" : "2de3a496eaf6df9a1312862adcfd54acd73c39c0",
+        "version" : "5.21.7"
+      }
+    },
+    {
+      "identity" : "swift-protobuf",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-protobuf.git",
+      "state" : {
+        "revision" : "55d7a1cc5666b85c13464aea1c4b4a90feccb4c8",
+        "version" : "1.38.1"
+      }
+    },
+    {
+      "identity" : "swiftygif",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kirualex/SwiftyGif.git",
+      "state" : {
+        "revision" : "4430cbc148baa3907651d40562d96325426f409a",
+        "version" : "5.4.5"
+      }
+    },
+    {
+      "identity" : "tocropviewcontroller",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/TimOliver/TOCropViewController",
+      "state" : {
+        "revision" : "d4a6d8100f4b886fdbc8ae399bf144ff3e9afb7e",
+        "version" : "2.8.0"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
index dc11bbed..8a0a6208 100644
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -4,22 +4,58 @@ import FirebaseCore
 import FirebaseMessaging
 import GoogleMaps
 @main
-@objc class AppDelegate: FlutterAppDelegate {
+@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
+    func didInitializeImplicitFlutterEngine(_ engineBridge: any FlutterImplicitEngineBridge) {
+        GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
+        
+//        GMSServices.provideAPIKey("AIzaSyB6TERnxIr0yJ3qG4ULBZbu0sAD4tGqtng")
+//        FirebaseApp.configure()
+//        initializePlatformChannels()
+        
+    }
+    
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
     GMSServices.provideAPIKey("AIzaSyB6TERnxIr0yJ3qG4ULBZbu0sAD4tGqtng")
-    FirebaseApp.configure()
+//    FirebaseApp.configure()
     initializePlatformChannels()
-    GeneratedPluginRegistrant.register(with: self)
+//    GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
     func initializePlatformChannels(){
-       if let mainViewController = window?.rootViewController as? FlutterViewController{ // platform initialization suppose to be in foreground
-               HMGPenguinInPlatformBridge.initialize(flutterViewController: mainViewController)
-           }
-        }
+
+        DispatchQueue.main.async { [weak self] in
+                guard let self = self else { return }
+                
+                // 1. Try accessing window via AppDelegate (legacy/single-window setup)
+                var controller = self.window?.rootViewController as? FlutterViewController
+                
+                // 2. Fallback to UIWindowScene active window (modern iOS architecture)
+                if controller == nil {
+                    controller = UIApplication.shared.connectedScenes
+                        .compactMap { $0 as? UIWindowScene }
+                        .flatMap { $0.windows }
+                        .first(where: { $0.isKeyWindow })?
+                        .rootViewController as? FlutterViewController
+                }
+                
+                // 3. Perform initialization once FlutterViewController is available
+                if let mainViewController = controller {
+                    HMGPenguinInPlatformBridge.initialize(flutterViewController: mainViewController)
+                } else {
+                    print("⚠️ FlutterViewController not ready yet for initializePlatformChannels.")
+                }
+            }
+        
+        
+//        if let mainViewController = window?.rootViewController as? FlutterViewController{ // platform initialization suppose to be in foreground
+//               HMGPenguinInPlatformBridge.initialize(flutterViewController: mainViewController)
+//           }
+    
+    }
+    
     override func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken:Data){
 //           Messaging.messaging().apnsToken = deviceToken
           super.application(application, didRegisterForRemoteNotificationsWithDeviceToken: deviceToken)
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index 65b74d7e..1eb27a20 100644
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1 +1,128 @@
-{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"}]}
\ No newline at end of file
+{
+  "images" : [
+    {
+      "filename" : "Icon-App-20x20@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Icon-App-20x20@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Icon-App-29x29@1x.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-29x29@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-29x29@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-40x40@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-App-40x40@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-App-60x60@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "Icon-App-60x60@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "Icon-App-20x20@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Icon-App-20x20@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Icon-App-29x29@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-29x29@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-40x40@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-App-40x40@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-App-76x76@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Icon-App-76x76@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "icon.jpg",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    },
+    {
+      "filename" : "Icon-App-76x76@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "76x76"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index 0e65243a..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
deleted file mode 100644
index 2e4c7963..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
deleted file mode 100644
index 59435c76..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index 20855aad..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
deleted file mode 100644
index 11d35da4..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
deleted file mode 100644
index 93523cbe..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index 2e4c7963..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
deleted file mode 100644
index 00bb8dbd..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
deleted file mode 100644
index 3eaa1fb6..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
deleted file mode 100644
index 3eaa1fb6..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
deleted file mode 100644
index fd80aa41..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index 39c7958d..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
deleted file mode 100644
index 47a96a43..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
deleted file mode 100644
index 8c4ca7b0..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ
diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist
index a9b1f53a..633037cb 100644
--- a/ios/Runner/GoogleService-Info.plist
+++ b/ios/Runner/GoogleService-Info.plist
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CLIENT_ID</key>
+	<string>815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt</string>
 	<key>ANDROID_CLIENT_ID</key>
 	<string>815750722565-m14h8mkosm7cnq6uh6rhqr54dn02d705.apps.googleusercontent.com</string>
 	<key>API_KEY</key>
@@ -11,11 +15,11 @@
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
-	<string>com.cloudsolutions.HMGPatientApp</string>
+	<string>com.HMG.HMG-Smartphone</string>
 	<key>PROJECT_ID</key>
 	<string>api-project-815750722565</string>
 	<key>STORAGE_BUCKET</key>
-	<string>api-project-815750722565.firebasestorage.app</string>
+	<string>api-project-815750722565.appspot.com</string>
 	<key>IS_ADS_ENABLED</key>
 	<false></false>
 	<key>IS_ANALYTICS_ENABLED</key>
@@ -27,7 +31,7 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:815750722565:ios:34ec03c09e02e21f3c186c</string>
+	<string>1:815750722565:ios:328ec247a81a2ca23c186c</string>
 	<key>DATABASE_URL</key>
 	<string>https://api-project-815750722565.firebaseio.com</string>
 </dict>
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index caa84333..85d84646 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -35,6 +35,7 @@
 		<string>comgooglemaps</string>
 		<string>baidumap</string>
 		<string>iosamap</string>
+		<string>whatsapp</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
@@ -86,17 +87,38 @@
 	<key>NSMicrophoneUsageDescription</key>
 	<string>This app requires microphone access to enable virtual consultation between patient &amp; doctor</string>
 	<key>NSMotionUsageDescription</key>
-	<string>This app requires access to motion detection to count your daily steps.</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>This app requires photo library access to select image as document &amp; upload it.</string>
+	<string>This app requires motion detection access to function properly.</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
 	<string>This app requires photo library access to upload profile picture and documents.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This app requires photo library access to select image as document &amp; upload it.</string>
 	<key>NSRemindersUsageDescription</key>
 	<string>This app requires calendar access to set reminders for Virtual &amp; Normal Appointments.</string>
 	<key>NSSpeechRecognitionUsageDescription</key>
 	<string>This app requires speech recognition access to access voice command features.</string>
 	<key>NSUserActivityTypes</key>
 	<array/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneClassName</key>
+					<string>UIWindowScene</string>
+					<key>UISceneConfigurationName</key>
+					<string>flutter</string>
+					<key>UISceneDelegateClassName</key>
+					<string>FlutterSceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UIBackgroundModes</key>
diff --git a/lib/app_closed_page.dart b/lib/app_closed_page.dart
new file mode 100644
index 00000000..2cda8935
--- /dev/null
+++ b/lib/app_closed_page.dart
@@ -0,0 +1,104 @@
+import 'dart:io';
+
+import 'package:clarity_flutter/clarity_flutter.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:freerasp/freerasp.dart';
+import 'package:hmg_patient_app_new/core/app_assets.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
+import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
+import 'package:hmg_patient_app_new/core/utils/utils.dart';
+import 'package:hmg_patient_app_new/services/security_service.dart';
+import 'package:hmg_patient_app_new/theme/colors.dart';
+
+import 'generated/locale_keys.g.dart';
+import 'widgets/buttons/custom_button.dart';
+
+class AppClosedPage extends StatefulWidget {
+  const AppClosedPage({super.key});
+
+  @override
+  State<AppClosedPage> createState() => _AppClosedPageState();
+}
+
+class _AppClosedPageState extends State<AppClosedPage> {
+  @override
+  void initState() {
+    // Clarity.setCurrentScreenName('Unsafe Device Page');
+    Talsec.instance.detachListener();
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: AppColors.whiteColor,
+      body: SafeArea(
+        child: Padding(
+          padding: EdgeInsets.symmetric(horizontal: 24.w),
+          child: Column(
+            mainAxisSize: MainAxisSize.max,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              // Logo
+              Utils.buildImgWithAssets(icon: AppAssets.hmgLogo, width: MediaQuery.of(context).size.width * 0.7, height: 90.h, fit: BoxFit.contain),
+              SizedBox(height: 32.h),
+              Text(
+                LocaleKeys.importantNotice.tr(context: context),
+                style: TextStyle(
+                  fontSize: 28.f,
+                  fontWeight: FontWeight.bold,
+                  color: AppColors.textColor,
+                ),
+                textAlign: TextAlign.center,
+              ),
+              SizedBox(height: 16.h),
+              // Description
+              Text(
+                LocaleKeys.appDecommissionedText.tr(context: context),
+                style: TextStyle(
+                  fontSize: 14.f,
+                  color: Colors.black87,
+                ),
+                textAlign: TextAlign.center,
+              ),
+              SizedBox(height: 24.h),
+              Text(
+                LocaleKeys.appDecommissionedSubText.tr(context: context),
+                style: TextStyle(fontSize: 14.f, color: AppColors.textColorLight, fontStyle: FontStyle.italic),
+                textAlign: TextAlign.center,
+              ),
+              SizedBox(height: 48.h),
+              CustomButton(
+                text: LocaleKeys.downloadApp.tr(context: context),
+                onPressed: () {
+                  if (Platform.isAndroid) {
+                    Utils.openWebView(
+                      url: "https://play.google.com/store/apps/details?id=com.ejada.hmg",
+                    );
+                  }
+                  if (Platform.isIOS) {
+                    Utils.openWebView(
+                      url: "https://itunes.apple.com/app/id733503978",
+                    );
+                  }
+                },
+                backgroundColor: AppColors.primaryRedColor,
+                borderColor: AppColors.primaryRedColor,
+                textColor: AppColors.whiteColor,
+                fontSize: (isFoldable || isTablet) ? 12.f : 14.f,
+                fontWeight: FontWeight.w600,
+                borderRadius: 12.r,
+                padding: EdgeInsets.symmetric(horizontal: 10.w),
+                // height: isTablet || isFoldable ? 46.h : 40.h,
+                height: 56.h,
+                iconColor: AppColors.primaryRedColor,
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/core/api/api_client.dart b/lib/core/api/api_client.dart
index 4c961843..1bccb154 100644
--- a/lib/core/api/api_client.dart
+++ b/lib/core/api/api_client.dart
@@ -138,8 +138,7 @@ class ApiClientImp implements ApiClient {
         } else {}
 
         if (body.containsKey('isDentalAllowedBackend')) {
-          body['isDentalAllowedBackend'] =
-              body.containsKey('isDentalAllowedBackend') ? body['isDentalAllowedBackend'] ?? IS_DENTAL_ALLOWED_BACKEND : IS_DENTAL_ALLOWED_BACKEND;
+          body['isDentalAllowedBackend'] = body.containsKey('isDentalAllowedBackend') ? body['isDentalAllowedBackend'] ?? IS_DENTAL_ALLOWED_BACKEND : IS_DENTAL_ALLOWED_BACKEND;
         }
 
         if (!body.containsKey('IsPublicRequest')) {
@@ -211,7 +210,7 @@ class ApiClientImp implements ApiClient {
         }
 
         // body['TokenID'] = "@dm!n";
-        // body['PatientID'] = 5422188;
+        // body['PatientID'] = 1009156;
         // body['PatientID'] = 53320;
         // body['PatientTypeID'] = 1;
         // body['PatientOutSA'] = 0;
@@ -224,9 +223,9 @@ class ApiClientImp implements ApiClient {
         // body['PatientID'] = 809289;
       }
 
-      if (!url.contains("/paymentApi")) {
-        body['IsNewFlutterApp'] = true;
-      }
+      // if (!url.contains("/paymentApi")) {
+      //   body['IsNewFlutterApp'] = true;
+      // }
 
       body.removeWhere((key, value) => value == null);
     }
@@ -271,11 +270,11 @@ class ApiClientImp implements ApiClient {
       Clarity.setCustomTag('api_err_url', _getEndofUrl(url.trim()));
       Clarity.setCustomTag('api_err_endpoint', _getEndpointName(endPoint));
       Clarity.setCustomTag('api_err_method', 'POST');
-      
+
       if (_appState.isAuthenticated) {
         Clarity.setCustomTag('api_err_user_id', _appState.getAuthenticatedUser()!.patientId.toString());
       }
-      
+
       Clarity.sendCustomEvent('api_socket_exception');
 
       return;
@@ -283,19 +282,19 @@ class ApiClientImp implements ApiClient {
       final message = e.message.contains('Connection reset by peer') ? LocaleKeys.networkConnectionReset.tr() : LocaleKeys.networkErrorMessage.tr();
       onFailure(message, -1, failureType: ConnectivityFailure(message));
       _analytics.errorTracking.log(endPoint, error: "ClientException: $e");
-      
+
       // Enhanced Clarity logging
       Clarity.setCustomTag('api_err_type', 'client_exception');
       Clarity.setCustomTag('api_err_url', _getEndofUrl(url.trim()));
       Clarity.setCustomTag('api_err_endpoint', _getEndpointName(endPoint));
       Clarity.setCustomTag('api_err_method', 'POST');
-      
+
       if (_appState.isAuthenticated) {
         Clarity.setCustomTag('api_err_user_id', _appState.getAuthenticatedUser()!.patientId.toString());
       }
-      
+
       Clarity.sendCustomEvent('api_client_exception');
-      
+
       return;
     } on TimeoutException catch (_) {
       final message = LocaleKeys.networkTimeout.tr();
@@ -307,36 +306,36 @@ class ApiClientImp implements ApiClient {
       Clarity.setCustomTag('api_err_url', _getEndofUrl(url.trim()));
       Clarity.setCustomTag('api_err_endpoint', _getEndpointName(endPoint));
       Clarity.setCustomTag('api_err_method', 'POST');
-      
+
       if (_appState.isAuthenticated) {
         Clarity.setCustomTag('api_err_user_id', _appState.getAuthenticatedUser()!.patientId.toString());
       }
-      
+
       Clarity.sendCustomEvent('api_timeout');
-      
+
       return;
     } catch (e) {
       final message = LocaleKeys.networkUnknownError.tr();
       onFailure(message, -1, failureType: ConnectivityFailure(message));
       _analytics.errorTracking.log(endPoint, error: "UnknownException: $e");
-      
+
       // Enhanced Clarity logging for unknown errors
       Clarity.setCustomTag('api_err_type', 'unknown_exception');
       Clarity.setCustomTag('api_err_url', _getEndofUrl(url.trim()));
       Clarity.setCustomTag('api_err_endpoint', _getEndpointName(endPoint));
       Clarity.setCustomTag('api_err_method', 'POST');
-      
+
       // Truncate exception message for Clarity
       final exceptionMsg = e.toString();
       final truncatedMsg = exceptionMsg.length > 252 ? '...${exceptionMsg.substring(exceptionMsg.length - 252)}' : exceptionMsg;
       Clarity.setCustomTag('api_err_exception', truncatedMsg);
-      
+
       if (_appState.isAuthenticated) {
         Clarity.setCustomTag('api_err_user_id', _appState.getAuthenticatedUser()!.patientId.toString());
       }
-      
+
       Clarity.sendCustomEvent('api_unknown_exception');
-      
+
       return;
     }
 
@@ -384,24 +383,19 @@ class ApiClientImp implements ApiClient {
             onFailure(
               parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
               statusCode,
-              failureType:
-                  UnAuthenticatedUserFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'] ?? "User is not Authenticated", url: url),
+              failureType: UnAuthenticatedUserFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'] ?? "User is not Authenticated", url: url),
             );
             // logApiEndpointError(endPoint, "session logged out", statusCode);
           }
           if (isAllowAny) {
-            onSuccess(parsed, statusCode,
-                messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
+            onSuccess(parsed, statusCode, messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
           } else if (parsed['IsAuthenticated'] == null) {
             if (parsed['isSMSSent'] == true) {
-              onSuccess(parsed, statusCode,
-                  messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
+              onSuccess(parsed, statusCode, messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
             } else if (parsed['MessageStatus'] == 1) {
-              onSuccess(parsed, statusCode,
-                  messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
+              onSuccess(parsed, statusCode, messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
             } else if (parsed['Result'] == 'OK') {
-              onSuccess(parsed, statusCode,
-                  messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
+              onSuccess(parsed, statusCode, messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
             } else {
               onFailure(
                 parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
@@ -411,8 +405,7 @@ class ApiClientImp implements ApiClient {
               logApiEndpointError(endPoint, parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
             }
           } else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) {
-            onSuccess(parsed, statusCode,
-                messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
+            onSuccess(parsed, statusCode, messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
           }
           // else if (parsed['IsAuthenticated'] == false) {
           //   onFailure(
@@ -424,8 +417,7 @@ class ApiClientImp implements ApiClient {
           // }
           else if (parsed['MessageStatus'] == 2 && parsed['IsAuthenticated']) {
             if (parsed['SameClinicApptList'] != null) {
-              onSuccess(parsed, statusCode,
-                  messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
+              onSuccess(parsed, statusCode, messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
             } else {
               if (parsed['message'] == null && parsed['ErrorEndUserMessage'] == null) {
                 if (parsed['ErrorSearchMsg'] == null) {
@@ -459,8 +451,7 @@ class ApiClientImp implements ApiClient {
             }
           } else {
             if (parsed['SameClinicApptList'] != null) {
-              onSuccess(parsed, statusCode,
-                  messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
+              onSuccess(parsed, statusCode, messageStatus: parsed['MessageStatus'], errorMessage: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']);
             } else {
               if (parsed['message'] != null) {
                 onFailure(
@@ -537,74 +528,74 @@ class ApiClientImp implements ApiClient {
         final message = e.message.contains('Connection reset by peer') ? LocaleKeys.networkConnectionReset.tr() : LocaleKeys.networkErrorMessage.tr();
         onFailure(message, -1);
         _analytics.errorTracking.log(endPoint, error: "SocketException: $e");
-        
+
         // Clarity logging for GET requests
         Clarity.setCustomTag('api_err_type', 'socket_exception');
         Clarity.setCustomTag('api_err_url', _getEndofUrl(url.trim()));
         Clarity.setCustomTag('api_err_endpoint', _getEndpointName(endPoint));
         Clarity.setCustomTag('api_err_method', 'GET');
-        
+
         if (_appState.isAuthenticated) {
           Clarity.setCustomTag('api_err_user_id', _appState.getAuthenticatedUser()!.patientId.toString());
         }
-        
+
         Clarity.sendCustomEvent('api_get_socket_exception');
-        
+
         return;
       } on http.ClientException catch (e) {
         final message = e.message.contains('Connection reset by peer') ? LocaleKeys.networkConnectionReset.tr() : LocaleKeys.networkErrorMessage.tr();
         onFailure(message, -1);
         _analytics.errorTracking.log(endPoint, error: "ClientException: $e");
-        
+
         Clarity.setCustomTag('api_err_type', 'client_exception');
         Clarity.setCustomTag('api_err_url', _getEndofUrl(url.trim()));
         Clarity.setCustomTag('api_err_endpoint', _getEndpointName(endPoint));
         Clarity.setCustomTag('api_err_method', 'GET');
-        
+
         if (_appState.isAuthenticated) {
           Clarity.setCustomTag('api_err_user_id', _appState.getAuthenticatedUser()!.patientId.toString());
         }
-        
+
         Clarity.sendCustomEvent('api_get_client_exception');
-        
+
         return;
       } on TimeoutException catch (_) {
         final message = LocaleKeys.networkTimeout.tr();
         onFailure(message, -1);
         _analytics.errorTracking.log(endPoint, error: "TimeoutException");
-        
+
         Clarity.setCustomTag('api_err_type', 'timeout');
         Clarity.setCustomTag('api_err_url', _getEndofUrl(url.trim()));
         Clarity.setCustomTag('api_err_endpoint', _getEndpointName(endPoint));
         Clarity.setCustomTag('api_err_method', 'GET');
-        
+
         if (_appState.isAuthenticated) {
           Clarity.setCustomTag('api_err_user_id', _appState.getAuthenticatedUser()!.patientId.toString());
         }
-        
+
         Clarity.sendCustomEvent('api_get_timeout');
-        
+
         return;
       } catch (e) {
         final message = LocaleKeys.networkUnknownError.tr();
         onFailure(message, -1);
         _analytics.errorTracking.log(endPoint, error: "UnknownException: $e");
-        
+
         Clarity.setCustomTag('api_err_type', 'unknown_exception');
         Clarity.setCustomTag('api_err_url', _getEndofUrl(url.trim()));
         Clarity.setCustomTag('api_err_endpoint', _getEndpointName(endPoint));
         Clarity.setCustomTag('api_err_method', 'GET');
-        
+
         final exceptionMsg = e.toString();
         final truncatedMsg = exceptionMsg.length > 252 ? '...${exceptionMsg.substring(exceptionMsg.length - 252)}' : exceptionMsg;
         Clarity.setCustomTag('api_err_exception', truncatedMsg);
-        
+
         if (_appState.isAuthenticated) {
           Clarity.setCustomTag('api_err_user_id', _appState.getAuthenticatedUser()!.patientId.toString());
         }
-        
+
         Clarity.sendCustomEvent('api_get_unknown_exception');
-        
+
         return;
       }
 
@@ -614,18 +605,18 @@ class ApiClientImp implements ApiClient {
       if (statusCode < 200 || statusCode >= 400) {
         onFailure(LocaleKeys.networkErrorWhileFetching.tr(), statusCode);
         logApiEndpointError(endPoint, LocaleKeys.networkErrorWhileFetching.tr(), statusCode);
-        
+
         // Clarity logging for GET status code errors
         Clarity.setCustomTag('api_err_type', 'status_code_error');
         Clarity.setCustomTag('api_err_url', _getEndofUrl(url.trim()));
         Clarity.setCustomTag('api_err_endpoint', _getEndpointName(endPoint));
         Clarity.setCustomTag('api_err_method', 'GET');
         Clarity.setCustomTag('api_err_status', statusCode.toString());
-        
+
         if (_appState.isAuthenticated) {
           Clarity.setCustomTag('api_err_user_id', _appState.getAuthenticatedUser()!.patientId.toString());
         }
-        
+
         Clarity.sendCustomEvent('api_get_status_error');
       } else {
         var parsed = json.decode(utf8.decode(response.bodyBytes));
@@ -813,7 +804,7 @@ class ApiClientImp implements ApiClient {
     // Extract the last part of the endpoint path for cleaner tracking
     const int clarityLimit = 100;
     final cleanEndpoint = endpoint.split('/').last;
-    
+
     if (cleanEndpoint.length <= clarityLimit) return cleanEndpoint;
     return '...${cleanEndpoint.substring(cleanEndpoint.length - (clarityLimit - 3))}';
   }
diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart
index 45d6f48c..72a97884 100644
--- a/lib/core/api_consts.dart
+++ b/lib/core/api_consts.dart
@@ -1,6 +1,7 @@
 import 'package:amazon_payfort/amazon_payfort.dart';
 import 'package:flutter_amazonpaymentservices/environment_type.dart';
 import 'package:hmg_patient_app_new/core/enums.dart';
+import 'package:myfatoorah_flutter/myfatoorah_flutter.dart';
 
 class ApiConsts {
   static const maxSmallScreen = 660;
@@ -44,12 +45,17 @@ class ApiConsts {
 // var payFortEnvironment = FortEnvironment.test;
 // var applePayMerchantId = "merchant.com.hmgwebservices.uat";
 
+  static var myFatoorahEnvironmentType = MFEnvironment.TEST;
+  static var myFatoorahCountry = MFCountry.SAUDIARABIA;
+
   static setBackendURLs() {
     switch (appEnvironmentType) {
       case AppEnvironmentTypeEnum.prod:
         baseUrl = "https://hmgwebservices.com/";
         payFortEnvironment = FortEnvironment.production;
         payFortEnvironmentType = EnvironmentType.production;
+        myFatoorahEnvironmentType = MFEnvironment.LIVE;
+        myFatoorahCountry = MFCountry.SAUDIARABIA;
         applePayMerchantId = "merchant.com.hmgwebservices";
         SERVICE_URL = "https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx";
         TAMARA_URL = "https://mdlaboratories.com/tamaralive/Home/Checkout";
@@ -66,6 +72,8 @@ class ApiConsts {
         baseUrl = "https://uat.hmgwebservices.com/";
         payFortEnvironment = FortEnvironment.test;
         payFortEnvironmentType = EnvironmentType.sandbox;
+        myFatoorahEnvironmentType = MFEnvironment.TEST;
+        myFatoorahCountry = MFCountry.KUWAIT;
         applePayMerchantId = "merchant.com.hmgwebservices.uat";
         SERVICE_URL = 'https://uat.hmgwebservices.com/HMGPayment/pages/SendPayFortRequest.aspx';
         TAMARA_URL = "https://epharmacy.hmg.com/tamara/Home/Checkout";
@@ -77,12 +85,13 @@ class ApiConsts {
         symptomsCheckerApi = symptomsCheckerApiUAT;
         symptomsCheckerUsername = 'guest_user';
         symptomsCheckerPassword = '123456';
-
         break;
       case AppEnvironmentTypeEnum.uat:
         baseUrl = "https://uat.hmgwebservices.com/";
         payFortEnvironment = FortEnvironment.test;
         payFortEnvironmentType = EnvironmentType.sandbox;
+        myFatoorahEnvironmentType = MFEnvironment.TEST;
+        myFatoorahCountry = MFCountry.KUWAIT;
         applePayMerchantId = "merchant.com.hmgwebservices.uat";
         SERVICE_URL = 'https://uat.hmgwebservices.com/HMGPayment/pages/SendPayFortRequest.aspx';
         TAMARA_URL = "https://epharmacy.hmg.com/tamara/Home/Checkout";
@@ -100,6 +109,8 @@ class ApiConsts {
         baseUrl = "https://webservices.hmg.com/";
         payFortEnvironment = FortEnvironment.production;
         payFortEnvironmentType = EnvironmentType.production;
+        myFatoorahEnvironmentType = MFEnvironment.LIVE;
+        myFatoorahCountry = MFCountry.SAUDIARABIA;
         applePayMerchantId = "merchant.com.hmgwebservices";
         SERVICE_URL = "https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx";
         TAMARA_URL = "https://epharmacy.hmg.com/tamara/Home/Checkout";
@@ -117,6 +128,8 @@ class ApiConsts {
         baseUrl = "https://uat.hmgwebservices.com/";
         payFortEnvironment = FortEnvironment.test;
         payFortEnvironmentType = EnvironmentType.sandbox;
+        myFatoorahEnvironmentType = MFEnvironment.TEST;
+        myFatoorahCountry = MFCountry.KUWAIT;
         applePayMerchantId = "merchant.com.hmgwebservices.uat";
         SERVICE_URL = 'https://uat.hmgwebservices.com/HMGPayment/pages/SendPayFortRequest.aspx';
         TAMARA_URL = "https://epharmacy.hmg.com/tamara/Home/Checkout";
@@ -134,6 +147,8 @@ class ApiConsts {
         baseUrl = "https://uat.hmgwebservices.com/";
         payFortEnvironment = FortEnvironment.test;
         payFortEnvironmentType = EnvironmentType.sandbox;
+        myFatoorahEnvironmentType = MFEnvironment.TEST;
+        myFatoorahCountry = MFCountry.KUWAIT;
         applePayMerchantId = "merchant.com.hmgwebservices.uat";
         SERVICE_URL = 'https://uat.hmgwebservices.com/HMGPayment/pages/SendPayFortRequest.aspx';
         TAMARA_URL = "https://epharmacy.hmg.com/tamara/Home/Checkout";
@@ -301,13 +316,18 @@ class ApiConsts {
   static String googleCloudStorageENTranslationFileBaseURL = "https://storage.googleapis.com/hmg-patientapp-translations";
 
   // ************     static values for Api   ****************
-  static final double appVersionID = 22.1;
+  static final double appVersionID = 21.6;
 
-  // static final double appVersionID = 50.7;
   static final int appChannelId = 3;
   static final String appIpAddress = "10.20.10.20";
   static final String appGeneralId = "Cs2020@2016\$2958";
   static final String sessionID = 'TMRhVmkGhOsvamErw';
+
+  // Notification Center GUIDs - Configure these values as per your notification center setup
+  static final String notificationCenterAppGUID = "SzFwWjI0TjhmSjZreDVsNmc3SDRSdWlxUG1h";
+  static final String notificationServiceGUID_Login = "D8BD5C76-4B50-4122-81D0-C3AA25DB08A2";
+  static final String notificationServiceGUID_Registration = "690D3595-A1E1-489A-B9AB-6270E83AD6ED";
+  static final String notificationServiceGUID_FamilyFile = "318285E4-6221-4A66-8FAF-2265D2B4B24C";
 }
 
 // PACKAGES and OFFERS
@@ -371,8 +391,6 @@ var DRIVER_LOCATION = 'Services/Patients.svc/REST/PatientER_GetDriverLocation';
 //weather
 var WEATHER_INDICATOR = 'Services/Weather.svc/REST/GetCityInfo';
 
-var GET_PRIVILEGE = 'Services/Patients.svc/REST/Service_Privilege';
-
 // Wifi Credentials
 var WIFI_CREDENTIALS = "Services/Patients.svc/Hmg_SMS_Get_By_ProjectID_And_PatientID";
 
@@ -864,8 +882,7 @@ var GET_CUSTOMER_INFO = "VerifyCustomer";
 
 //Pharmacy
 
-var GET_PHARMACY_CATEGORISE =
-    'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=0';
+var GET_PHARMACY_CATEGORISE = 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=0';
 var GET_OFFERS_CATEGORISE = 'discountcategories';
 var GET_OFFERS_PRODUCTS = 'offerproducts/';
 var GET_CATEGORISE_PARENT = 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=';
diff --git a/lib/core/app_assets.dart b/lib/core/app_assets.dart
index bd850985..bd6d7f87 100644
--- a/lib/core/app_assets.dart
+++ b/lib/core/app_assets.dart
@@ -385,6 +385,7 @@ class AppAssets {
   static const String hmg_pharmacy_logo = '$svgBasePath/hmg_pharmacy_logo.svg';
   static const String redeem_icon = '$svgBasePath/redeem_icon.svg';
   static const String expired_icon = '$svgBasePath/expired_icon.svg';
+  static const String icon_migrate = '$svgBasePath/Icon-migrate.svg';
 
   //Health Calculators
   static const String bodyfatcalc = '$svgBasePath/bfc.svg';
diff --git a/lib/core/app_state.dart b/lib/core/app_state.dart
index 0d015922..25753e1a 100644
--- a/lib/core/app_state.dart
+++ b/lib/core/app_state.dart
@@ -48,12 +48,19 @@ class AppState {
 
   bool isPaytabsEnabled = false;
   bool isPayfortHostedPageEnabled = true;
+  bool isMyFatoorahEnabled = false;
+  // bool isMyFatoorahEnabled = true;
 
   void setIsPaytabsEnabled(bool value) {
-    isPaytabsEnabled = value;
+    isPaytabsEnabled = false;
     // isPaytabsEnabled = true;
   }
 
+  void setIsMyFatoorahEnabled(bool value) {
+    isMyFatoorahEnabled = false;
+    // isMyFatoorahEnabled = true;
+  }
+
   void setIsPayfortHostedPageEnabled(bool value) {
     isPayfortHostedPageEnabled = value;
     // isPayfortHostedPageEnabled = false;
@@ -63,7 +70,7 @@ class AppState {
   bool isChildLoggedIn = false;
   bool isGMSAvailable = true;
   bool isAndroid = true;
-  bool isRatedVisible =false;
+  bool isRatedVisible = false;
   void setAuthenticatedUser(AuthenticatedUser? authenticatedUser, {bool isFamily = false}) {
     if (isFamily) {
       _authenticatedChildUser = authenticatedUser;
diff --git a/lib/core/dependencies.dart b/lib/core/dependencies.dart
index b6c7fb38..97458e1b 100644
--- a/lib/core/dependencies.dart
+++ b/lib/core/dependencies.dart
@@ -44,6 +44,7 @@ import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_rep
 import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart';
 import 'package:hmg_patient_app_new/features/my_invoices/my_invoices_repo.dart';
 import 'package:hmg_patient_app_new/features/my_invoices/my_invoices_view_model.dart';
+import 'package:hmg_patient_app_new/features/myfatoorah/myfatoorah_view_model.dart';
 import 'package:hmg_patient_app_new/features/notifications/notifications_repo.dart';
 import 'package:hmg_patient_app_new/features/notifications/notifications_view_model.dart';
 import 'package:hmg_patient_app_new/features/offers_and_discounts/offers_and_discounts_repo.dart';
@@ -84,7 +85,9 @@ import 'package:hmg_patient_app_new/services/logger_service.dart';
 import 'package:hmg_patient_app_new/services/navigation_service.dart';
 import 'package:hmg_patient_app_new/services/notification_service.dart';
 import 'package:hmg_patient_app_new/services/permission_service.dart';
+import 'package:hmg_patient_app_new/services/remote_config_service.dart';
 import 'package:hmg_patient_app_new/services/security_service.dart';
+import 'package:hmg_patient_app_new/features/occasion_theme/occasion_theme_view_model.dart';
 import 'package:hmg_patient_app_new/core/services/turnstile_service.dart';
 import 'package:hmg_patient_app_new/widgets/date_range_selector/viewmodel/date_range_calendar_model.dart';
 import 'package:hmg_patient_app_new/widgets/date_range_selector/viewmodel/date_range_view_model.dart';
@@ -380,8 +383,22 @@ class AppDependencies {
           errorHandlerService: getIt(),
         ));
 
+    getIt.registerLazySingleton<MyFatoorahViewModel>(() => MyFatoorahViewModel(
+          appState: getIt(),
+          errorHandlerService: getIt(),
+          payfortRepo: getIt(),
+        ));
+
     getIt.registerLazySingleton<ClarityService>(
       () => ClarityService(appState: getIt.get<AppState>()),
     );
+
+    // Remote-config-driven "occasion" theming (National Day, Eid, etc.).
+    getIt.registerLazySingleton<RemoteConfigService>(() => RemoteConfigServiceImp(loggerService: getIt()));
+    getIt.registerLazySingleton<OccasionThemeViewModel>(() => OccasionThemeViewModel(
+          remoteConfigService: getIt(),
+          cacheService: getIt(),
+          loggerService: getIt(),
+        ));
   }
 }
diff --git a/lib/core/myFatoorah_config.dart b/lib/core/myFatoorah_config.dart
new file mode 100644
index 00000000..582ced3c
--- /dev/null
+++ b/lib/core/myFatoorah_config.dart
@@ -0,0 +1,5 @@
+class MyFatoorahConfig {
+
+  static const String configAPIKey = "SK_KWT_0auB76h3Frhj7aUBSZa6H5ei792eZoGAPh0bBxKsrgtyjqKgf38MPnZqzGqagErb";
+
+}
\ No newline at end of file
diff --git a/lib/core/talsec_config.dart b/lib/core/talsec_config.dart
index 1603d419..d29d0dbb 100644
--- a/lib/core/talsec_config.dart
+++ b/lib/core/talsec_config.dart
@@ -2,12 +2,13 @@ import 'package:freerasp/freerasp.dart';
 
 final talsecConfig = TalsecConfig(
   androidConfig: AndroidConfig(
-    packageName: 'com.cloudsolutions.HMGPatientApp',
-    signingCertHashes: ['6tvWaoN5coG4SnfxGbdQlcLmM0J4ePQwDjrKIg+QkV0=', 'j6VEqVhrypHMIiXiFdRLDdGwjGaMGWY7KAdBJA+Z4Pc='], // Must be the release cert hash
+    packageName: 'com.ejada.hmg',
+    signingCertHashes: ['6tvWaoN5coG4SnfxGbdQlcLmM0J4ePQwDjrKIg+QkV0=', 'j6VEqVhrypHMIiXiFdRLDdGwjGaMGWY7KAdBJA+Z4Pc=', 'EKw2Bd3VYz//DYjDnJLxEh3uGqhNDIWubLmpwAx/A7U='], // Must be the release cert hash
     supportedStores: ['com.android.vending'], // Google Play Store
   ),
   iosConfig: IOSConfig(
-    bundleIds: ['com.cloudsolutions.HMGPatientApp'], // iOS Bundle ID
+    // bundleIds: ['com.cloudsolutions.HMGPatientApp'], // iOS Bundle ID
+    bundleIds: ['com.HMG.HMG-Smartphone'], // iOS Bundle ID
     teamId: '3A359E86ZF', // Found in Apple Developer portal
   ),
   watcherMail: '', // Required to receive security alerts
diff --git a/lib/core/utils/date_util.dart b/lib/core/utils/date_util.dart
index 7510786d..b57f912d 100644
--- a/lib/core/utils/date_util.dart
+++ b/lib/core/utils/date_util.dart
@@ -28,21 +28,21 @@ class DateUtil {
       const end = "+0300)";
       final startIndex = date.indexOf(start);
       final endIndex = date.indexOf(end, startIndex + start.length);
-      if (projectId == 2 || projectId == 3) {
-        return DateTime.fromMillisecondsSinceEpoch(
-                int.parse(
-                  date.substring(startIndex + start.length, endIndex),
-                ),
-                isUtc: true)
-            .add(Duration(hours: 4));
-      } else {
-        return DateTime.fromMillisecondsSinceEpoch(
+      // if (projectId == 2 || projectId == 3 || projectId == 4) {
+      //   return DateTime.fromMillisecondsSinceEpoch(
+      //           int.parse(
+      //             date.substring(startIndex + start.length, endIndex),
+      //           ),
+      //           isUtc: true)
+      //       .add(Duration(hours: 4));
+      // } else {
+      return DateTime.fromMillisecondsSinceEpoch(
               int.parse(
                 date.substring(startIndex + start.length, endIndex),
               ),
               isUtc: true)
           .add(Duration(hours: 3));
-      }
+      // }
     } else {
       return DateTime.now();
     }
diff --git a/lib/core/utils/push_notification_handler.dart b/lib/core/utils/push_notification_handler.dart
index 89f6969a..30e251e1 100644
--- a/lib/core/utils/push_notification_handler.dart
+++ b/lib/core/utils/push_notification_handler.dart
@@ -27,6 +27,7 @@ import 'package:hmg_patient_app_new/services/navigation_service.dart';
 import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:uuid/uuid.dart';
+import 'package:huawei_push/huawei_push.dart' as h_push;
 
 // Global tracking variables for call state
 bool _isCallInProgress = false;
@@ -425,10 +426,30 @@ class PushNotificationHandler {
 
     if (Platform.isAndroid) {
       try {
-        final fcmToken = await FirebaseMessaging.instance.getToken().catchError((err) {
-          log(err);
-        });
-        if (fcmToken != null) onToken(fcmToken);
+        if (!(await Utils.isGoogleServicesAvailable())) {
+          h_push.Push.enableLogger();
+          final result = await h_push.Push.setAutoInitEnabled(true);
+
+          h_push.Push.onNotificationOpenedApp.listen((message) {
+            // newMessage(toFirebaseRemoteMessage(message));
+          }, onError: (e) => print(e.toString()));
+
+          h_push.Push.onMessageReceivedStream.listen((message) {
+            // newMessage(toFirebaseRemoteMessage(message));
+          }, onError: (e) => print(e.toString()));
+
+          h_push.Push.getTokenStream.listen((token) {
+            onToken(token);
+          }, onError: (e) => print(e.toString()));
+          h_push.Push.getToken('');
+
+          h_push.Push.registerBackgroundMessageHandler(backgroundMessageHandler);
+        } else {
+          final fcmToken = await FirebaseMessaging.instance.getToken().catchError((err) {
+            log(err);
+          });
+          if (fcmToken != null) onToken(fcmToken);
+        }
         // }
       } catch (ex) {
         log("Notification Exception: $ex");
@@ -587,7 +608,6 @@ class PushNotificationHandler {
           // Permission.audio,
           // Permission.microphone,
         ].request();
-        log("=-=-=-=-=-=-=-=-=-=-");
         log(statuses[Permission.notification].toString());
       }
     } catch (_) {
diff --git a/lib/core/utils/request_utils.dart b/lib/core/utils/request_utils.dart
index 62399abd..b7691eb5 100644
--- a/lib/core/utils/request_utils.dart
+++ b/lib/core/utils/request_utils.dart
@@ -75,6 +75,12 @@ class RequestUtils {
       }
       request.isRegister = false;
     }
+
+    request.notificationCenterAppGUID = ApiConsts.notificationCenterAppGUID;
+    request.notificationCenterAppServiceGUID = isForRegister
+        ? ApiConsts.notificationServiceGUID_Registration
+        : ApiConsts.notificationServiceGUID_Login;
+
     return request;
   }
 
@@ -148,6 +154,12 @@ class RequestUtils {
     }
 
     request.deviceTypeID = request.searchType;
+
+    request.notificationCenterAppGUID = ApiConsts.notificationCenterAppGUID;
+    request.notificationCenterAppServiceGUID = (registeredData != null && registeredData.isRegister == true)
+        ? ApiConsts.notificationServiceGUID_Registration
+        : ApiConsts.notificationServiceGUID_Login;
+
     return request;
   }
 
@@ -220,6 +232,13 @@ class RequestUtils {
       request.familyRegionID = zipCode == CountryEnum.saudiArabia.countryCode ? 1 : 2;
     }
 
+    request.notificationCenterAppGUID = ApiConsts.notificationCenterAppGUID;
+    request.notificationCenterAppServiceGUID = isFormFamilyFile
+        ? ApiConsts.notificationServiceGUID_FamilyFile
+        : isForRegister
+            ? ApiConsts.notificationServiceGUID_Registration
+            : ApiConsts.notificationServiceGUID_Login;
+
     return request;
   }
 
diff --git a/lib/core/utils/utils.dart b/lib/core/utils/utils.dart
index d3107d72..0b5049cf 100644
--- a/lib/core/utils/utils.dart
+++ b/lib/core/utils/utils.dart
@@ -135,7 +135,7 @@ class Utils {
   static String convertStringToDateTime(String dateTimeString) {
     String timeString = dateTimeString;
     // Parse the time string using DateFormat
-    DateFormat format = DateFormat.Hms(["en-US"]); // 'Hms' = 'HH:mm:ss'
+    DateFormat format = DateFormat.Hms("en-US"); // 'Hms' = 'HH:mm:ss'
     DateTime time = format.parse(timeString);
 
     DateTime now = DateTime.now();
@@ -437,8 +437,8 @@ class Utils {
                           onCancelTap();
                         }
                       },
-                      backgroundColor: AppColors.primaryRedColor,
-                      borderColor: AppColors.primaryRedColor,
+                      backgroundColor: AppColors.criticalActionColor,
+                      borderColor: AppColors.criticalActionColor,
                       textColor: AppColors.whiteColor,
                       // icon: AppAssets.cancel,
                       // iconColor: AppColors.whiteColor,
@@ -516,8 +516,8 @@ class Utils {
                           onCancelTap();
                         }
                       },
-                      backgroundColor: AppColors.primaryRedColor,
-                      borderColor: AppColors.primaryRedColor,
+                      backgroundColor: AppColors.criticalActionColor,
+                      borderColor: AppColors.criticalActionColor,
                       textColor: AppColors.whiteColor,
                       // icon: AppAssets.cancel,
                       // iconColor: AppColors.whiteColor,
diff --git a/lib/features/authentication/authentication_repo.dart b/lib/features/authentication/authentication_repo.dart
index 291e4a9b..1c95d99a 100644
--- a/lib/features/authentication/authentication_repo.dart
+++ b/lib/features/authentication/authentication_repo.dart
@@ -222,6 +222,8 @@ class AuthenticationRepoImp implements AuthenticationRepo {
     if (isRegister) {
       newRequest["activationCode"] = activationCode ?? "0000";
       newRequest["isSilentLogin"] = activationCode == null;
+      newRequest.remove("NotificationCenterAppGUID");
+      newRequest.remove("NotificationCenterAppSeviceGUID");
     } else {
       newRequest.activationCode = activationCode ?? "0000";
       newRequest.isSilentLogin = activationCode == null;
diff --git a/lib/features/authentication/authentication_view_model.dart b/lib/features/authentication/authentication_view_model.dart
index a8719f29..e5324525 100644
--- a/lib/features/authentication/authentication_view_model.dart
+++ b/lib/features/authentication/authentication_view_model.dart
@@ -7,6 +7,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' show rootBundle;
 import 'package:get_it/get_it.dart';
+import 'package:hmg_patient_app_new/app_closed_page.dart';
 import 'package:hmg_patient_app_new/core/api_consts.dart';
 import 'package:hmg_patient_app_new/core/app_state.dart';
 import 'package:hmg_patient_app_new/core/cache_consts.dart';
@@ -1248,6 +1249,7 @@ class AuthenticationViewModel extends ChangeNotifier {
               _appState.setUserBloodGroup = activation.patientBlodType ?? "N/A";
               _appState.setIsPaytabsEnabled(Utils.havePrivilege(120));
               _appState.setIsPayfortHostedPageEnabled(Utils.havePrivilege(121));
+              _appState.setIsMyFatoorahEnabled(Utils.havePrivilege(123));
 
               // Refresh privileges after user switching to ensure correct privileges are loaded
               if (isSwitchUser) {
@@ -1419,7 +1421,8 @@ class AuthenticationViewModel extends ChangeNotifier {
       if (value) {
         LoaderBottomSheet.showLoader();
         success();
-        loginTypeEnum = (_appState.deviceTypeID == 1 ? LoginTypeEnum.face : LoginTypeEnum.fingerprint);
+        // loginTypeEnum = (_appState.deviceTypeID == 1 ? LoginTypeEnum.face : LoginTypeEnum.fingerprint);
+        loginTypeEnum = (Platform.isIOS ? LoginTypeEnum.face : LoginTypeEnum.fingerprint);
         if (!_appState.isAuthenticated) {
           //commenting this api to check either the same flow working or not because this api does not needed further if work fine we will remove this
           await getPatientDeviceData(loginTypeEnum.toInt);
@@ -1516,7 +1519,9 @@ class AuthenticationViewModel extends ChangeNotifier {
         LoaderBottomSheet.hideLoader();
         if (apiResponse.data["MessageStatus"] == 1) {
           LoaderBottomSheet.showLoader(loadingText: "Your medical file has been created successfully. \nPlease proceed to login.");
-          //TODO: Here We Need to Show a Dialog Of Something in the case of Success.
+          // Reset registration payload and clear healthId so subsequent logins hit the login endpoint
+          _appState.getUserRegistrationPayload.healthId = null;
+          _appState.setUserRegistrationPayload = RegistrationDataModelPayload();
           await clearDefaultInputValues(); // This will Clear All Default Values Of User.
           Future.delayed(Duration(seconds: 1), () {
             LoaderBottomSheet.hideLoader();
@@ -1796,6 +1801,7 @@ class AuthenticationViewModel extends ChangeNotifier {
           _appState.setProjectsDetailList(projectDetailListModel);
           _appState.setIsPaytabsEnabled(Utils.havePrivilege(120));
           _appState.setIsPayfortHostedPageEnabled(Utils.havePrivilege(121));
+          _appState.setIsMyFatoorahEnabled(Utils.havePrivilege(123));
         }
       },
     );
@@ -1824,11 +1830,13 @@ class AuthenticationViewModel extends ChangeNotifier {
       _appState.setSelectDeviceByImeiRespModelElement(null);
       _appState.setNHICUserData = CheckUserStatusResponseNHIC();
       _appState.setUserRegistrationPayload = RegistrationDataModelPayload();
+
       // Clear privilege lists
-      _appState.setPrivilegeModelList([]);
-      _appState.setVidaPlusProjectList([]);
-      _appState.setHMCProjectList([]);
-      _appState.setProjectsDetailList([]);
+      // _appState.setPrivilegeModelList([]);
+      // _appState.setVidaPlusProjectList([]);
+      // _appState.setHMCProjectList([]);
+      // _appState.setProjectsDetailList([]);
+
       _appState.clearUserSwitchPayloads();
       await clearDefaultInputValues();
       _navigationService.pushAndReplace(AppRoutes.landingScreen);
diff --git a/lib/features/authentication/models/request_models/send_activation_request_model.dart b/lib/features/authentication/models/request_models/send_activation_request_model.dart
index 6e2ddb93..840227ea 100644
--- a/lib/features/authentication/models/request_models/send_activation_request_model.dart
+++ b/lib/features/authentication/models/request_models/send_activation_request_model.dart
@@ -31,6 +31,8 @@ class SendActivationRequest {
   int? familyRegionID;
   bool? isPatientExcluded;
   String? turnstileToken;
+  String? notificationCenterAppGUID;
+  String? notificationCenterAppServiceGUID;
 
   SendActivationRequest(
       {this.patientMobileNumber,
@@ -64,7 +66,10 @@ class SendActivationRequest {
       this.status,
       this.familyRegionID,
       this.isPatientExcluded,
-      this.turnstileToken});
+      this.turnstileToken,
+      this.notificationCenterAppGUID,
+      this.notificationCenterAppServiceGUID
+});
 
   SendActivationRequest.fromJson(Map<String, dynamic> json) {
     patientMobileNumber = json['PatientMobileNumber'];
@@ -99,6 +104,8 @@ class SendActivationRequest {
     familyRegionID = json['FamilyRegionID'];
     isPatientExcluded = json['IsPatientExcluded'];
     turnstileToken = json['TurnstileToken'];
+    notificationCenterAppGUID = json['NotificationCenterAppGUID'];
+    notificationCenterAppServiceGUID = json['NotificationCenterAppSeviceGUID'];
   }
 
   Map<String, dynamic> toJson() {
@@ -141,6 +148,8 @@ class SendActivationRequest {
     if (turnstileToken != null) {
       data['TurnstileToken'] = turnstileToken;
     }
+    data['NotificationCenterAppGUID'] = notificationCenterAppGUID;
+    data['NotificationCenterAppSeviceGUID'] = notificationCenterAppServiceGUID;
     return data;
   }
 }
diff --git a/lib/features/book_appointments/book_appointments_repo.dart b/lib/features/book_appointments/book_appointments_repo.dart
index a705d84a..caf97cb8 100644
--- a/lib/features/book_appointments/book_appointments_repo.dart
+++ b/lib/features/book_appointments/book_appointments_repo.dart
@@ -37,7 +37,7 @@ abstract class BookAppointmentsRepo {
   Future<Either<Failure, GenericApiModel<dynamic>>> getDoctorFreeSlots(int clinicID, int projectID, int doctorId, bool isBookingForLiveCare,
       {bool continueDentalPlan = false, Function(dynamic)? onSuccess, Function(String)? onError});
 
-  Future<Either<Failure, GenericApiModel<dynamic>>> cancelAppointment({required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel});
+  Future<Either<Failure, GenericApiModel<dynamic>>> cancelAppointment({required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel, bool isReschedule = false});
 
   Future<Either<Failure, GenericApiModel<dynamic>>> insertSpecificAppointment(
       {required int docID,
@@ -483,12 +483,12 @@ class BookAppointmentsRepoImp implements BookAppointmentsRepo {
   }
 
   @override
-  Future<Either<Failure, GenericApiModel>> cancelAppointment({required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel}) async {
+  Future<Either<Failure, GenericApiModel>> cancelAppointment({required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel, bool isReschedule = false}) async {
     Map<String, dynamic> requestBody = {
       "AppointmentID": patientAppointmentHistoryResponseModel.appointmentNo,
       "ClinicID": patientAppointmentHistoryResponseModel.clinicID,
       "ProjectID": patientAppointmentHistoryResponseModel.projectID,
-      "CancelToReschadual": false,
+      "CancelToReschadual": isReschedule,
       "EndTime": patientAppointmentHistoryResponseModel.endTime,
       "StartTime": patientAppointmentHistoryResponseModel.startTime,
       "DoctorID": patientAppointmentHistoryResponseModel.doctorID,
diff --git a/lib/features/book_appointments/book_appointments_view_model.dart b/lib/features/book_appointments/book_appointments_view_model.dart
index a4530eee..5865a829 100644
--- a/lib/features/book_appointments/book_appointments_view_model.dart
+++ b/lib/features/book_appointments/book_appointments_view_model.dart
@@ -948,8 +948,8 @@ class BookAppointmentsViewModel extends ChangeNotifier {
     );
   }
 
-  Future<void> cancelAppointment({required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel, Function(dynamic)? onSuccess, Function(String)? onError}) async {
-    final result = await bookAppointmentsRepo.cancelAppointment(patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel);
+  Future<void> cancelAppointment({required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel, bool isReschedule = false, Function(dynamic)? onSuccess, Function(String)? onError}) async {
+    final result = await bookAppointmentsRepo.cancelAppointment(patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel, isReschedule: isReschedule);
 
     result.fold(
       (failure) async => await errorHandlerService.handleError(failure: failure),
@@ -1011,7 +1011,7 @@ class BookAppointmentsViewModel extends ChangeNotifier {
               appointmentDate: apiResponse.data["SameClinicApptList"][0]['AppointmentDate'],
             );
 
-            await cancelAppointment(patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel).then((val) async {
+            await cancelAppointment(patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel, isReschedule: true).then((val) async {
               // LoaderBottomSheet.hideLoader();
               Future.delayed(Duration(milliseconds: 50)).then((value) async {});
               // LoaderBottomSheet.showLoader(loadingText: LocaleKeys.bookingYourAppointment.tr());
@@ -1069,7 +1069,7 @@ class BookAppointmentsViewModel extends ChangeNotifier {
                       // loadingText: LocaleKeys.reschedulingAppo.tr(context: navigationService.navigatorKey.currentContext!),
                       loadingText: LocaleKeys.loadingText.tr(context: navigationService.navigatorKey.currentContext!),
                     );
-                    await cancelAppointment(patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel).then((val) async {
+                    await cancelAppointment(patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel, isReschedule: true).then((val) async {
                       LoaderBottomSheet.hideLoader();
                       Future.delayed(Duration(milliseconds: 50)).then((value) async {});
                       LoaderBottomSheet.showLoader(loadingText: LocaleKeys.bookingYourAppointment.tr());
@@ -1174,7 +1174,7 @@ class BookAppointmentsViewModel extends ChangeNotifier {
                       isCloseButtonVisible: false,
                       isDismissible: false,
                       isFullScreen: false);
-                  await cancelAppointment(patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel).then((val) async {
+                  await cancelAppointment(patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel, isReschedule: true).then((val) async {
                     navigationService.pop();
                     Future.delayed(Duration(milliseconds: 50)).then((value) async {});
                     LoaderBottomSheet.showLoader(loadingText: LocaleKeys.bookingYourAppointment.tr());
diff --git a/lib/features/common/models/family_file_request.dart b/lib/features/common/models/family_file_request.dart
index 047b9af0..e3802bd5 100644
--- a/lib/features/common/models/family_file_request.dart
+++ b/lib/features/common/models/family_file_request.dart
@@ -47,7 +47,7 @@ class FamilyFileRequest {
         "SharedPatientIdentificationID": sharedPatientIdentificationId,
         "SearchType": searchType,
         "SharedPatientMobileNumber": sharedPatientMobileNumber,
-        "zipCode": zipCode,
+        "ZipCode": zipCode,
         "isRegister": isRegister,
         "PatientStatus": patientStatus,
         "isDentalAllowedBackend": isDentalAllowedBackend,
diff --git a/lib/features/lab/lab_view_model.dart b/lib/features/lab/lab_view_model.dart
index 1c25ef9d..90ceacfe 100644
--- a/lib/features/lab/lab_view_model.dart
+++ b/lib/features/lab/lab_view_model.dart
@@ -209,12 +209,12 @@ class LabViewModel extends ChangeNotifier {
     final result = await labRepo.getLabResultReportPDF(labOrder: labOrder);
 
     result.fold(
-      (failure) async => await errorHandlerService.handleError(
-        failure: failure,
-        onOkPressed: () {
-          onError!(failure.message);
-        },
-      ),
+      // (failure) async => await errorHandlerService.handleError(
+      (failure) async {
+        if (onError != null) {
+          onError(failure.message);
+        }
+      },
       (apiResponse) {
         if (apiResponse.messageStatus == 2) {
           onError!(apiResponse.errorMessage!);
@@ -363,6 +363,7 @@ class LabViewModel extends ChangeNotifier {
             labOrder.doctorName = doctorName;
             labOrder.projectName = projectName;
             labOrder.orderDate = appointmentDate;
+            // labOrder.testDetails = apiResponse.data;
 
             currentlySelectedPatientOrder = labOrder;
 
@@ -881,8 +882,9 @@ class LabViewModel extends ChangeNotifier {
     List<Map<String, dynamic>> results = [];
     Map<String, dynamic> orderData = {"order_date": labOrder.orderDate ?? "", "clinic": labOrder.clinicDescription ?? "", "doctor": labOrder.doctorName ?? "", "results": []};
     List<Map<String, dynamic>> testResults = [];
-    if (labOrder.testDetails != null && labOrder.testDetails!.isNotEmpty) {
-      for (var testDetail in labOrder.testDetails!) {
+    // if (labOrder.testDetails != null && labOrder.testDetails!.isNotEmpty) {
+    //   for (var testDetail in labOrder.testDetails!) {
+      for (var testDetail in mainLabResultsByHospitalsList!) {
         LabResult? matchingResult =
             mainLabResultsByHospitalsList.firstWhere((labResult) => labResult.testCode == testDetail.testCode || labResult.description == testDetail.description, orElse: () => LabResult());
         testResults.add({
@@ -893,7 +895,7 @@ class LabViewModel extends ChangeNotifier {
           "flag": matchingResult.calculatedResultFlag ?? "N"
         });
       }
-    }
+    // }
     orderData["results"] = testResults;
     results.add(orderData);
 
diff --git a/lib/features/medical_file/medical_file_view_model.dart b/lib/features/medical_file/medical_file_view_model.dart
index 29f653ec..f3a4e2e8 100644
--- a/lib/features/medical_file/medical_file_view_model.dart
+++ b/lib/features/medical_file/medical_file_view_model.dart
@@ -864,4 +864,17 @@ class MedicalFileViewModel extends ChangeNotifier {
       print("❌ Error updating family member profile image in cache: $e");
     }
   }
+
+  bool checkExistingMedicalReportStatus(PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel) {
+    bool hasExistingRequest = false;
+
+    for (var report in patientMedicalReportRequestedList) {
+      if (report.clinicID == patientAppointmentHistoryResponseModel.clinicID && report.doctorID == patientAppointmentHistoryResponseModel.doctorID) {
+        hasExistingRequest = true;
+        break;
+      }
+    }
+
+    return hasExistingRequest;
+  }
 }
diff --git a/lib/features/my_appointments/my_appointments_repo.dart b/lib/features/my_appointments/my_appointments_repo.dart
index 87fb2ec2..ef3cd283 100644
--- a/lib/features/my_appointments/my_appointments_repo.dart
+++ b/lib/features/my_appointments/my_appointments_repo.dart
@@ -44,7 +44,7 @@ abstract class MyAppointmentsRepo {
 
   Future<Either<Failure, GenericApiModel<dynamic>>> generateAppointmentQR({required int clinicID, required int projectID, required String appointmentNo, required int isFollowUp});
 
-  Future<Either<Failure, GenericApiModel<dynamic>>> cancelAppointment({required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel});
+  Future<Either<Failure, GenericApiModel<dynamic>>> cancelAppointment({required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel, bool isReschedule = false});
 
   Future<Either<Failure, GenericApiModel<dynamic>>> confirmAppointment({required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel});
 
@@ -341,12 +341,12 @@ class MyAppointmentsRepoImp implements MyAppointmentsRepo {
   }
 
   @override
-  Future<Either<Failure, GenericApiModel>> cancelAppointment({required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel}) async {
+  Future<Either<Failure, GenericApiModel>> cancelAppointment({required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel, bool isReschedule = false}) async {
     Map<String, dynamic> requestBody = {
       "AppointmentID": patientAppointmentHistoryResponseModel.appointmentNo,
       "ClinicID": patientAppointmentHistoryResponseModel.clinicID,
       "ProjectID": patientAppointmentHistoryResponseModel.projectID,
-      "CancelToReschadual": false,
+      "CancelToReschadual": isReschedule,
       "EndTime": patientAppointmentHistoryResponseModel.endTime,
       "StartTime": patientAppointmentHistoryResponseModel.startTime,
       "DoctorID": patientAppointmentHistoryResponseModel.doctorID,
diff --git a/lib/features/my_appointments/my_appointments_view_model.dart b/lib/features/my_appointments/my_appointments_view_model.dart
index b153c556..f040fd82 100644
--- a/lib/features/my_appointments/my_appointments_view_model.dart
+++ b/lib/features/my_appointments/my_appointments_view_model.dart
@@ -639,8 +639,8 @@ class MyAppointmentsViewModel extends ChangeNotifier {
     );
   }
 
-  Future<void> cancelAppointment({required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel, Function(dynamic)? onSuccess, Function(String)? onError}) async {
-    final result = await myAppointmentsRepo.cancelAppointment(patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel);
+  Future<void> cancelAppointment({required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel, bool isReschedule = false, Function(dynamic)? onSuccess, Function(String)? onError}) async {
+    final result = await myAppointmentsRepo.cancelAppointment(patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel, isReschedule: isReschedule);
 
     result.fold(
       // (failure) async => await errorHandlerService.handleError(failure: failure),
@@ -772,9 +772,9 @@ class MyAppointmentsViewModel extends ChangeNotifier {
           patientMyDoctorsList = apiResponse.data!;
           isPatientMyDoctorsLoading = false;
 
-          if (!isTop8) {
-            isMyDoctorsDataToBeLoaded = false;
-          }
+          // if (!isTop8) {
+          isMyDoctorsDataToBeLoaded = false;
+          // }
 
           notifyListeners();
           if (onSuccess != null) {
diff --git a/lib/features/myfatoorah/myfatoorah_view_model.dart b/lib/features/myfatoorah/myfatoorah_view_model.dart
new file mode 100644
index 00000000..b76b251e
--- /dev/null
+++ b/lib/features/myfatoorah/myfatoorah_view_model.dart
@@ -0,0 +1,197 @@
+import 'dart:developer';
+
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hmg_patient_app_new/core/api_consts.dart';
+import 'package:hmg_patient_app_new/core/app_state.dart';
+import 'package:hmg_patient_app_new/core/cache_consts.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
+import 'package:hmg_patient_app_new/core/enums.dart';
+import 'package:hmg_patient_app_new/core/myFatoorah_config.dart';
+import 'package:hmg_patient_app_new/core/utils/utils.dart';
+import 'package:hmg_patient_app_new/features/payfort/models/payfort_request_insert_model.dart';
+import 'package:hmg_patient_app_new/features/payfort/models/payfort_response_insert_model.dart';
+import 'package:hmg_patient_app_new/features/payfort/payfort_repo.dart';
+import 'package:hmg_patient_app_new/generated/codegen_loader.g.dart';
+import 'package:hmg_patient_app_new/services/error_handler_service.dart';
+import 'package:hmg_patient_app_new/theme/colors.dart';
+import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
+import 'package:myfatoorah_flutter/myfatoorah_flutter.dart';
+
+class MyFatoorahViewModel extends ChangeNotifier {
+  final AppState appState;
+  final ErrorHandlerService errorHandlerService;
+  final PayfortRepo payfortRepo;
+
+  MyFatoorahViewModel({
+    required this.appState,
+    required this.errorHandlerService,
+    required this.payfortRepo,
+  });
+
+  // Payment Method ID
+  // 2: Credit/Debit Card
+  // 6: Mada
+
+  initiateCardPayment({
+    num amount = 10.0,
+    paymentDescription = "",
+    String displayCurrencyIso = MFCurrencyISO.KUWAIT_KWD,
+    required String paymentOption,
+    required String liveServiceID,
+    required String isScheduleLiveCare,
+    required String appointmentDate,
+    required String appointmentNo,
+    required String doctorID,
+    required String fileNumber,
+    required String serviceID,
+    required String projectID,
+    Function(MFGetPaymentStatusResponse)? onSuccess,
+    Function(String)? onError,
+  }) async {
+    LoaderBottomSheet.showLoader();
+    await MFSDK.init(MyFatoorahConfig.configAPIKey, ApiConsts.myFatoorahCountry, ApiConsts.myFatoorahEnvironmentType);
+
+    MFSDK.setUpActionBar(toolBarTitle: paymentDescription, toolBarTitleColor: "#ffffff", toolBarBackgroundColor: '#ED1C2B', isShowToolBar: true);
+
+    var request = MFExecutePaymentRequest(paymentMethodId: paymentOption.toLowerCase() == "mada" ? 6 : 2, invoiceValue: amount);
+    request.displayCurrencyIso = displayCurrencyIso;
+    request.customerName = ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat ? "Test test" : "${appState.getAuthenticatedUser()!.firstName} ${appState.getAuthenticatedUser()!.lastName}";
+    request.customerEmail = "CustID_${appState.getAuthenticatedUser()!.patientId}@HMG.com";
+
+    await MFSDK.executePayment(request, appState.isArabic() ? MFLanguage.ARABIC : MFLanguage.ENGLISH, (invoiceId) async {
+      PayfortRequestInsertModel payfortRequestInsertModel = PayfortRequestInsertModel();
+
+      payfortRequestInsertModel.commandType = "SALE";
+      payfortRequestInsertModel.amount = amount;
+      payfortRequestInsertModel.customerEmail = getIt.get<AppState>().getAuthenticatedUser()!.emailAddress;
+      payfortRequestInsertModel.orderDescription = paymentDescription;
+      payfortRequestInsertModel.serviceID = serviceID;
+      payfortRequestInsertModel.paymentOption = paymentOption;
+      payfortRequestInsertModel.clientRequestID = invoiceId;
+      payfortRequestInsertModel.projectID = projectID;
+      payfortRequestInsertModel.fileNumber = getIt.get<AppState>().getAuthenticatedUser()!.patientId.toString();
+      payfortRequestInsertModel.customerName = "${getIt.get<AppState>().getAuthenticatedUser()!.firstName} ${getIt.get<AppState>().getAuthenticatedUser()!.lastName}";
+      payfortRequestInsertModel.currency = getIt.get<AppState>().getAuthenticatedUser()!.outSa! == 0 ? "SAR" : "AED";
+      payfortRequestInsertModel.liveServiceID = liveServiceID;
+      payfortRequestInsertModel.latitude = getIt.get<AppState>().userLat.toString();
+      payfortRequestInsertModel.longitude = getIt.get<AppState>().userLong.toString();
+      payfortRequestInsertModel.merchantReference = invoiceId;
+      payfortRequestInsertModel.deviceToken = await Utils.getStringFromPrefs(CacheConst.pushToken);
+      payfortRequestInsertModel.language = getIt.get<AppState>().isArabic() ? "ar" : "en";
+      payfortRequestInsertModel.integrationId = "6"; // PayTabs integration ID
+      payfortRequestInsertModel.isSchedule = isScheduleLiveCare;
+      payfortRequestInsertModel.appointmentDate = appointmentDate;
+      payfortRequestInsertModel.appointmentNo = appointmentNo;
+      payfortRequestInsertModel.doctorID = doctorID;
+
+      // Call request insert API before payment
+      await paytabsRequestInsert(payfortRequestInsertModel: payfortRequestInsertModel);
+
+      LoaderBottomSheet.hideLoader();
+    }).then((value) async {
+      var valJson = value.toString();
+      print(valJson);
+
+      // // Create PayfortResponseInsertModel (same as Payfort implementation)
+      PayfortResponseInsertModel payfortResponseInsertModel = PayfortResponseInsertModel();
+
+      payfortResponseInsertModel.fortId = value.invoiceTransactions!.first.transactionId ?? "";
+      payfortResponseInsertModel.commandType = "SALE";
+      // payfortResponseInsertModel.amount = paytabsTransactionResponseModel.tranTotal ?? 0;
+      payfortResponseInsertModel.amount = amount;
+      payfortResponseInsertModel.sadadOLP = "";
+      payfortResponseInsertModel.paymentOption = value.invoiceTransactions!.first.paymentGateway ?? "";
+      payfortResponseInsertModel.customerIP = "";
+      payfortResponseInsertModel.eCI = "";
+      payfortResponseInsertModel.responseMessage = value.invoiceTransactions!.first.transactionStatus ?? "";
+      payfortResponseInsertModel.cardNumber = value.invoiceTransactions!.first.cardNumber ?? "";
+      payfortResponseInsertModel.cardBin = "";
+      payfortResponseInsertModel.installmentsNumber = 0;
+      payfortResponseInsertModel.status = (value.invoiceStatus ?? "").toLowerCase() == "paid" ? "14" : "00";
+      payfortResponseInsertModel.merchantRef = value.invoiceId.toString();
+      payfortResponseInsertModel.isRefund = false;
+      payfortResponseInsertModel.remmeberMe = true;
+      payfortResponseInsertModel.reconciliationReference = "";
+
+      // Call response insert API after payment
+      await paytabsResponseInsert(payfortResponseInsertModel: payfortResponseInsertModel);
+
+      if ((value.invoiceStatus ?? "").toLowerCase() == "paid") {
+        if (onSuccess != null) {
+          onSuccess(value);
+        }
+      } else {
+        if (onError != null) {
+          onError(LocaleKeys.paymentFailedPleaseTryAgain.tr());
+        }
+      }
+    }).catchError((error) {
+      if (onError != null) {
+        onError(error.message);
+      }
+    });
+  }
+
+  executeApplePayPayment() {
+    MFApplepay.executeApplePayPayment(onInvoiceCreated: (invoiceID) {
+      log(
+        invoiceID.toString(),
+      );
+    }).then((value) {
+      log(
+        value.toString(),
+      );
+    }).catchError((error) {
+      log(error.message);
+    });
+  }
+
+  initApplePayPayment(num invoiceValue) async {
+    await MFSDK.init(MyFatoorahConfig.configAPIKey, ApiConsts.myFatoorahCountry, ApiConsts.myFatoorahEnvironmentType);
+
+    await MFSDK.initSession(MFInitiateSessionRequest(), MFLanguage.ENGLISH).then((value) async {
+      var executePaymentRequest = MFExecutePaymentRequest(invoiceValue: invoiceValue, sessionId: value.sessionId, displayCurrencyIso: MFCurrencyISO.SAUDIARABIA_SAR);
+
+      MFApplepay.setupApplePay(value, executePaymentRequest, MFLanguage.ENGLISH, merchantName: "Dr Sulaiman Al Habib");
+    }).catchError((error) {
+      log(error.message);
+    });
+  }
+
+  Future<void> paytabsRequestInsert({required PayfortRequestInsertModel payfortRequestInsertModel, Function(dynamic)? onSuccess, Function(String)? onError}) async {
+    final result = await payfortRepo.payfortRequestInsert(payfortRequestInsertModel: payfortRequestInsertModel);
+
+    result.fold(
+      (failure) async => await errorHandlerService.handleError(failure: failure),
+      (apiResponse) {
+        if (apiResponse.messageStatus == 2) {
+          // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {});
+        } else if (apiResponse.messageStatus == 1) {
+          notifyListeners();
+          if (onSuccess != null) {
+            onSuccess(apiResponse);
+          }
+        }
+      },
+    );
+  }
+
+  Future<void> paytabsResponseInsert({required PayfortResponseInsertModel payfortResponseInsertModel, Function(dynamic)? onSuccess, Function(String)? onError}) async {
+    final result = await payfortRepo.payfortResponseInsert(payfortResponseInsertModel: payfortResponseInsertModel);
+
+    result.fold(
+      (failure) async => await errorHandlerService.handleError(failure: failure),
+      (apiResponse) {
+        if (apiResponse.messageStatus == 2) {
+          // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {});
+        } else if (apiResponse.messageStatus == 1) {
+          notifyListeners();
+          if (onSuccess != null) {
+            onSuccess(apiResponse);
+          }
+        }
+      },
+    );
+  }
+}
diff --git a/lib/features/notifications/notifications_view_model.dart b/lib/features/notifications/notifications_view_model.dart
index 85049ec9..0f3cc160 100644
--- a/lib/features/notifications/notifications_view_model.dart
+++ b/lib/features/notifications/notifications_view_model.dart
@@ -13,11 +13,16 @@ class NotificationsViewModel extends ChangeNotifier {
   ErrorHandlerService errorHandlerService;
 
   List<NotificationResponseModel> notificationsList = [];
+  List<NotificationResponseModel> readdNotificationsList = [];
+  List<NotificationResponseModel> unreadNotificationsList = [];
+  List<NotificationResponseModel> allNotificationsList = [];
 
   int currentPage = 0;
   int pagingSize = 50;
   int notificationStatusID = 2; // Default to status 2 (e.g., unread)
 
+  int selectedNotificationsTabIndex = 0;
+
   NotificationsViewModel({
     required this.notificationsRepo,
     required this.errorHandlerService,
@@ -35,6 +40,18 @@ class NotificationsViewModel extends ChangeNotifier {
     notifyListeners();
   }
 
+  void onNotificationTabChange(int index) {
+    selectedNotificationsTabIndex = index;
+    if (index == 0) {
+      notificationsList = allNotificationsList;
+    } else if (index == 1) {
+      notificationsList = unreadNotificationsList;
+    } else if (index == 2) {
+      notificationsList = readdNotificationsList;
+    }
+    notifyListeners();
+  }
+
   setNotificationStatusID(int statusID) {
     notificationStatusID = statusID;
     notificationsList.clear();
@@ -49,6 +66,9 @@ class NotificationsViewModel extends ChangeNotifier {
   }) async {
     isNotificationsLoading = true;
     unreadNotificationsCount = 0;
+
+    notificationsList.clear();
+
     notifyListeners();
 
     final result = await notificationsRepo.getAllNotifications(
@@ -80,17 +100,37 @@ class NotificationsViewModel extends ChangeNotifier {
             hasMoreNotifications = false;
           }
 
-          notificationsList.addAll(newNotifications);
-          for (var notification in notificationsList) {
-            if (notification.isRead == false) {
-              unreadNotificationsCount++;
+          try {
+            notificationsList.addAll(newNotifications);
+
+            // allNotificationsList.clear();
+            // readdNotificationsList.clear();
+            // unreadNotificationsList.clear();
+
+            // for (var notification in notificationsList) {
+            //   if (notification.isRead == false) {
+            //     unreadNotificationsCount++;
+            //     unreadNotificationsList.add(notification);
+            //   } else {
+            //     readdNotificationsList.add(notification);
+            //   }
+            // }
+
+            // Filter out the items directly without a loop
+            unreadNotificationsList = notificationsList.where((n) => n.isRead == false).toList();
+            readdNotificationsList = notificationsList.where((n) => n.isRead == true).toList();
+
+            // Calculate count based on the new list length
+            unreadNotificationsCount = unreadNotificationsList.length;
+
+            currentPage++;
+            allNotificationsList = notificationsList;
+            notifyListeners();
+            if (onSuccess != null) {
+              onSuccess(apiResponse);
             }
-          }
-          currentPage++;
-
-          notifyListeners();
-          if (onSuccess != null) {
-            onSuccess(apiResponse);
+          } catch (ex) {
+            print(ex.toString());
           }
         }
       },
diff --git a/lib/features/occasion_theme/occasion_config_model.dart b/lib/features/occasion_theme/occasion_config_model.dart
new file mode 100644
index 00000000..26ddf733
--- /dev/null
+++ b/lib/features/occasion_theme/occasion_config_model.dart
@@ -0,0 +1,147 @@
+import 'package:flutter/material.dart';
+
+/// Model representing a remotely-configurable "occasion" theme
+/// (e.g. Saudi National Day, Founding Day, Eid, Ramadan, ...).
+///
+/// Everything here is fully data-driven — nothing about a specific
+/// occasion (name, color, dates, banner asset) is hardcoded in the app.
+/// All values are supplied via Firebase Remote Config (or the bundled
+/// default JSON fallback used before the first successful fetch).
+@immutable
+class OccasionConfigModel {
+  /// Unique identifier of the occasion (e.g. "national_day"). Used only
+  /// for logging/analytics — no app logic branches on this value.
+  final String key;
+
+  /// Master kill-switch. When false, the app must look exactly like the
+  /// default/current theme, regardless of any other field below.
+  final bool enabled;
+
+  /// Activation window. Both must be present and `DateTime.now()` must fall
+  /// within [startDate, endDate] for this occasion to be eligible — a
+  /// missing date on either side makes the occasion inactive (dates are
+  /// mandatory, not an optional override of [enabled]). This lets several
+  /// occasions be scheduled in advance in the same list (see
+  /// [OccasionConfigModel.resolveActive]) without colliding.
+  final DateTime? startDate;
+  final DateTime? endDate;
+
+  /// Hex string (e.g. "#00894A") for the occasion's primary brand color.
+  /// When null, the app's default primary color is preserved.
+  final String? primaryColorHex;
+
+  /// Remote (or bundled asset path) image rendered as a decorative
+  /// background/watermark, drawn using [backgroundImageOpacity].
+  final String? backgroundOpacityImage;
+
+  /// Opacity (0.0 - 1.0) applied to [backgroundOpacityImage].
+  final double backgroundImageOpacity;
+
+  /// Remote (or bundled asset path) image rendered as the occasion's main
+  /// header/banner (e.g. the National Day greeting banner), drawn at full
+  /// opacity on top of [backgroundOpacityImage].
+  final String? headerImage;
+
+  const OccasionConfigModel({
+    required this.key,
+    required this.enabled,
+    this.startDate,
+    this.endDate,
+    this.primaryColorHex,
+    this.backgroundOpacityImage,
+    this.backgroundImageOpacity = 1.0,
+    this.headerImage,
+  });
+
+  /// Fully inert config — identical to the app's current/default look.
+  factory OccasionConfigModel.disabled() => const OccasionConfigModel(
+        key: 'none',
+        enabled: false,
+        startDate: null,
+        endDate: null,
+        primaryColorHex: null,
+        backgroundOpacityImage: null,
+        backgroundImageOpacity: 1.0,
+        headerImage: null,
+      );
+
+  factory OccasionConfigModel.fromJson(Map<String, dynamic> json) {
+    return OccasionConfigModel(
+      key: (json['key'] as String?) ?? 'none',
+      enabled: (json['enabled'] as bool?) ?? false,
+      // enabled: true,
+      startDate: _parseDate(json['start_date']),
+      endDate: _parseDate(json['end_date']),
+      primaryColorHex: json['primary_color'] as String?,
+      backgroundOpacityImage: json['background_opacity_image'] as String?,
+      backgroundImageOpacity: (json['background_image_opacity'] as num?)?.toDouble() ?? 1.0,
+      headerImage: json['header_image'] as String?,
+    );
+  }
+
+  /// Parses the remote-config value as a JSON array of occasions — lets
+  /// several occasions be scheduled in advance (e.g. National Day, Founding
+  /// Day, Eid), each with its own non-overlapping [startDate]/[endDate]
+  /// window, all under the same `occasion_config` remote-config key.
+  static List<OccasionConfigModel> listFromJson(List<dynamic> jsonList) {
+    return jsonList.map((e) => OccasionConfigModel.fromJson(e as Map<String, dynamic>)).toList();
+  }
+
+  /// Picks whichever scheduled occasion is enabled and whose
+  /// [startDate]/[endDate] window contains `now` — first match in list
+  /// order wins, so entries are expected not to overlap. Returns
+  /// [OccasionConfigModel.disabled] when nothing matches.
+  static OccasionConfigModel resolveActive(List<OccasionConfigModel> configs, [DateTime? now]) {
+    for (final config in configs) {
+      if (config.enabled && config.isWithinActiveWindow(now)) return config;
+    }
+    return OccasionConfigModel.disabled();
+  }
+
+  static DateTime? _parseDate(dynamic value) {
+    if (value == null) return null;
+    if (value is String && value.isNotEmpty) {
+      return DateTime.tryParse(value);
+    }
+    return null;
+  }
+
+  /// Whether "now" falls inside the configured activation window.
+  /// Both [startDate] and [endDate] are required — if either is missing,
+  /// this occasion is never considered active (see field doc above).
+  bool isWithinActiveWindow([DateTime? now]) {
+    if (startDate == null || endDate == null) return false;
+    final current = now ?? DateTime.now();
+    if (current.isBefore(startDate!)) return false;
+    if (current.isAfter(endDate!)) return false;
+    return true;
+  }
+
+  /// Parsed [Color] from [primaryColorHex], or null if not configured.
+  Color? get primaryColor => _hexToColor(primaryColorHex);
+
+  /// Lighter/translucent variant of [primaryColor] — 11% opacity of the same
+  /// hue (e.g. for chip/badge backgrounds). Derived automatically from
+  /// [primaryColor]; not an independent remote-config field. Null unless
+  /// [primaryColor] is configured.
+  Color? get secondaryColor => primaryColor?.withValues(alpha: 0.11);
+
+  static Color? _hexToColor(String? hex) {
+    if (hex == null || hex.isEmpty) return null;
+    var value = hex.trim().replaceFirst('#', '');
+    if (value.length == 6) value = 'FF$value';
+    final parsed = int.tryParse(value, radix: 16);
+    return parsed != null ? Color(parsed) : null;
+  }
+
+  Map<String, dynamic> toJson() => {
+        'key': key,
+        'enabled': enabled,
+        'start_date': startDate?.toIso8601String(),
+        'end_date': endDate?.toIso8601String(),
+        'primary_color': primaryColorHex,
+        'background_opacity_image': backgroundOpacityImage,
+        'background_image_opacity': backgroundImageOpacity,
+        'header_image': headerImage,
+      };
+}
diff --git a/lib/features/occasion_theme/occasion_theme_view_model.dart b/lib/features/occasion_theme/occasion_theme_view_model.dart
new file mode 100644
index 00000000..73f94ec7
--- /dev/null
+++ b/lib/features/occasion_theme/occasion_theme_view_model.dart
@@ -0,0 +1,125 @@
+import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/painting.dart' show Color;
+import 'package:hmg_patient_app_new/features/occasion_theme/occasion_config_model.dart';
+import 'package:hmg_patient_app_new/services/cache_service.dart';
+import 'package:hmg_patient_app_new/services/logger_service.dart';
+import 'package:hmg_patient_app_new/services/remote_config_service.dart';
+import 'package:hmg_patient_app_new/theme/colors.dart';
+
+/// Drives the fully remote-config-based "occasion" theming (National Day,
+/// Founding Day, Eid, Ramadan, ...). Nothing about a specific occasion is
+/// hardcoded here — every color/asset/date comes from [OccasionConfigModel],
+/// which is parsed from Firebase Remote Config.
+///
+/// Mirrors the existing dark-mode pattern in ProfileSettingsViewModel:
+/// a static flag on [AppColors] is kept in sync so every widget using
+/// AppColors.primaryRedColor (even ones with no BuildContext/Provider
+/// access) reflects the active occasion instantly.
+class OccasionThemeViewModel extends ChangeNotifier {
+  static const String _cachedConfigKey = 'cached_occasion_config_json';
+
+  final RemoteConfigService _remoteConfigService;
+  final CacheService _cacheService;
+  final LoggerService _loggerService;
+
+  OccasionThemeViewModel({
+    required RemoteConfigService remoteConfigService,
+    required CacheService cacheService,
+    required LoggerService loggerService,
+  })  : _remoteConfigService = remoteConfigService,
+        _cacheService = cacheService,
+        _loggerService = loggerService;
+
+  OccasionConfigModel _config = OccasionConfigModel.disabled();
+  OccasionConfigModel get config => _config;
+
+  /// Testing-only override for "now" when resolving which scheduled
+  /// occasion is active — set this instead of changing the device clock to
+  /// preview each occasion in the list. Only ever takes effect in debug
+  /// builds (see [_now]); always ignored in profile/release, so it can
+  /// never leak into production even if accidentally left set.
+  static DateTime? debugNowOverride;
+
+  DateTime? get _now => kDebugMode ? debugNowOverride : null;
+
+  /// True only when enabled AND (if a window is configured) within it.
+  bool get isOccasionActive => _config.enabled && _config.isWithinActiveWindow(_now);
+
+  String? get backgroundOpacityImage => isOccasionActive ? _config.backgroundOpacityImage : null;
+
+  double get backgroundImageOpacity => _config.backgroundImageOpacity;
+
+  /// The occasion's main header/banner image (e.g. National Day greeting
+  /// banner), rendered at full opacity. Null unless an occasion is active.
+  String? get headerImage => isOccasionActive ? _config.headerImage : null;
+
+  /// Lighter/translucent variant of the active occasion's primary color
+  /// (11% opacity) — e.g. for chip/badge backgrounds. Null unless an
+  /// occasion is active.
+  Color? get secondaryColor => isOccasionActive ? _config.secondaryColor : null;
+
+  /// Call once at app startup (before the first frame) to restore the last
+  /// known-good config instantly (offline-safe), then kick off a remote
+  /// fetch in the background.
+  Future<void> initialize() async {
+    _restoreCachedConfig();
+    _applyToAppColors();
+
+    try {
+      await _remoteConfigService.initialize();
+      await refresh();
+    } catch (ex) {
+      _loggerService.logError('OccasionThemeViewModel.initialize error: $ex');
+    }
+  }
+
+  /// Fetches the latest occasion schedule from Firebase Remote Config and
+  /// applies whichever entry is currently active. Safe to call again later
+  /// (e.g. on app resume) to pick up changes without requiring an app update.
+  Future<void> refresh() async {
+    try {
+      await _remoteConfigService.fetchAndActivate();
+      final rawJson = _remoteConfigService.occasionConfigRawJson;
+      final configs = OccasionConfigModel.listFromJson(json.decode(rawJson) as List<dynamic>);
+      _config = OccasionConfigModel.resolveActive(configs, _now);
+      _loggerService.logInfo('OccasionThemeViewModel: chosen theme = "${_config.key}" (enabled=${_config.enabled}, active=$isOccasionActive)');
+      _loggerService.logInfo('OccasionThemeViewModel: chosen theme object = ${_config.toJson()}');
+      // Cache the full schedule (not just the resolved entry) so offline
+      // restore at next startup re-resolves against that day's date instead
+      // of replaying whichever occasion happened to be active last time.
+      await _cacheService.saveString(key: _cachedConfigKey, value: rawJson);
+      _applyToAppColors();
+      notifyListeners();
+    } catch (ex) {
+      _loggerService.logError('OccasionThemeViewModel.refresh error: $ex');
+      // Keep whatever config was already applied (cached/disabled) — never
+      // let a remote-config failure change the app's appearance unexpectedly.
+    }
+  }
+
+  void _restoreCachedConfig() {
+    try {
+      final cachedJson = _cacheService.getString(key: _cachedConfigKey);
+      if (cachedJson == null || cachedJson.isEmpty) {
+        _config = OccasionConfigModel.disabled();
+        return;
+      }
+      final configs = OccasionConfigModel.listFromJson(json.decode(cachedJson) as List<dynamic>);
+      _config = OccasionConfigModel.resolveActive(configs, _now);
+    } catch (ex) {
+      _loggerService.logError('OccasionThemeViewModel._restoreCachedConfig error: $ex');
+      _config = OccasionConfigModel.disabled();
+    }
+  }
+
+  /// Keeps AppColors in sync so non-Provider call sites (AppColors.primaryRedColor)
+  /// pick up the occasion color exactly like the existing dark-mode flag does.
+  void _applyToAppColors() {
+    AppColors.isOccasionThemeActive = isOccasionActive;
+    AppColors.occasionPrimaryColor = _config.primaryColor;
+    AppColors.occasionSecondaryColor = _config.secondaryColor;
+  }
+}
+
diff --git a/lib/features/payfort/payfort_view_model.dart b/lib/features/payfort/payfort_view_model.dart
index c4f96857..7b6b8b7d 100644
--- a/lib/features/payfort/payfort_view_model.dart
+++ b/lib/features/payfort/payfort_view_model.dart
@@ -578,4 +578,27 @@ class PayfortViewModel extends ChangeNotifier {
     );
   }
 
+  Future<void> addApplePayPayfortResponse(dynamic paymentMap) async {
+    PayfortResponseInsertModel payfortResponseInsertModel = PayfortResponseInsertModel();
+
+    payfortResponseInsertModel.fortId = paymentMap['fort_id'] ?? "";
+    payfortResponseInsertModel.commandType = paymentMap['command'] ?? "";
+    payfortResponseInsertModel.amount = num.tryParse(paymentMap['amount'] ?? "0") ?? 0;
+    payfortResponseInsertModel.sadadOLP = "";
+    payfortResponseInsertModel.paymentOption = paymentMap['payment_option'] ?? "";
+    payfortResponseInsertModel.customerIP = paymentMap['customer_ip'] ?? "";
+    payfortResponseInsertModel.eCI = paymentMap['eci'] ?? "";
+    payfortResponseInsertModel.responseMessage = paymentMap['response_message'] ?? "";
+    payfortResponseInsertModel.cardNumber = paymentMap['card_number'] ?? "";
+    payfortResponseInsertModel.cardBin = paymentMap['card_bin'] ?? "";
+    payfortResponseInsertModel.installmentsNumber = int.tryParse(paymentMap['installments_number'] ?? "0") ?? 0;
+    payfortResponseInsertModel.status = paymentMap['status'] ?? "";
+    payfortResponseInsertModel.merchantRef = paymentMap['merchant_reference'] ?? "";
+    payfortResponseInsertModel.isRefund = false;
+    payfortResponseInsertModel.remmeberMe = true;
+    payfortResponseInsertModel.reconciliationReference = "";
+
+    payfortResponseInsert(payfortResponseInsertModel: payfortResponseInsertModel);
+  }
+
 }
diff --git a/lib/features/smartwatch_health_data/health_provider.dart b/lib/features/smartwatch_health_data/health_provider.dart
index c296f717..1397703f 100644
--- a/lib/features/smartwatch_health_data/health_provider.dart
+++ b/lib/features/smartwatch_health_data/health_provider.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
 import 'package:health/health.dart';
 import 'package:hmg_patient_app_new/core/common_models/data_points.dart';
 import 'package:hmg_patient_app_new/core/common_models/smart_watch.dart';
@@ -119,15 +120,22 @@ class HealthProvider with ChangeNotifier {
   void initDevice() async {
     LoaderBottomSheet.showLoader();
     notifyListeners();
+    error = null;
     final result = await _healthService.initDevice();
     isLoading = false;
-    LoaderBottomSheet.hideLoader();
+    // LoaderBottomSheet.hideLoader();
     if (result.isError) {
-      error = 'Error initializing device: ${result.asError}';
+      LoaderBottomSheet.hideLoader();
+      final rawError = result.asError?.error;
+      if (rawError is PlatformException) {
+        error = 'Error initializing device: ${rawError.message ?? rawError.toString()}';
+      } else {
+        error = 'Error initializing device: ${rawError?.toString() ?? 'Unknown error'}';
+      }
     } else {
-      LoaderBottomSheet.showLoader();
+      // LoaderBottomSheet.showLoader();
       await getVitals();
-      // LoaderBottomSheet.hideLoader();
+      LoaderBottomSheet.hideLoader();
       // await Future.delayed(Duration(seconds: 5));
       getIt.get<NavigationService>().pushPage(page: SmartWatchesHealthDataScreen());
     }
@@ -286,4 +294,9 @@ class HealthProvider with ChangeNotifier {
     }
     return formattedString;
   }
+
+  void clearError(){
+    error = null;
+    notifyListeners();
+  }
 }
diff --git a/lib/features/smartwatch_health_data/model/vitals_data_model.dart b/lib/features/smartwatch_health_data/model/vitals_data_model.dart
index 83cd4ea6..819e3773 100644
--- a/lib/features/smartwatch_health_data/model/vitals_data_model.dart
+++ b/lib/features/smartwatch_health_data/model/vitals_data_model.dart
@@ -22,6 +22,7 @@ class Vitals {
     if (timestamp.isEmpty) {
       timestamp = DateTime.now().toIso8601String();
     }
+    timestamp = DateTime.parse(timestamp).toLocal().toIso8601String();
     return Vitals(
       value: map['value'] ?? "",
       timestamp: timestamp,
diff --git a/lib/features/smartwatch_health_data/watch_connectors/IllegalWatchTypeException.dart b/lib/features/smartwatch_health_data/watch_connectors/IllegalWatchTypeException.dart
new file mode 100644
index 00000000..c3bfe4fc
--- /dev/null
+++ b/lib/features/smartwatch_health_data/watch_connectors/IllegalWatchTypeException.dart
@@ -0,0 +1 @@
+class IllegalWatchTypeException   implements Exception {}
\ No newline at end of file
diff --git a/lib/features/smartwatch_health_data/watch_connectors/create_watch_helper.dart b/lib/features/smartwatch_health_data/watch_connectors/create_watch_helper.dart
index 8abb2136..2a4711b0 100644
--- a/lib/features/smartwatch_health_data/watch_connectors/create_watch_helper.dart
+++ b/lib/features/smartwatch_health_data/watch_connectors/create_watch_helper.dart
@@ -6,6 +6,8 @@ import 'package:hmg_patient_app_new/features/smartwatch_health_data/watch_connec
 import 'package:hmg_patient_app_new/features/smartwatch_health_data/watch_connectors/samsung_health.dart';
 import 'package:hmg_patient_app_new/features/smartwatch_health_data/watch_connectors/watch_helper.dart';
 
+import 'IllegalWatchTypeException.dart';
+
 class CreateWatchHelper {
   static WatchHelper getWatchName(SmartWatchTypes watchType) {
     /// if running device is ios
@@ -16,7 +18,7 @@ class CreateWatchHelper {
       case SmartWatchTypes.huawei:
         return HuaweiHealthDataConnector();
        default:
-         return SamsungHealth();
+        throw IllegalWatchTypeException();
     }
   }
 }
\ No newline at end of file
diff --git a/lib/features/smartwatch_health_data/watch_connectors/huawei_watch_connecter.dart b/lib/features/smartwatch_health_data/watch_connectors/huawei_watch_connecter.dart
index a8300e2d..689bb517 100644
--- a/lib/features/smartwatch_health_data/watch_connectors/huawei_watch_connecter.dart
+++ b/lib/features/smartwatch_health_data/watch_connectors/huawei_watch_connecter.dart
@@ -1,86 +1,403 @@
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:async/src/result/result.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
+import 'package:hmg_patient_app_new/features/smartwatch_health_data/model/vitals_data_model.dart';
 import 'package:hmg_patient_app_new/features/smartwatch_health_data/watch_connectors/watch_helper.dart';
+import 'package:http/http.dart';
 import 'package:huawei_health/huawei_health.dart';
 
+
 class HuaweiHealthDataConnector  extends WatchHelper{
   final  MethodChannel _channel = MethodChannel('huawei_watch');
-  @override
-  Future<Result<bool>> initDevice() async{
-    try{
-      await _channel.invokeMethod('init');
 
-    }catch(e){
+  DataController? _dataController;
+  final Map<String, List<Vitals>> mappedData = <String, List<Vitals>>{};
 
+  DateTime get _defaultEndDate => DateTime.now();
+  DateTime get _defaultStartDate => _defaultEndDate.subtract(const Duration(days: 365));
+
+  @override
+  Future<Result<bool>> initDevice() async {
+    try {
+      await _channel.invokeMethod('init');
+    } catch (e) {
+      debugPrint('Huawei channel init failed: $e');
     }
-    // List of scopes to ask for authorization.
-  // Note: These scopes should also be authorized on the Huawei Developer Console.
-    List<Scope> scopes = [
-      Scope.HEALTHKIT_STEP_READ, Scope.HEALTHKIT_OXYGEN_SATURATION_READ,  // View and store height and weight data in Health Service Kit.
-      Scope.HEALTHKIT_HEARTRATE_READ, Scope.HEALTHKIT_SLEEP_READ,
-      Scope.HEALTHKIT_BODYTEMPERATURE_READ, Scope.HEALTHKIT_CALORIES_READ
+
+    final List<Scope> scopes = <Scope>[
+      Scope.HEALTHKIT_ACTIVITY_READ,
+      Scope.HEALTHKIT_ACTIVITY_WRITE,
+      Scope.HEALTHKIT_BLOODGLUCOSE_READ,
+      Scope.HEALTHKIT_BLOODGLUCOSE_WRITE,
+      Scope.HEALTHKIT_CALORIES_READ,
+      Scope.HEALTHKIT_CALORIES_WRITE,
+      Scope.HEALTHKIT_DISTANCE_READ,
+      Scope.HEALTHKIT_DISTANCE_WRITE,
+      Scope.HEALTHKIT_HEARTRATE_READ,
+      Scope.HEALTHKIT_HEARTRATE_WRITE,
+      Scope.HEALTHKIT_HEIGHTWEIGHT_READ,
+      Scope.HEALTHKIT_HEIGHTWEIGHT_WRITE,
+      Scope.HEALTHKIT_LOCATION_READ,
+      Scope.HEALTHKIT_LOCATION_WRITE,
+      Scope.HEALTHKIT_PULMONARY_READ,
+      Scope.HEALTHKIT_PULMONARY_WRITE,
+      Scope.HEALTHKIT_SLEEP_READ,
+      Scope.HEALTHKIT_SLEEP_WRITE,
+      Scope.HEALTHKIT_SPEED_READ,
+      Scope.HEALTHKIT_SPEED_WRITE,
+      Scope.HEALTHKIT_STEP_READ,
+      Scope.HEALTHKIT_STEP_WRITE,
+      Scope.HEALTHKIT_STRENGTH_READ,
+      Scope.HEALTHKIT_STRENGTH_WRITE,
+      Scope.HEALTHKIT_BODYFAT_READ,
+      Scope.HEALTHKIT_BODYFAT_WRITE,
+      Scope.HEALTHKIT_NUTRITION_READ,
+      Scope.HEALTHKIT_NUTRITION_WRITE,
+      Scope.HEALTHKIT_BLOODPRESSURE_READ,
+      Scope.HEALTHKIT_BLOODPRESSURE_WRITE,
+      Scope.HEALTHKIT_BODYTEMPERATURE_READ,
+      Scope.HEALTHKIT_BODYTEMPERATURE_WRITE,
+      Scope.HEALTHKIT_OXYGENSTATURATION_READ,
+      Scope.HEALTHKIT_OXYGENSTATURATION_WRITE,
+      Scope.HEALTHKIT_REPRODUCTIVE_READ,
+      Scope.HEALTHKIT_REPRODUCTIVE_WRITE,
+      Scope.HEALTHKIT_ACTIVITY_RECORD_READ,
+      Scope.HEALTHKIT_ACTIVITY_RECORD_WRITE,
+      Scope.HEALTHKIT_HEARTRATE_REALTIME,
+      Scope.HEALTHKIT_STEP_REALTIME,
+      Scope.HEALTHKIT_HEARTHEALTH_WRITE,
+      Scope.HEALTHKIT_HEARTHEALTH_READ,
+      Scope.HEALTHKIT_STRESS_WRITE,
+      Scope.HEALTHKIT_STRESS_READ,
+      Scope.HEALTHKIT_OXYGEN_SATURATION_WRITE,
+      Scope.HEALTHKIT_OXYGEN_SATURATION_READ,
+      Scope.HEALTHKIT_HISTORYDATA_OPEN_WEEK,
+      Scope.HEALTHKIT_HISTORYDATA_OPEN_MONTH,
+      Scope.HEALTHKIT_HISTORYDATA_OPEN_YEAR,
     ];
+
     try {
-      bool? result = await SettingController.getHealthAppAuthorization();
-      debugPrint(
-        'Granted Scopes for result == is $result}',
-      );
+      await HealthAuth.signIn(scopes);
+      _dataController = await DataController.init();
+      if (_dataController == null) {
+        return Result.error(false);
+      }
       return Result.value(true);
+    } on PlatformException catch (e) {
+      debugPrint('Error on Huawei authorization: $e');
+      return Result.error(false);
     } catch (e) {
-      debugPrint('Error on authorization, Error:${e.toString()}');
+      debugPrint('Unexpected Huawei init error: $e');
       return Result.error(false);
     }
   }
 
   @override
   Future<void> getActivity() async {
-    DataType dataTypeResult = await SettingController.readDataType(
-     DataType.DT_CONTINUOUS_STEPS_DELTA.name
-    );
-
-
+    try {
+      final ReadReply? data = await readDataType(
+        DataType.DT_CONTINUOUS_CALORIES_BURNT,
+        _defaultStartDate,
+        _defaultEndDate,
+      );
+      addDataToMap('activity', data, preferredKeys: const <String>['calories', 'calories_total']);
+    } catch (e) {
+      debugPrint('Error getting activity data: $e');
+      mappedData['activity'] = <Vitals>[];
+    }
   }
 
   @override
-  Future getBloodOxygen() {
-    throw UnimplementedError();
+  Future<void> getBloodOxygen() async {
+    try {
+      final ReadReply? data = await readDataType(
+        HealthDataTypes.DT_INSTANTANEOUS_SPO2,
+        _defaultStartDate,
+        _defaultEndDate,
+      );
+      addDataToMap(
+        'bloodOxygen',
+        data,
+        preferredKeys: const <String>['saturation', 'saturation_last', 'saturation_avg'],
+        transform: _normalizeSpo2,
+      );
+    } catch (e) {
+      debugPrint('Error getting blood oxygen data: $e');
+      mappedData['bloodOxygen'] = <Vitals>[];
+    }
+  }
 
+  @override
+  Future<void> getBodyTemperature() async {
+    try {
+      final ReadReply? data = await readDataType(
+        HealthDataTypes.DT_INSTANTANEOUS_BODY_TEMPERATURE,
+        _defaultStartDate,
+        _defaultEndDate,
+      );
+      addDataToMap('bodyTemperature', data, preferredKeys: const <String>['temperature']);
+    } catch (e) {
+      debugPrint('Error getting body temperature data: $e');
+      mappedData['bodyTemperature'] = <Vitals>[];
+    }
   }
 
   @override
-  Future getBodyTemperature() {
+  FutureOr<void> getHeartRate() async {
+    try {
+      final ReadReply? data = await readDataType(
+        DataType.DT_INSTANTANEOUS_HEART_RATE,
+        _defaultStartDate,
+        _defaultEndDate,
+      );
+      addDataToMap('heartRate', data, preferredKeys: const <String>['bpm']);
+    } catch (e) {
+      debugPrint('Error getting heart rate data: $e');
+      mappedData['heartRate'] = <Vitals>[];
+    }
+  }
 
-    throw UnimplementedError();
+  @override
+  FutureOr<void> getSleep() async {
+    try {
+      final ReadReply? data = await readDataType(
+        DataType.DT_CONTINUOUS_SLEEP,
+        _defaultStartDate,
+        _defaultEndDate,
+      );
+      addSleepDataToMap(data);
+    } catch (e) {
+      debugPrint('Error getting sleep data: $e');
+      mappedData['sleep'] = <Vitals>[];
+    }
   }
 
   @override
-  FutureOr<void> getHeartRate() {
-    throw UnimplementedError();
+  FutureOr<void> getSteps() async {
+    try {
+      final ReadReply? data = await readDataType(
+        DataType.DT_CONTINUOUS_STEPS_DELTA,
+        _defaultStartDate,
+        _defaultEndDate,
+      );
+      addDataToMap('steps', data, preferredKeys: const <String>['steps_delta', 'steps', 'step_rate']);
+    } catch (e) {
+      debugPrint('Error getting steps data: $e');
+      mappedData['steps'] = <Vitals>[];
+    }
   }
 
   @override
-  FutureOr<void> getSleep() {
-    throw UnimplementedError();
+  Future<Result<String>> retrieveData() async {
+    return Result.value(getMappedData());
   }
 
   @override
-  FutureOr<void> getSteps() {
-    throw UnimplementedError();
+  FutureOr<void> getDistance() async {
+    try {
+      final ReadReply? data = await readDataType(
+        DataType.DT_CONTINUOUS_DISTANCE_DELTA,
+        _defaultStartDate,
+        _defaultEndDate,
+      );
+      addDataToMap('distance', data, preferredKeys: const <String>['distance_delta', 'distance']);
+    } catch (e) {
+      debugPrint('Error getting distance data: $e');
+      mappedData['distance'] = <Vitals>[];
+    }
   }
 
+  Future<ReadReply?> readDataType(
+    DataType dataType,
+    DateTime startTime,
+    DateTime endTime,
+  ) async {
+    final DataCollector dataCollector = DataCollector(
+      dataType: dataType,
+      dataGenerateType: DataGenerateType.DATA_TYPE_RAW,
+    );
 
-  @override
-  Future retrieveData() {
-    throw UnimplementedError();
+    final ReadOptions readOptions = ReadOptions(
+      dataCollectors: <DataCollector>[dataCollector],
+      startTime: startTime,
+      endTime: endTime,
+      allowRemoteInquiry: true,
+    )..groupByTime(1, timeUnit: TimeUnit.HOURS);
+
+    try {
+      return await _dataController?.read(readOptions);
+    } on PlatformException catch (e) {
+      debugPrint('Huawei read error for ${dataType.name}: $e');
+      return null;
+    }
   }
 
-  @override
-  FutureOr<void> getDistance() {
-    // TODO: implement getDistance
-    throw UnimplementedError();
+  void addDataToMap(
+    String key,
+    ReadReply? data, {
+    List<String> preferredKeys = const <String>[],
+    double Function(double value)? transform,
+  }) {
+    mappedData[key] = <Vitals>[];
+    if (data == null) {
+      return;
+    }
+
+    if (data.groups.isNotEmpty) {
+      for (final Group group in data.groups) {
+        for (final SampleSet sampleSet in group.sampleSets ?? <SampleSet>[]) {
+          for (final SamplePoint samplePoint in sampleSet.samplePoints) {
+            _addNumericSampleToMappedData(
+              key: key,
+              samplePoint: samplePoint,
+              preferredKeys: preferredKeys,
+              groupStartTime: group.startTime,
+              transform: transform,
+            );
+          }
+        }
+      }
+      return;
+    }
+
+    for (final SampleSet sampleSet in data.sampleSets) {
+      for (final SamplePoint samplePoint in sampleSet.samplePoints) {
+        _addNumericSampleToMappedData(
+          key: key,
+          samplePoint: samplePoint,
+          preferredKeys: preferredKeys,
+          transform: transform,
+        );
+      }
+    }
+  }
+
+  void addSleepDataToMap(ReadReply? data) {
+    mappedData['sleep'] = <Vitals>[];
+    if (data == null) {
+      return;
+    }
+
+    void appendSleepPoint(SamplePoint samplePoint, {DateTime? groupStart, DateTime? groupEnd}) {
+      final DateTime? start = samplePoint.startTime ?? groupStart;
+      final DateTime? end = samplePoint.endTime ?? groupEnd;
+
+      double? value;
+      if (start != null && end != null && end.isAfter(start)) {
+        value = end.difference(start).inMinutes / 60;
+      }
+
+      value ??= _extractNumericValue(
+        samplePoint,
+        const <String>['sleep_state', 'all_sleep_time', 'deep_sleep_time', 'light_sleep_time'],
+      );
+
+      if (value == null) {
+        return;
+      }
+
+      final String timestamp =
+          (start ?? samplePoint.samplingTime ?? DateTime.now()).toIso8601String();
+
+      mappedData['sleep']?.add(
+        Vitals(
+          value: value.toStringAsFixed(2),
+          timestamp: timestamp,
+        ),
+      );
+    }
+
+    if (data.groups.isNotEmpty) {
+      for (final Group group in data.groups) {
+        for (final SampleSet sampleSet in group.sampleSets ?? <SampleSet>[]) {
+          for (final SamplePoint samplePoint in sampleSet.samplePoints) {
+            appendSleepPoint(
+              samplePoint,
+              groupStart: group.startTime,
+              groupEnd: group.endTime,
+            );
+          }
+        }
+      }
+      return;
+    }
+
+    for (final SampleSet sampleSet in data.sampleSets) {
+      for (final SamplePoint samplePoint in sampleSet.samplePoints) {
+        appendSleepPoint(samplePoint);
+      }
+    }
+  }
+
+  void _addNumericSampleToMappedData({
+    required String key,
+    required SamplePoint samplePoint,
+    required List<String> preferredKeys,
+    DateTime? groupStartTime,
+    double Function(double value)? transform,
+  }) {
+    final double? numericValue = _extractNumericValue(samplePoint, preferredKeys);
+    if (numericValue == null) {
+      return;
+    }
+
+    final double transformedValue = transform?.call(numericValue) ?? numericValue;
+    final String timestamp =
+        (samplePoint.samplingTime ?? samplePoint.startTime ?? groupStartTime ?? DateTime.now())
+            .toIso8601String();
+
+    mappedData[key]?.add(
+      Vitals(
+        value: transformedValue.toStringAsFixed(2),
+        timestamp: timestamp,
+      ),
+    );
+  }
+
+  double? _extractNumericValue(SamplePoint samplePoint, List<String> preferredKeys) {
+    final Map<String, dynamic> values = <String, dynamic>{
+      ...samplePoint.pairs,
+      ...?samplePoint.fieldValues,
+    };
+
+    for (final String key in preferredKeys) {
+      final dynamic value = values[key];
+      if (value is num) {
+        return value.toDouble();
+      }
+    }
+
+    for (final dynamic value in values.values) {
+      if (value is num) {
+        return value.toDouble();
+      }
+    }
+
+    return null;
+  }
+
+  double _normalizeSpo2(double value) {
+    if (value <= 1) {
+      return value * 100;
+    }
+    return value;
+  }
+
+  String getMappedData() {
+    return jsonEncode(<String, dynamic>{
+      'heartRate': (mappedData['heartRate'] ?? <Vitals>[]).map((Vitals v) => v.toJson()).toList(),
+      'sleep': (mappedData['sleep'] ?? <Vitals>[]).map((Vitals v) => v.toJson()).toList(),
+      'steps': (mappedData['steps'] ?? <Vitals>[]).map((Vitals v) => v.toJson()).toList(),
+      'activity': (mappedData['activity'] ?? <Vitals>[]).map((Vitals v) => v.toJson()).toList(),
+      'bloodOxygen':
+          (mappedData['bloodOxygen'] ?? <Vitals>[]).map((Vitals v) => v.toJson()).toList(),
+      'bodyTemperature':
+          (mappedData['bodyTemperature'] ?? <Vitals>[]).map((Vitals v) => v.toJson()).toList(),
+      'distance': (mappedData['distance'] ?? <Vitals>[]).map((Vitals v) => v.toJson()).toList(),
+    });
   }
+}
 
-}
\ No newline at end of file
diff --git a/lib/firebase_options.dart b/lib/firebase_options.dart
index 9658edbe..ea64dfaa 100644
--- a/lib/firebase_options.dart
+++ b/lib/firebase_options.dart
@@ -57,7 +57,8 @@ class DefaultFirebaseOptions {
     databaseURL: 'https://api-project-815750722565.firebaseio.com',
     storageBucket: 'api-project-815750722565.firebasestorage.app',
     androidClientId: '815750722565-m14h8mkosm7cnq6uh6rhqr54dn02d705.apps.googleusercontent.com',
-    iosBundleId: 'com.cloudsolutions.HMGPatientApp',
+    // iosBundleId: 'com.cloudsolutions.HMGPatientApp',
+    iosBundleId: 'com.HMG.HMG-Smartphone',
   );
 
 }
\ No newline at end of file
diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart
index 7dbcfd75..30e3bc0a 100644
--- a/lib/generated/locale_keys.g.dart
+++ b/lib/generated/locale_keys.g.dart
@@ -2032,5 +2032,12 @@ abstract class  LocaleKeys {
   static const liveCareTermsHeading16 = 'liveCareTermsHeading16';
   static const liveCareTermsConditions47 = 'liveCareTermsConditions47';
   static const liveCareTermsConditions48 = 'liveCareTermsConditions48';
+  static const importantNotice = 'importantNotice';
+  static const appDecommissionedText = 'appDecommissionedText';
+  static const appDecommissionedSubText = 'appDecommissionedSubText';
+  static const downloadApp = 'downloadApp';
+  static const unread = 'unread';
+  static const read = 'read';
+  static const pendingMedicalReportRequest = 'pendingMedicalReportRequest';
 
 }
diff --git a/lib/main.dart b/lib/main.dart
index 4e60c2a0..47416b49 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:easy_localization/easy_localization.dart';
@@ -35,7 +36,9 @@ import 'package:hmg_patient_app_new/features/my_appointments/appointment_rating_
 import 'package:hmg_patient_app_new/features/my_appointments/appointment_via_region_viewmodel.dart';
 import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart';
 import 'package:hmg_patient_app_new/features/my_invoices/my_invoices_view_model.dart';
+import 'package:hmg_patient_app_new/features/myfatoorah/myfatoorah_view_model.dart';
 import 'package:hmg_patient_app_new/features/notifications/notifications_view_model.dart';
+import 'package:hmg_patient_app_new/features/occasion_theme/occasion_theme_view_model.dart';
 import 'package:hmg_patient_app_new/features/offers_and_discounts/offers_and_discounts_view_model.dart';
 import 'package:hmg_patient_app_new/features/payfort/payfort_view_model.dart';
 import 'package:hmg_patient_app_new/features/paytabs/paytabs_view_model.dart';
@@ -70,7 +73,6 @@ import 'core/utils/size_utils.dart';
 import 'features/monthly_reports/terms_conditions_view_model.dart';
 import 'firebase_options.dart';
 
-
 @pragma('vm:entry-point')
 Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
   await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
@@ -129,6 +131,7 @@ Future<void> callInitializations() async {
   } catch (e) {
     // If it doesn't exist, initialize it.
     await Firebase.initializeApp(
+      name: "api-project-815750722565",
       options: DefaultFirebaseOptions.currentPlatform,
     );
   }
@@ -140,7 +143,11 @@ Future<void> callInitializations() async {
 
   // Initialize Security Service early to catch threats before app logic runs
   if (kReleaseMode) {
-    await getIt.get<SecurityService>().initialize();
+    try {
+      await getIt.get<SecurityService>().initialize();
+    } catch (e) {
+      getIt.get<LoggerService>().logError('SecurityService.initialize failed, continuing app startup: $e');
+    }
   }
 
   // Set up critical threat callback to navigate to unsafe device page
@@ -166,6 +173,16 @@ Future<void> callInitializations() async {
 
   // Restore persisted accessibility settings before the first frame.
   getIt.get<ProfileSettingsViewModel>().loadAccessibilitySettings();
+
+  // Restore last-known occasion theme instantly (offline-safe, synchronous)
+  // so the very first frame is already correct, then let the Remote Config
+  // fetch happen in the background without blocking app startup. Fully
+  // disabled by default — the app looks exactly as it does today until
+  // Remote Config enables an occasion (e.g. National Day) on the server side.
+  final occasionThemeViewModel = getIt.get<OccasionThemeViewModel>();
+  OccasionThemeViewModel.debugNowOverride = DateTime.now();
+  // OccasionThemeViewModel.debugNowOverride = DateTime.parse('2027-03-09T00:00:00Z');
+  unawaited(occasionThemeViewModel.initialize());
 }
 
 void main() async {
@@ -303,9 +320,15 @@ void main() async {
         ChangeNotifierProvider<PayTabsViewModel>(
           create: (_) => getIt.get<PayTabsViewModel>(),
         ),
+        ChangeNotifierProvider<MyFatoorahViewModel>(
+          create: (_) => getIt.get<MyFatoorahViewModel>(),
+        ),
         ChangeNotifierProvider<RefundRequestViewModel>(
           create: (_) => getIt.get<RefundRequestViewModel>(),
-        )
+        ),
+        ChangeNotifierProvider<OccasionThemeViewModel>(
+          create: (_) => getIt.get<OccasionThemeViewModel>(),
+        ),
       ], child: MyApp()),
     ), // Wrap your app
   );
@@ -373,11 +396,11 @@ class MyApp extends StatelessWidget {
           return Sizer(
             builder: (context, orientation, deviceType) {
               // SizeConfig().init(constraints, orientation);
-              return Consumer<ProfileSettingsViewModel>(
-                builder: (context, profileVm, _) {
+              return Consumer2<ProfileSettingsViewModel, OccasionThemeViewModel>(
+                builder: (context, profileVm, occasionThemeVm, _) {
                   final isArabic = EasyLocalization.of(context)?.locale.languageCode == "ar";
                   return MaterialApp(
-                    key: ValueKey('app_theme_${profileVm.isDarkMode}'),
+                    key: ValueKey('app_theme_${profileVm.isDarkMode}_${occasionThemeVm.isOccasionActive}_${occasionThemeVm.config.key}'),
                     // title: 'Dr. AlHabib',
                     title: 'Dr. AlHabib Beta',
                     builder: (context, mchild) {
diff --git a/lib/presentation/appointments/appointment_details_page.dart b/lib/presentation/appointments/appointment_details_page.dart
index dc147981..874c97c6 100644
--- a/lib/presentation/appointments/appointment_details_page.dart
+++ b/lib/presentation/appointments/appointment_details_page.dart
@@ -338,6 +338,7 @@ class _AppointmentDetailsPageState extends State<AppointmentDetailsPage> {
                                 myAppointmentsViewModel.updateListWRTTab(0);
                                 await myAppointmentsViewModel.cancelAppointment(
                                     patientAppointmentHistoryResponseModel: widget.patientAppointmentHistoryResponseModel,
+                                    isReschedule: false,
                                     onSuccess: (apiResponse) async {
                                       LoaderBottomSheet.hideLoader();
                                       myAppointmentsViewModel.setIsAppointmentDataToBeLoaded(true);
@@ -989,7 +990,7 @@ class _AppointmentDetailsPageState extends State<AppointmentDetailsPage> {
                                                       openDoctorScheduleCalendar();
                                                     },
                                                     backgroundColor: AppColors.primaryRedColor,
-                                                    borderColor: AppColors.primaryRedColor,
+                                                    borderColor: Colors.transparent,
                                                     textColor: Colors.white,
                                                     fontSize: 16.f,
                                                     fontWeight: FontWeight.w600,
@@ -1097,7 +1098,7 @@ class _AppointmentDetailsPageState extends State<AppointmentDetailsPage> {
                                 openDoctorScheduleCalendar();
                               },
                               backgroundColor: AppColors.primaryRedColor,
-                              borderColor: AppColors.primaryRedColor,
+                              borderColor: Colors.transparent,
                               textColor: Colors.white,
                               fontSize: 16.f,
                               fontWeight: FontWeight.w600,
diff --git a/lib/presentation/appointments/appointment_payment_page.dart b/lib/presentation/appointments/appointment_payment_page.dart
index ffa9b723..992f512e 100644
--- a/lib/presentation/appointments/appointment_payment_page.dart
+++ b/lib/presentation/appointments/appointment_payment_page.dart
@@ -748,7 +748,8 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
                       return Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-                          (myAppointmentsVM.patientAppointmentShareResponseModel!.isCash ?? true)
+                          // (myAppointmentsVM.patientAppointmentShareResponseModel!.isCash ?? true)
+                          (true)
                               ? Container(
                                   height: 50.h,
                                   decoration: ShapeDecoration(
@@ -857,7 +858,7 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
     print("onBrowserLoadStart");
     print(url);
 
-    if (selectedPaymentMethod == "tamara") {
+    if (selectedPaymentMethod.toLowerCase() == "tamara") {
       if (Platform.isAndroid) {
         Uri uri = new Uri.dataFromString(url);
         tamaraPaymentStatus = uri.queryParameters['status']!;
@@ -896,7 +897,7 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
 
   void checkPaymentStatus() async {
     LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr(context: context));
-    if (selectedPaymentMethod == "TAMARA") {
+    if (selectedPaymentMethod.toLowerCase() == "tamara") {
       await payfortViewModel.checkTamaraPaymentStatus(
           transactionID: transID,
           onSuccess: (apiResponse) async {
@@ -1282,6 +1283,7 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
           currency: appState.getAuthenticatedUser()!.outSa! == 0 ? "SAR" : "AED",
           onFailed: (failureResult) async {
             log("failureResult: ${failureResult.message.toString()}");
+            payfortViewModel.addApplePayPayfortResponse(failureResult.response);
             LoaderBottomSheet.hideLoader();
             showCommonBottomSheetWithoutHeight(
               context,
@@ -1292,10 +1294,94 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
             );
           },
           onSucceeded: (successResult) async {
+            payfortViewModel.addApplePayPayfortResponse(successResult);
             LoaderBottomSheet.hideLoader();
             log("successResult: ${successResult.responseMessage.toString()}");
             selectedPaymentMethod = successResult.paymentOption ?? "VISA";
             checkPaymentStatus();
+
+            // LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr(context: context));
+            // await myAppointmentsViewModel.createAdvancePayment(
+            //     paymentMethodName: selectedPaymentMethod,
+            //     projectID: widget.patientAppointmentHistoryResponseModel.projectID,
+            //     clinicID: widget.patientAppointmentHistoryResponseModel.clinicID,
+            //     appointmentNo: widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(),
+            //     payedAmount: num.parse(myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax!.toString()),
+            //     paymentReference: successResult.fortId!,
+            //     patientID: appState.getAuthenticatedUser()!.patientId.toString(),
+            //     patientType: appState.getAuthenticatedUser()!.patientType!,
+            //     onSuccess: (value) async {
+            //       print(value);
+            //       await myAppointmentsViewModel.addAdvanceNumberRequest(
+            //           advanceNumber: Utils.isVidaPlusProject(widget.patientAppointmentHistoryResponseModel.projectID)
+            //               ? value.data['OnlineCheckInAppointments'][0]['AdvanceNumber_VP'].toString()
+            //               : value.data['OnlineCheckInAppointments'][0]['AdvanceNumber'].toString(),
+            //           paymentReference: successResult.fortId!,
+            //           appointmentNo: widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(),
+            //           onSuccess: (value) async {
+            //             if (widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment!) {
+            //               //TODO: Implement LiveCare Check-In API Call
+            //               await myAppointmentsViewModel.insertLiveCareVIDARequest(
+            //                   clientRequestID: transID,
+            //                   patientAppointmentHistoryResponseModel: widget.patientAppointmentHistoryResponseModel,
+            //                   onSuccess: (apiResponse) {
+            //                     Future.delayed(Duration(milliseconds: 500), () {
+            //                       myAppointmentsViewModel.setIsAppointmentDataToBeLoaded(true);
+            //                       myAppointmentsViewModel.initAppointmentsViewModel();
+            //                       myAppointmentsViewModel.getPatientAppointments(true, false);
+            //
+            //                       getIt.get<HabibWalletViewModel>().setIsWalletAmountToBeLoaded(true);
+            //                       getIt.get<HabibWalletViewModel>().initHabibWalletProvider();
+            //                       getIt.get<HabibWalletViewModel>().getPatientBalanceAmount();
+            //
+            //                       LoaderBottomSheet.hideLoader();
+            //                       Navigator.pushAndRemoveUntil(
+            //                           context,
+            //                           CustomPageRoute(
+            //                             page: LandingNavigation(),
+            //                           ),
+            //                           (r) => false);
+            //                     });
+            //                   },
+            //                   onError: (error) {});
+            //             } else {
+            //               await myAppointmentsViewModel.generateAppointmentQR(
+            //                   clinicID: widget.patientAppointmentHistoryResponseModel.clinicID,
+            //                   projectID: widget.patientAppointmentHistoryResponseModel.projectID,
+            //                   appointmentNo: widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(),
+            //                   isFollowUp: myAppointmentsViewModel.patientAppointmentShareResponseModel!.isFollowup!,
+            //                   onSuccess: (apiResponse) {
+            //                     Future.delayed(Duration(milliseconds: 500), () {
+            //                       myAppointmentsViewModel.setIsAppointmentDataToBeLoaded(true);
+            //                       myAppointmentsViewModel.initAppointmentsViewModel();
+            //                       myAppointmentsViewModel.getPatientAppointments(true, false);
+            //
+            //                       getIt.get<HabibWalletViewModel>().setIsWalletAmountToBeLoaded(true);
+            //                       getIt.get<HabibWalletViewModel>().initHabibWalletProvider();
+            //                       getIt.get<HabibWalletViewModel>().getPatientBalanceAmount();
+            //
+            //                       LoaderBottomSheet.hideLoader();
+            //                       Navigator.pushAndRemoveUntil(
+            //                           context,
+            //                           CustomPageRoute(
+            //                             page: LandingNavigation(),
+            //                           ),
+            //                           (r) => false);
+            //                     });
+            //                   });
+            //             }
+            //           });
+            //     },
+            //     onError: (err) {
+            //       LoaderBottomSheet.hideLoader();
+            //       showCommonBottomSheetWithoutHeight(
+            //         context,
+            //         child: Utils.getErrorWidget(loadingText: err.toString()),
+            //         callBackFunc: () {},
+            //         isFullScreen: false,
+            //         isCloseButtonVisible: true,
+            //       );
+            //     });
           },
           // projectId: appo.projectID,
           // serviceTypeEnum: ServiceTypeEnum.appointmentPayment,
diff --git a/lib/presentation/appointments/my_appointments_page.dart b/lib/presentation/appointments/my_appointments_page.dart
index da20e183..e15edb47 100644
--- a/lib/presentation/appointments/my_appointments_page.dart
+++ b/lib/presentation/appointments/my_appointments_page.dart
@@ -67,8 +67,8 @@ class _MyAppointmentsPageState extends State<MyAppointmentsPage> {
                 SizedBox(height: 16.h),
                 CustomTabBar(
                   initialIndex: myAppointmentsVM.selectedTabIndex,
-                  activeTextColor: Color(0xffED1C2B),
-                  activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1),
+                  activeTextColor: AppColors.primaryRedColor,
+                  activeBackgroundColor: AppColors.secondaryLightRedColor,
                   tabs: [
                     // CustomTabBarModel(null, LocaleKeys.allAppt.tr(context: context)),
                     CustomTabBarModel(null, LocaleKeys.upcoming.tr(context: context)),
@@ -269,9 +269,9 @@ class _MyAppointmentsPageState extends State<MyAppointmentsPage> {
                               ),
                             );
                           },
-                          backgroundColor: Color(0xffFEE9EA),
-                          borderColor: Color(0xffFEE9EA),
-                          textColor: Color(0xffED1C2B),
+                          backgroundColor: AppColors.secondaryLightRedColor,
+                          borderColor: AppColors.secondaryLightRedColor,
+                          textColor: AppColors.primaryRedColor,
                           fontSize: 14.f,
                           isBold: true,
                           borderRadius: 12.r,
diff --git a/lib/presentation/appointments/widgets/appointment_card.dart b/lib/presentation/appointments/widgets/appointment_card.dart
index 1eeb842c..b9a2f26f 100644
--- a/lib/presentation/appointments/widgets/appointment_card.dart
+++ b/lib/presentation/appointments/widgets/appointment_card.dart
@@ -448,7 +448,17 @@ class _AppointmentCardState extends State<AppointmentCard> {
             if (widget.isForFeedback) {
               widget.contactUsViewModel!.setPatientFeedbackSelectedAppointment(widget.patientAppointmentHistoryResponseModel);
             } else {
-              widget.medicalFileViewModel!.setSelectedMedicalReportAppointment(widget.patientAppointmentHistoryResponseModel);
+              if(!widget.medicalFileViewModel!.checkExistingMedicalReportStatus(widget.patientAppointmentHistoryResponseModel)) {
+                widget.medicalFileViewModel!.setSelectedMedicalReportAppointment(widget.patientAppointmentHistoryResponseModel);
+              } else {
+                showCommonBottomSheetWithoutHeight(
+                  context,
+                  child: Utils.getErrorWidget(loadingText: LocaleKeys.pendingMedicalReportRequest.tr(context: context)),
+                  callBackFunc: () {},
+                  isFullScreen: false,
+                  isCloseButtonVisible: true,
+                );
+              }
             }
             Navigator.pop(context, false);
           } else {
diff --git a/lib/presentation/appointments/widgets/appointment_doctor_card.dart b/lib/presentation/appointments/widgets/appointment_doctor_card.dart
index 4dd838ea..a3b13259 100644
--- a/lib/presentation/appointments/widgets/appointment_doctor_card.dart
+++ b/lib/presentation/appointments/widgets/appointment_doctor_card.dart
@@ -84,8 +84,7 @@ class AppointmentDoctorCard extends StatelessWidget {
                           children: [
                             Utils.buildSvgWithAssets(icon: AppAssets.rating_icon, width: 15.h, height: 15.h, iconColor: AppColors.ratingColorYellow),
                             SizedBox(height: 2.h),
-                            "${patientAppointmentHistoryResponseModel.decimalDoctorRate ?? 0.0}"
-                                .toText11(isBold: true, color: AppColors.textColor, isEnglishOnly: true),
+                            "${patientAppointmentHistoryResponseModel.decimalDoctorRate ?? 0.0}".toText11(isBold: true, color: AppColors.textColor, isEnglishOnly: true),
                           ],
                         ),
                       ).circle(100),
@@ -102,11 +101,7 @@ class AppointmentDoctorCard extends StatelessWidget {
                         children: [
                           Expanded(
                             child: (patientAppointmentHistoryResponseModel.doctorNameObj ?? "").toText16(
-                              isBold: true,
-                              isEnglishOnly: !Utils.isArabicText(patientAppointmentHistoryResponseModel.doctorNameObj ?? ""),
-                              textOverflow: TextOverflow.ellipsis,
-                              maxlines: 2
-                            ),
+                                isBold: true, isEnglishOnly: !Utils.isArabicText(patientAppointmentHistoryResponseModel.doctorNameObj ?? ""), textOverflow: TextOverflow.ellipsis, maxlines: 2),
                           ),
                           SizedBox(width: 12.w),
                           // (patientAppointmentHistoryResponseModel.doctorNationalityFlagURL != null &&
@@ -142,18 +137,17 @@ class AppointmentDoctorCard extends StatelessWidget {
                               child: AppCustomChipWidget(
                                 labelPadding: EdgeInsetsDirectional.only(start: -6.w, end: 6.w),
                                 icon: AppAssets.doctor_calendar_icon,
-                                richText: "${DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false)} ${(patientAppointmentHistoryResponseModel.startTime != null && patientAppointmentHistoryResponseModel.startTime!.isNotEmpty) ? patientAppointmentHistoryResponseModel.startTime!.substring(0, 5) : DateUtil.formatDateToTimeLang(DateUtil.convertStringToDateSaudiTimezone(patientAppointmentHistoryResponseModel.appointmentDate!, patientAppointmentHistoryResponseModel.projectID), false)}"
-                                    .toText10(isBold: true),
+                                richText:
+                                    "${DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false)} ${(patientAppointmentHistoryResponseModel.startTime != null && patientAppointmentHistoryResponseModel.startTime!.isNotEmpty) ? patientAppointmentHistoryResponseModel.startTime!.substring(0, 5) : DateUtil.formatDateToTimeLang(DateUtil.convertStringToDateSaudiTimezone(patientAppointmentHistoryResponseModel.appointmentDate!, patientAppointmentHistoryResponseModel.projectID), false)}"
+                                        .toText10(isBold: true),
                               ),
                             ),
                           ),
                           AppCustomChipWidget(
                             labelPadding: EdgeInsetsDirectional.only(start: -6.w, end: 6.w),
-                            icon: !(patientAppointmentHistoryResponseModel.isLiveCareAppointment ?? false) ? AppAssets.walkin_appointment_icon
-                                : AppAssets.small_livecare_icon,
+                            icon: !(patientAppointmentHistoryResponseModel.isLiveCareAppointment ?? false) ? AppAssets.walkin_appointment_icon : AppAssets.small_livecare_icon,
                             iconColor: !(patientAppointmentHistoryResponseModel.isLiveCareAppointment ?? false) ? AppColors.textColor : Colors.white,
-                            labelText: (patientAppointmentHistoryResponseModel.isLiveCareAppointment ?? false) ? LocaleKeys.livecare.tr(context: context)
-                                : LocaleKeys.walkin.tr(context: context),
+                            labelText: (patientAppointmentHistoryResponseModel.isLiveCareAppointment ?? false) ? LocaleKeys.livecare.tr(context: context) : LocaleKeys.walkin.tr(context: context),
                             backgroundColor: !(patientAppointmentHistoryResponseModel.isLiveCareAppointment ?? false) ? AppColors.greyColor : AppColors.successColor,
                             textColor: !(patientAppointmentHistoryResponseModel.isLiveCareAppointment ?? false) ? AppColors.textColor : Colors.white,
                           ),
@@ -163,13 +157,12 @@ class AppointmentDoctorCard extends StatelessWidget {
                   ),
                 ),
                 (patientAppointmentHistoryResponseModel.isLiveCareAppointment! ||
-                    patientAppointmentHistoryResponseModel.isExecludeDoctor! ||
+                        patientAppointmentHistoryResponseModel.isExecludeDoctor! ||
                         patientAppointmentHistoryResponseModel.isClinicReBookingAllowed! == false ||
                         patientAppointmentHistoryResponseModel.isActiveDoctor! == false ||
-                    !Utils.isClinicAllowedForRebook(patientAppointmentHistoryResponseModel.clinicID))
+                        !Utils.isClinicAllowedForRebook(patientAppointmentHistoryResponseModel.clinicID))
                     ? SizedBox.shrink()
-                    : Utils.buildSvgWithAssets(icon: AppAssets.doctor_profile_icon, width: 20.h, height: 20.h, fit: BoxFit.scaleDown)
-                        .onPress(() async {
+                    : Utils.buildSvgWithAssets(icon: AppAssets.doctor_profile_icon, width: 20.h, height: 20.h, fit: BoxFit.scaleDown).onPress(() async {
                         // DoctorsListResponseModel selectedDoctor = DoctorsListResponseModel();
                         // selectedDoctor.doctorID = patientAppointmentHistoryResponseModel.doctorID;
                         // selectedDoctor.doctorImageURL = patientAppointmentHistoryResponseModel.doctorImageURL;
@@ -270,7 +263,7 @@ class AppointmentDoctorCard extends StatelessWidget {
                 onAskDoctorTap();
               },
               backgroundColor: AppColors.secondaryLightRedColor,
-              borderColor: AppColors.secondaryLightRedColor,
+              borderColor: Colors.transparent,
               textColor: AppColors.primaryRedColor,
               fontSize: 14.f,
               isBold: true,
@@ -310,7 +303,7 @@ class AppointmentDoctorCard extends StatelessWidget {
                 onCancelTap();
               },
               backgroundColor: AppColors.primaryRedColor,
-              borderColor: AppColors.primaryRedColor,
+              borderColor: Colors.transparent,
               textColor: AppColors.whiteColor,
               fontSize: 14.f,
               isBold: true,
@@ -329,7 +322,7 @@ class AppointmentDoctorCard extends StatelessWidget {
                       onRescheduleTap();
                     },
                     backgroundColor: AppColors.secondaryLightRedColor,
-                    borderColor: AppColors.secondaryLightRedColor,
+                    borderColor: Colors.transparent,
                     textColor: AppColors.primaryRedColor,
                     fontSize: 14.f,
                     isBold: true,
diff --git a/lib/presentation/appointments/widgets/appointment_rating_widget.dart b/lib/presentation/appointments/widgets/appointment_rating_widget.dart
index 9b13c6cd..ae70da1d 100644
--- a/lib/presentation/appointments/widgets/appointment_rating_widget.dart
+++ b/lib/presentation/appointments/widgets/appointment_rating_widget.dart
@@ -142,9 +142,9 @@ class _AppointmentRatingWidgetState extends State<AppointmentRatingWidget> {
                   Expanded(
                     child: CustomButton(
                       text: LocaleKeys.later.tr(context: context),
-                      backgroundColor: Color(0xffFEE9EA),
-                      borderColor: Color(0xffFEE9EA),
-                      textColor: Color(0xffED1C2B),
+                      backgroundColor: AppColors.secondaryLightRedColor,
+                      borderColor: AppColors.secondaryLightRedColor,
+                      textColor: AppColors.primaryRedColor,
                       onPressed: () {
                         Navigator.pop(context);
                       },
diff --git a/lib/presentation/authentication/quick_login.dart b/lib/presentation/authentication/quick_login.dart
index 133e38ef..00e872a3 100644
--- a/lib/presentation/authentication/quick_login.dart
+++ b/lib/presentation/authentication/quick_login.dart
@@ -94,17 +94,18 @@ class QuickLoginState extends State<QuickLogin> {
                       mainAxisAlignment: MainAxisAlignment.end,
                       children: [
                         Expanded(
-                            child: CustomButton(
-                          text: LocaleKeys.enableQuickLoginBtn.tr(context: context),
-                          onPressed: () {
-                            widget.onPressed();
-                          },
-                          backgroundColor: Color(0xffED1C2B),
-                          borderColor: Color(0xffED1C2B),
-                          textColor: Colors.white,
-                          icon: AppAssets.apple_finder,
-                          height: 56.h,
-                        )),
+                          child: CustomButton(
+                            text: LocaleKeys.enableQuickLoginBtn.tr(context: context),
+                            onPressed: () {
+                              widget.onPressed();
+                            },
+                            backgroundColor: AppColors.primaryRedColor,
+                            borderColor: AppColors.primaryRedColor,
+                            textColor: Colors.white,
+                            icon: AppAssets.apple_finder,
+                            height: 56.h,
+                          ),
+                        ),
                       ],
                     ),
                     SizedBox(
@@ -120,9 +121,9 @@ class QuickLoginState extends State<QuickLogin> {
                             cacheService.saveBool(key: CacheConst.quickLoginEnabled, value: false);
                             Navigator.pop(context, "true");
                           },
-                          backgroundColor: Color(0xffFEE9EA),
-                          borderColor: Color(0xffFEE9EA),
-                          textColor: Colors.red,
+                          backgroundColor: AppColors.secondaryLightRedColor,
+                          borderColor: Colors.transparent,
+                          textColor: AppColors.primaryRedColor,
                           height: 56.h,
                           // icon: "assets/images/svg/apple-finder.svg",
                         )),
diff --git a/lib/presentation/authentication/saved_login_screen.dart b/lib/presentation/authentication/saved_login_screen.dart
index bea93d36..4de4bb64 100644
--- a/lib/presentation/authentication/saved_login_screen.dart
+++ b/lib/presentation/authentication/saved_login_screen.dart
@@ -327,9 +327,9 @@ class _SavedLogin extends State<SavedLogin> with RouteAware {
                                 //   MaterialPageRoute(builder: (BuildContext context) => LandingNavigation())
                                 // );
                               },
-                              backgroundColor: Color(0xffFEE9EA),
-                              borderColor: Color(0xffFEE9EA),
-                              textColor: Color(0xffED1C2B),
+                              backgroundColor: AppColors.secondaryLightRedColor,
+                              borderColor: Colors.transparent,
+                              textColor: AppColors.primaryRedColor,
                               fontSize: 16.f,
                               fontWeight: FontWeight.w600,
                               borderRadius: 12.r,
@@ -352,9 +352,9 @@ class _SavedLogin extends State<SavedLogin> with RouteAware {
                                   MaterialPageRoute(builder: (BuildContext context) => LoginScreen()),
                                 );
                               },
-                              backgroundColor: Color(0xffFEE9EA),
-                              borderColor: Color(0xffFEE9EA),
-                              textColor: Color(0xffED1C2B),
+                              backgroundColor: AppColors.secondaryLightRedColor,
+                              borderColor: Colors.transparent,
+                              textColor: AppColors.primaryRedColor,
                               fontSize: 15.f,
                               fontWeight: FontWeight.w600,
                               borderRadius: 12.r,
diff --git a/lib/presentation/blood_donation/blood_donation_page.dart b/lib/presentation/blood_donation/blood_donation_page.dart
index f3f0782d..b4bdb6df 100644
--- a/lib/presentation/blood_donation/blood_donation_page.dart
+++ b/lib/presentation/blood_donation/blood_donation_page.dart
@@ -232,7 +232,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
                             Container(
                               padding: EdgeInsets.all(16.h),
                               decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-                                color: AppColors.bgRedLightColor.withValues(alpha: 0.1),
+                                color: AppColors.secondaryLightRedColorBase.withValues(alpha: 0.1),
                                 borderRadius: 12.r,
                                 hasShadow: false,
                               ),
diff --git a/lib/presentation/book_appointment/book_appointment_page.dart b/lib/presentation/book_appointment/book_appointment_page.dart
index c2560ecd..57b3d541 100644
--- a/lib/presentation/book_appointment/book_appointment_page.dart
+++ b/lib/presentation/book_appointment/book_appointment_page.dart
@@ -106,8 +106,8 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
                     children: [
                       SizedBox(height: 16.h),
                       CustomTabBar(
-                        activeTextColor: Color(0xffED1C2B),
-                        activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1),
+                        activeTextColor: AppColors.primaryRedColor,
+                        activeBackgroundColor: AppColors.secondaryLightRedColor,
                         initialIndex: bookAppointmentsVM.selectedTabIndex,
                         tabs: [
                           CustomTabBarModel(null, LocaleKeys.general.tr(context: context)),
@@ -326,9 +326,9 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
                                             onPressed: () {
                                               Navigator.of(context).push(CustomPageRoute(page: SearchDoctorByName()));
                                             },
-                                            backgroundColor: Color(0xffFEE9EA),
-                                            borderColor: Color(0xffFEE9EA),
-                                            textColor: Color(0xffED1C2B),
+                                            backgroundColor: AppColors.secondaryLightRedColor,
+                                            borderColor: AppColors.secondaryLightRedColor,
+                                            textColor: AppColors.primaryRedColor,
                                             fontSize: 14.f,
                                             isBold: true,
                                             padding: EdgeInsets.fromLTRB(10.h, 0, 10.h, 0),
diff --git a/lib/presentation/book_appointment/doctor_profile_page.dart b/lib/presentation/book_appointment/doctor_profile_page.dart
index 5b6ad09d..ee4d859b 100644
--- a/lib/presentation/book_appointment/doctor_profile_page.dart
+++ b/lib/presentation/book_appointment/doctor_profile_page.dart
@@ -60,9 +60,7 @@ class DoctorProfilePage extends StatelessWidget {
                               doctorID: viewModel.doctorsProfileResponseModel.doctorID ?? 0,
                               isActive: viewModel.isFavouriteDoctor,
                               onSuccess: (response) {
-                                Utils.showToast(viewModel.isFavouriteDoctor
-                                    ? LocaleKeys.doctorAddedToFavourite.tr(context: context)
-                                    : LocaleKeys.doctorRemovedFromFavourite.tr(context: context));
+                                Utils.showToast(viewModel.isFavouriteDoctor ? LocaleKeys.doctorAddedToFavourite.tr(context: context) : LocaleKeys.doctorRemovedFromFavourite.tr(context: context));
                                 // Successfully added/removed favorite - refresh the favorites list
                                 getIt.get<MyAppointmentsViewModel>().refreshFavouriteDoctors();
                               },
@@ -101,14 +99,11 @@ class DoctorProfilePage extends StatelessWidget {
                               children: [
                                 SizedBox(
                                   width: isFoldable ? 250.w : 220.w,
-                                  child:
-                                      ("${bookAppointmentsViewModel.doctorsProfileResponseModel.doctorTitleForProfile} ${bookAppointmentsViewModel.doctorsProfileResponseModel.doctorName}")
-                                          .toString()
-                                          .toText24(isBold: true),
+                                  child: ("${bookAppointmentsViewModel.doctorsProfileResponseModel.doctorTitleForProfile} ${bookAppointmentsViewModel.doctorsProfileResponseModel.doctorName}")
+                                      .toString()
+                                      .toText24(isBold: true),
                                 ),
-                                (bookAppointmentsViewModel.doctorsProfileResponseModel.specialty!.isNotEmpty
-                                        ? bookAppointmentsViewModel.doctorsProfileResponseModel.specialty!.first
-                                        : "")
+                                (bookAppointmentsViewModel.doctorsProfileResponseModel.specialty!.isNotEmpty ? bookAppointmentsViewModel.doctorsProfileResponseModel.specialty!.first : "")
                                     .toString()
                                     .toText18(isBold: true, color: AppColors.primaryRedColor),
                               ],
@@ -148,16 +143,12 @@ class DoctorProfilePage extends StatelessWidget {
                       children: [
                         Column(
                           children: [
-                            Utils.buildSvgWithAssets(
-                                icon: AppAssets.doctor_profile_rating_icon, width: 48.w, height: 48.h, fit: BoxFit.contain, applyThemeColor: false),
+                            Utils.buildSvgWithAssets(icon: AppAssets.doctor_profile_rating_icon, width: 48.w, height: 48.h, fit: BoxFit.contain, applyThemeColor: false),
                             SizedBox(height: 16.h),
                             LocaleKeys.ratings.tr(context: context).toText12(isBold: true, color: AppColors.greyTextColor),
-                            bookAppointmentsViewModel.doctorsProfileResponseModel.decimalDoctorRate.toString().toText16(
-                                isBold: true,
-                                color: AppColors.textColor,
-                                isUnderLine: true,
-                                decorationColor: AppColors.textColor,
-                                fontFamily: "Poppins"),
+                            bookAppointmentsViewModel.doctorsProfileResponseModel.decimalDoctorRate
+                                .toString()
+                                .toText16(isBold: true, color: AppColors.textColor, isUnderLine: true, decorationColor: AppColors.textColor, fontFamily: "Poppins"),
                           ],
                         ).onPress(() {
                           bookAppointmentsViewModel.getDoctorRatingDetails();
@@ -173,18 +164,12 @@ class DoctorProfilePage extends StatelessWidget {
                         SizedBox(width: 36.w),
                         Column(
                           children: [
-                            Utils.buildSvgWithAssets(
-                                icon: AppAssets.doctor_profile_reviews_icon, width: 48.w, height: 48.h, fit: BoxFit.contain, applyThemeColor: false),
+                            Utils.buildSvgWithAssets(icon: AppAssets.doctor_profile_reviews_icon, width: 48.w, height: 48.h, fit: BoxFit.contain, applyThemeColor: false),
                             SizedBox(height: 16.h),
                             LocaleKeys.reviews.tr(context: context).toText12(isBold: true, color: AppColors.greyTextColor),
                             NumberFormat.decimalPattern("en_US")
                                 .format(bookAppointmentsViewModel.doctorsProfileResponseModel.noOfPatientsRate ?? 0)
-                                .toText16(
-                                    isBold: true,
-                                    color: AppColors.textColor,
-                                    isUnderLine: true,
-                                    decorationColor: AppColors.textColor,
-                                    fontFamily: "Poppins"),
+                                .toText16(isBold: true, color: AppColors.textColor, isUnderLine: true, decorationColor: AppColors.textColor, fontFamily: "Poppins"),
                           ],
                         ).onPress(() {
                           bookAppointmentsViewModel.getDoctorRatingDetails();
@@ -215,9 +200,7 @@ class DoctorProfilePage extends StatelessWidget {
                     SizedBox(height: 16.h),
                     LocaleKeys.information.tr(context: context).toText14(isBold: true, color: AppColors.textColor),
                     SizedBox(height: 6.h),
-                    (bookAppointmentsViewModel.doctorsProfileResponseModel.doctorProfileInfo ?? "")
-                        .trim()
-                        .toText12(isBold: true, color: AppColors.greyTextColor),
+                    (bookAppointmentsViewModel.doctorsProfileResponseModel.doctorProfileInfo ?? "").trim().toText12(isBold: true, color: AppColors.greyTextColor),
                     SizedBox(height: 24.h),
                   ],
                 ).paddingSymmetrical(24.h, 0.h),
@@ -238,8 +221,7 @@ class DoctorProfilePage extends StatelessWidget {
                       bookAppointmentsViewModel.selectedDoctor.specialityN = bookAppointmentsViewModel.doctorsProfileResponseModel.specialty;
                       bookAppointmentsViewModel.selectedDoctor.name = bookAppointmentsViewModel.doctorsProfileResponseModel.doctorName;
                       bookAppointmentsViewModel.selectedDoctor.doctorImageURL = bookAppointmentsViewModel.doctorsProfileResponseModel.doctorImageURL;
-                      bookAppointmentsViewModel.selectedDoctor.nationalityFlagURL =
-                          bookAppointmentsViewModel.doctorsProfileResponseModel.nationalityFlagURL;
+                      bookAppointmentsViewModel.selectedDoctor.nationalityFlagURL = bookAppointmentsViewModel.doctorsProfileResponseModel.nationalityFlagURL;
                       bookAppointmentsViewModel.selectedDoctor.clinicName = bookAppointmentsViewModel.doctorsProfileResponseModel.clinicDescription;
                       bookAppointmentsViewModel.selectedDoctor.projectName = bookAppointmentsViewModel.doctorsProfileResponseModel.projectName;
 
diff --git a/lib/presentation/book_appointment/laser/laser_appointment.dart b/lib/presentation/book_appointment/laser/laser_appointment.dart
index c8773933..affd5423 100644
--- a/lib/presentation/book_appointment/laser/laser_appointment.dart
+++ b/lib/presentation/book_appointment/laser/laser_appointment.dart
@@ -80,8 +80,8 @@ class LaserAppointment extends StatelessWidget {
           child: Column(
             children: [
               CustomTabBar(
-                activeTextColor: Color(0xffED1C2B),
-                activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1),
+                activeTextColor: AppColors.primaryRedColor,
+                activeBackgroundColor: AppColors.secondaryLightRedColor,
                 tabs: [
                   CustomTabBarModel(null, LocaleKeys.malE.tr()),
                   CustomTabBarModel(null, LocaleKeys.femaleGender.tr()),
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 31defa56..b9df0744 100644
--- a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart
+++ b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart
@@ -11,8 +11,10 @@ import 'package:hmg_patient_app_new/core/app_state.dart';
 import 'package:hmg_patient_app_new/core/cache_consts.dart';
 import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/enums.dart';
+import 'package:hmg_patient_app_new/core/myFatoorah_config.dart';
 import 'package:hmg_patient_app_new/core/utils/date_util.dart';
 import 'package:hmg_patient_app_new/features/immediate_livecare/immediate_livecare_view_model.dart';
+import 'package:hmg_patient_app_new/features/myfatoorah/myfatoorah_view_model.dart';
 import 'package:hmg_patient_app_new/features/payfort/models/apple_pay_request_insert_model.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
@@ -33,6 +35,8 @@ import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart';
 import 'package:hmg_patient_app_new/widgets/in_app_browser/InAppBrowser.dart';
 import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
 import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart';
+import 'package:myfatoorah_flutter/MFEnums.dart';
+import 'package:myfatoorah_flutter/myfatoorah_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:smooth_corner/smooth_corner.dart';
 
@@ -49,6 +53,9 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
   late MyAppointmentsViewModel myAppointmentsViewModel;
   late AppState appState;
   late PayTabsViewModel paytabsViewModel;
+  late MyFatoorahViewModel myFatoorahViewModel;
+
+  late MFApplePayButton mfApplePayButton;
 
   MyInAppBrowser? browser;
   String selectedPaymentMethod = "";
@@ -64,6 +71,11 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
     Clarity.setCurrentScreenName('LiveCare Payment Page');
     scheduleMicrotask(() {
       payfortViewModel.initPayfortViewModel();
+
+      if (appState.isMyFatoorahEnabled) {
+        myFatoorahViewModel.initApplePayPayment(num.parse((immediateLiveCareViewModel.liveCareImmediateAppointmentFeesList.total ?? "0.0")));
+      }
+
       myAppointmentsViewModel.getTamaraInstallmentsDetails().then((val) {
         if (myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel != null) {
           if (num.parse(immediateLiveCareViewModel.liveCareImmediateAppointmentFeesList.total!) >= myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel!.minLimit!.amount! &&
@@ -80,11 +92,15 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
 
   @override
   Widget build(BuildContext context) {
+    mfApplePayButton = MFApplePayButton(
+      applePayStyle: MFApplePayStyle(),
+    );
     appState = getIt.get<AppState>();
     myAppointmentsViewModel = Provider.of<MyAppointmentsViewModel>(context, listen: false);
     immediateLiveCareViewModel = Provider.of<ImmediateLiveCareViewModel>(context, listen: false);
     payfortViewModel = Provider.of<PayfortViewModel>(context, listen: false);
     paytabsViewModel = Provider.of<PayTabsViewModel>(context, listen: false);
+    myFatoorahViewModel = Provider.of<MyFatoorahViewModel>(context, listen: false);
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
       body: Consumer<MyAppointmentsViewModel>(builder: (context, myAppointmentsVM, child) {
@@ -131,7 +147,62 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
                         ).paddingSymmetrical(16.h, 16.h),
                       ).paddingSymmetrical(24.h, 0.h).onPress(() async {
                         selectedPaymentMethod = "MADA";
-                        if (appState.isPaytabsEnabled) {
+                        if (appState.isMyFatoorahEnabled) {
+                          myFatoorahViewModel.initiateCardPayment(
+                              amount: num.parse(immediateLiveCareViewModel.liveCareImmediateAppointmentFeesList.total ?? "0.0"),
+                              paymentDescription: "LiveCare Payment",
+                              displayCurrencyIso: appState.getAuthenticatedUser()!.outSa == 0
+                                  ? ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat
+                                      ? MFCurrencyISO.KUWAIT_KWD
+                                      : MFCurrencyISO.SAUDIARABIA_SAR
+                                  : MFCurrencyISO.UAE_AED,
+                              paymentOption: selectedPaymentMethod,
+                              liveServiceID: immediateLiveCareViewModel.immediateLiveCareSelectedClinic.serviceID.toString(),
+                              isScheduleLiveCare: "false",
+                              appointmentDate: DateUtil.convertDateToString(DateTime.now()),
+                              appointmentNo: "0",
+                              doctorID: "0",
+                              fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
+                              serviceID: ServiceTypeEnum.liveCareAppointment.getIdFromServiceEnum().toString(),
+                              projectID: (ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat ? 15 : 12).toString(),
+                              onSuccess: (response) async {
+                                LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr());
+                                await immediateLiveCareViewModel.addNewCallRequestForImmediateLiveCare(response.invoiceId.toString());
+                                await immediateLiveCareViewModel.getPatientLiveCareHistory();
+                                LoaderBottomSheet.hideLoader();
+                                if (immediateLiveCareViewModel.patientHasPendingLiveCareRequest) {
+                                  Navigator.pushAndRemoveUntil(
+                                      context,
+                                      CustomPageRoute(
+                                        page: LandingNavigation(),
+                                      ),
+                                      (r) => false);
+                                  Navigator.of(context).push(
+                                    CustomPageRoute(
+                                      page: ImmediateLiveCarePendingRequestPage(),
+                                    ),
+                                  );
+                                } else {
+                                  LoaderBottomSheet.hideLoader();
+                                  showCommonBottomSheetWithoutHeight(
+                                    context,
+                                    child: Utils.getErrorWidget(loadingText: "Unknown error occurred..."),
+                                    callBackFunc: () {},
+                                    isFullScreen: false,
+                                    isCloseButtonVisible: true,
+                                  );
+                                }
+                              },
+                              onError: (errMessage) {
+                                showCommonBottomSheetWithoutHeight(
+                                  context,
+                                  child: Utils.getErrorWidget(loadingText: errMessage.toString()),
+                                  callBackFunc: () {},
+                                  isFullScreen: false,
+                                  isCloseButtonVisible: true,
+                                );
+                              });
+                        } else if (appState.isPaytabsEnabled) {
                           transID = Utils.getAppointmentTransID(
                             immediateLiveCareViewModel.immediateLiveCareSelectedClinic.serviceID!,
                             ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat ? 15 : 12,
@@ -298,7 +369,62 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
                         ).paddingSymmetrical(16.h, 16.h),
                       ).paddingSymmetrical(24.h, 0.h).onPress(() async {
                         selectedPaymentMethod = "VISA";
-                        if (appState.isPaytabsEnabled) {
+                        if (appState.isMyFatoorahEnabled) {
+                          myFatoorahViewModel.initiateCardPayment(
+                              amount: num.parse(immediateLiveCareViewModel.liveCareImmediateAppointmentFeesList.total ?? "0.0"),
+                              paymentDescription: "LiveCare Payment",
+                              displayCurrencyIso: appState.getAuthenticatedUser()!.outSa == 0
+                                  ? ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat
+                                      ? MFCurrencyISO.KUWAIT_KWD
+                                      : MFCurrencyISO.SAUDIARABIA_SAR
+                                  : MFCurrencyISO.UAE_AED,
+                              paymentOption: selectedPaymentMethod,
+                              liveServiceID: immediateLiveCareViewModel.immediateLiveCareSelectedClinic.serviceID.toString(),
+                              isScheduleLiveCare: "false",
+                              appointmentDate: DateUtil.convertDateToString(DateTime.now()),
+                              appointmentNo: "0",
+                              doctorID: "0",
+                              fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
+                              serviceID: ServiceTypeEnum.liveCareAppointment.getIdFromServiceEnum().toString(),
+                              projectID: (ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat ? 15 : 12).toString(),
+                              onSuccess: (response) async {
+                                LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr());
+                                await immediateLiveCareViewModel.addNewCallRequestForImmediateLiveCare(response.invoiceId.toString());
+                                await immediateLiveCareViewModel.getPatientLiveCareHistory();
+                                LoaderBottomSheet.hideLoader();
+                                if (immediateLiveCareViewModel.patientHasPendingLiveCareRequest) {
+                                  Navigator.pushAndRemoveUntil(
+                                      context,
+                                      CustomPageRoute(
+                                        page: LandingNavigation(),
+                                      ),
+                                      (r) => false);
+                                  Navigator.of(context).push(
+                                    CustomPageRoute(
+                                      page: ImmediateLiveCarePendingRequestPage(),
+                                    ),
+                                  );
+                                } else {
+                                  LoaderBottomSheet.hideLoader();
+                                  showCommonBottomSheetWithoutHeight(
+                                    context,
+                                    child: Utils.getErrorWidget(loadingText: "Unknown error occurred..."),
+                                    callBackFunc: () {},
+                                    isFullScreen: false,
+                                    isCloseButtonVisible: true,
+                                  );
+                                }
+                              },
+                              onError: (errMessage) {
+                                showCommonBottomSheetWithoutHeight(
+                                  context,
+                                  child: Utils.getErrorWidget(loadingText: errMessage.toString()),
+                                  callBackFunc: () {},
+                                  isFullScreen: false,
+                                  isCloseButtonVisible: true,
+                                );
+                              });
+                        } else if (appState.isPaytabsEnabled) {
                           transID = Utils.getAppointmentTransID(
                             immediateLiveCareViewModel.immediateLiveCareSelectedClinic.serviceID!,
                             ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat ? 15 : 12,
@@ -610,16 +736,31 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
                       ],
                     ).paddingSymmetrical(24.h, 0.h),
                     Platform.isIOS
-                        ? Utils.buildSvgWithAssets(
-                            icon: AppAssets.apple_pay_button,
-                            width: 200.h,
-                            height: 80.h,
-                            fit: BoxFit.contain,
-                      applyThemeColor: false
-                          ).paddingSymmetrical(24.h, 0.h).onPress(() {
+                        ?
+                        // appState.isMyFatoorahEnabled
+                        //         ? SizedBox(
+                        //             height: 50.h,
+                        //             width: double.infinity,
+                        //             child: Stack(
+                        //               children: [
+                        //                 Positioned.fill(child: mfApplePayButton),
+                        //                 Positioned.fill(
+                        //                   child: GestureDetector(
+                        //                     behavior: HitTestBehavior.opaque,
+                        //                     onTap: () {},
+                        //                   ),
+                        //                 ),
+                        //               ],
+                        //             ),
+                        //           ).paddingSymmetrical(24.h, 16.h)
+                        //         :
+                        Utils.buildSvgWithAssets(icon: AppAssets.apple_pay_button, width: 200.h, height: 80.h, fit: BoxFit.contain, applyThemeColor: false)
+                            .paddingSymmetrical(24.h, 0.h)
+                            .onPress(() async {
                             // payfortVM.setIsApplePayConfigurationLoading(true);
                             if (Utils.havePrivilege(103)) {
                               startApplePay();
+                              // myFatoorahViewModel.executeApplePayPayment();
                             } else {
                               openPaymentURL("ApplePay");
                             }
@@ -640,7 +781,7 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
     print("onBrowserLoadStart");
     print(url);
 
-    if (selectedPaymentMethod == "TAMARA") {
+    if (selectedPaymentMethod.toLowerCase() == "tamara") {
       if (Platform.isAndroid) {
         Uri uri = new Uri.dataFromString(url);
         tamaraPaymentStatus = uri.queryParameters['status'] ?? "";
@@ -680,7 +821,7 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
 
   void checkPaymentStatus() async {
     LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr());
-    if (selectedPaymentMethod == "TAMARA") {
+    if (selectedPaymentMethod.toLowerCase() == "tamara") {
       await payfortViewModel.checkTamaraPaymentStatus(
           transactionID: transID,
           onSuccess: (apiResponse) async {
@@ -936,6 +1077,7 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
           currency: appState.getAuthenticatedUser()!.outSa! == 0 ? "SAR" : "AED",
           onFailed: (failureResult) async {
             log("failureResult: ${failureResult.message.toString()}");
+            payfortViewModel.addApplePayPayfortResponse(failureResult.response);
             LoaderBottomSheet.hideLoader();
             showCommonBottomSheetWithoutHeight(
               context,
@@ -946,6 +1088,7 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
             );
           },
           onSucceeded: (successResult) async {
+            payfortViewModel.addApplePayPayfortResponse(successResult);
             LoaderBottomSheet.hideLoader();
             log("successResult: ${successResult.responseMessage.toString()}");
             selectedPaymentMethod = successResult.paymentOption ?? "VISA";
diff --git a/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart
index 970bfb4e..752a12d1 100644
--- a/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart
+++ b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart
@@ -904,6 +904,7 @@ class _WaitingAppointmentPaymentPageState extends State<WaitingAppointmentPaymen
           applePayShaRequestPhrase: payfortViewModel.payfortProjectDetailsRespModel!.shaRequest,
           currency: appState.getAuthenticatedUser()!.outSa! == 0 ? "SAR" : "AED",
           onFailed: (failureResult) async {
+            payfortViewModel.addApplePayPayfortResponse(failureResult.response);
             log("failureResult: ${failureResult.message.toString()}");
             Navigator.of(context).pop();
             showCommonBottomSheetWithoutHeight(
@@ -915,6 +916,7 @@ class _WaitingAppointmentPaymentPageState extends State<WaitingAppointmentPaymen
             );
           },
           onSucceeded: (successResult) async {
+            payfortViewModel.addApplePayPayfortResponse(successResult);
             log("successResult: ${successResult.responseMessage.toString()}");
             selectedPaymentMethod = successResult.paymentOption ?? "VISA";
             checkPaymentStatus();
diff --git a/lib/presentation/book_appointment/widgets/doctor_card.dart b/lib/presentation/book_appointment/widgets/doctor_card.dart
index 23a9cbcd..ff4b5391 100644
--- a/lib/presentation/book_appointment/widgets/doctor_card.dart
+++ b/lib/presentation/book_appointment/widgets/doctor_card.dart
@@ -219,6 +219,9 @@ class DoctorCard extends StatelessWidget {
                   );
                 } else {
                   bookAppointmentsViewModel.setSelectedDoctor(doctorsListResponseModel);
+                  GetClinicsListResponseModel selectedClinic = GetClinicsListResponseModel(
+                      clinicID: doctorsListResponseModel.clinicID, clinicDescription: doctorsListResponseModel.clinicName, isLiveCareClinicAndOnline: false, liveCareServiceID: 0, liveCareClinicID: 0);
+                  bookAppointmentsViewModel.setSelectedClinic(selectedClinic);
                   LoaderBottomSheet.showLoader();
                   bookAppointmentsViewModel.isLiveCareSchedule
                       ? await bookAppointmentsViewModel.getLiveCareDoctorFreeSlots(
@@ -308,9 +311,9 @@ class DoctorCard extends StatelessWidget {
                           });
                 }
               },
-              backgroundColor: Color(0xffFEE9EA),
-              borderColor: Color(0xffFEE9EA),
-              textColor: Color(0xffED1C2B),
+              backgroundColor: AppColors.secondaryLightRedColor,
+              borderColor: AppColors.secondaryLightRedColor,
+              textColor: AppColors.primaryRedColor,
               fontSize: 14.f,
               isBold: true,
               borderRadius: 10.r,
diff --git a/lib/presentation/emergency_services/call_ambulance/widgets/HospitalBottomSheetBody.dart b/lib/presentation/emergency_services/call_ambulance/widgets/HospitalBottomSheetBody.dart
index 7d243934..39e6f3fe 100644
--- a/lib/presentation/emergency_services/call_ambulance/widgets/HospitalBottomSheetBody.dart
+++ b/lib/presentation/emergency_services/call_ambulance/widgets/HospitalBottomSheetBody.dart
@@ -1,5 +1,4 @@
-import 'package:easy_localization/easy_localization.dart'
-    show tr, StringTranslateExtension;
+import 'package:easy_localization/easy_localization.dart' show tr, StringTranslateExtension;
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/enums.dart';
 import 'package:hmg_patient_app_new/core/utils/debouncer.dart';
@@ -14,9 +13,9 @@ import 'package:hmg_patient_app_new/presentation/emergency_services/call_ambulan
 import 'package:hmg_patient_app_new/widgets/input_widget.dart';
 
 class HospitalBottomSheetBody extends StatelessWidget {
+  final TextEditingController searchText;
 
-  final TextEditingController searchText ;
-  final Debouncer  debouncer = Debouncer(milliseconds: 500);
+  final Debouncer debouncer = Debouncer(milliseconds: 500);
 
   final int hmcCount;
   final int hmgCount;
@@ -26,11 +25,19 @@ class HospitalBottomSheetBody extends StatelessWidget {
   final Function(HospitalsModel) onHospitalClicked;
   final Function(String) onHospitalSearch;
 
-  HospitalBottomSheetBody({super.key, required this.hmcCount, required this.hmgCount, this.displayList, required this.selectedFacility, required this.onFacilityClicked, required this.onHospitalClicked, required this.onHospitalSearch, required this.searchText});
+  HospitalBottomSheetBody(
+      {super.key,
+      required this.hmcCount,
+      required this.hmgCount,
+      this.displayList,
+      required this.selectedFacility,
+      required this.onFacilityClicked,
+      required this.onHospitalClicked,
+      required this.onHospitalSearch,
+      required this.searchText});
 
   @override
   Widget build(BuildContext context) {
-
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -39,13 +46,12 @@ class HospitalBottomSheetBody extends StatelessWidget {
           hintText: LocaleKeys.searchHospital.tr(),
           controller: searchText,
           onChange: (value) {
-            debouncer.run((){
-              onHospitalSearch(value??"");
+            debouncer.run(() {
+              onHospitalSearch(value ?? "");
             });
           },
           isEnable: true,
           prefix: null,
-
           autoFocus: false,
           isBorderAllowed: false,
           keyboardType: TextInputType.text,
@@ -58,26 +64,26 @@ class HospitalBottomSheetBody extends StatelessWidget {
         ),
         SizedBox(height: 24.h),
         TypeSelectionWidget(
-          selectedFacility:selectedFacility ,
+          selectedFacility: selectedFacility,
           hmcCount: hmcCount.toString(),
           hmgCount: hmgCount.toString(),
-          onitemClicked: (selectedValue){
+          onitemClicked: (selectedValue) {
             onFacilityClicked(selectedValue);
           },
         ),
         SizedBox(height: 21.h),
         SizedBox(
-          height: MediaQuery.sizeOf(context).height * .4,
-          child: ListView.separated(
-              itemBuilder: (_, index)
-              {
+            height: MediaQuery.sizeOf(context).height * .4,
+            child: ListView.separated(
+              itemBuilder: (_, index) {
                 var hospital = displayList?[index];
                 return HospitalListItem(
                   hospitalData: Utils.convertToPatientDoctorAppointmentList(hospital),
                   isLocationEnabled: true,
-              ).onPress(() {
-                onHospitalClicked(hospital!);
-                });},
+                ).onPress(() {
+                  onHospitalClicked(hospital!);
+                });
+              },
               separatorBuilder: (_, __) => SizedBox(
                 height: 16.h,
               ),
diff --git a/lib/presentation/habib_wallet/wallet_payment_confirm_page.dart b/lib/presentation/habib_wallet/wallet_payment_confirm_page.dart
index 52cea368..ee40ae0c 100644
--- a/lib/presentation/habib_wallet/wallet_payment_confirm_page.dart
+++ b/lib/presentation/habib_wallet/wallet_payment_confirm_page.dart
@@ -7,7 +7,6 @@ import 'package:clarity_flutter/clarity_flutter.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_amazonpaymentservices/flutter_amazonpaymentservices.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/app_state.dart';
@@ -668,6 +667,7 @@ class _WalletPaymentConfirmPageState extends State<WalletPaymentConfirmPage> {
           currency: appState.getAuthenticatedUser()!.outSa! == 0 ? "SAR" : "AED",
           onFailed: (failureResult) async {
             log("failureResult: ${failureResult.message.toString()}");
+            payfortViewModel.addApplePayPayfortResponse(failureResult.response);
             showCommonBottomSheetWithoutHeight(
               context,
               child: Utils.getErrorWidget(loadingText: failureResult.message.toString()),
@@ -678,6 +678,7 @@ class _WalletPaymentConfirmPageState extends State<WalletPaymentConfirmPage> {
           },
           onSucceeded: (successResult) async {
             log("successResult: ${successResult.responseMessage.toString()}");
+            payfortViewModel.addApplePayPayfortResponse(successResult);
             selectedPaymentMethod = successResult.paymentOption ?? "VISA";
             checkPaymentStatus();
           },
@@ -830,28 +831,4 @@ class _WalletPaymentConfirmPageState extends State<WalletPaymentConfirmPage> {
         "",
         "3");
   }
-
-  Future<void> runSafePayment(Map<String, dynamic> requestParam, {String sdkToken = ""}) async {
-    dynamic result;
-
-    try {
-      // Force a 100ms microtask buffer to isolate the UI rendering channel
-      await Future.delayed(const Duration(milliseconds: 350));
-
-      result = await FlutterAmazonpaymentservices.normalPay(requestParam, ApiConsts.payFortEnvironmentType, isShowResponsePage: true);
-
-      print("Payment Success Data: ${result.toString()}");
-    } on PlatformException catch (e) {
-      // If the error is the MethodChannel duplicate reply bug, handle it safely
-      if (e.message != null && e.message!.contains("Reply already submitted")) {
-        print("Swallowed native channel race-condition crash safely.");
-        return;
-      }
-
-      // Process real payment rejection errors here
-      print("Actual Payment Failure: ${e.details.toString()}");
-    } catch (error) {
-      print("Generic Error: $error");
-    }
-  }
 }
diff --git a/lib/presentation/hmg_services/services_page.dart b/lib/presentation/hmg_services/services_page.dart
index 582fd6fc..34fc268f 100644
--- a/lib/presentation/hmg_services/services_page.dart
+++ b/lib/presentation/hmg_services/services_page.dart
@@ -72,7 +72,7 @@ class _ServicesPageState extends State<ServicesPage> {
         LocaleKeys.emergencyServices.tr(),
         "",
         AppAssets.emergency_services_icon,
-        bgColor: AppColors.primaryRedColor,
+        bgColor: AppColors.primaryRedColorBase,
         true,
         route: null, onTap: () async {
       // if (getIt.get<AppState>().isAuthenticated) {
diff --git a/lib/presentation/home/app_update_page.dart b/lib/presentation/home/app_update_page.dart
index 37dab487..e59a7e8a 100644
--- a/lib/presentation/home/app_update_page.dart
+++ b/lib/presentation/home/app_update_page.dart
@@ -76,14 +76,15 @@ class AppUpdatePage extends StatelessWidget {
     }
     if (Platform.isIOS) {
       Utils.openWebView(
-        // url: "https://itunes.apple.com/app/id733503978",
-        url: "https://itunes.apple.com/app/id6758851027",
+        url: "https://itunes.apple.com/app/id733503978",
+        // url: "https://itunes.apple.com/app/id6758851027",
       );
     }
   }
 
   Future<void> _handleAndroidAppUpdate() async {
-    const fallbackUrl = "https://play.google.com/store/apps/details?id=com.cloudsolutions.HMGPatientApp";
+    // const fallbackUrl = "https://play.google.com/store/apps/details?id=com.cloudsolutions.HMGPatientApp";
+    const fallbackUrl = "https://play.google.com/store/apps/details?id=com.ejada.hmg";
     try {
       final info = await InAppUpdate.checkForUpdate();
       print("InAppUpdate.checkForUpdate -> $info");
diff --git a/lib/presentation/home/data/landing_page_data.dart b/lib/presentation/home/data/landing_page_data.dart
index 3d98e5a1..026c1725 100644
--- a/lib/presentation/home/data/landing_page_data.dart
+++ b/lib/presentation/home/data/landing_page_data.dart
@@ -9,192 +9,190 @@ import 'package:hmg_patient_app_new/theme/colors.dart';
 
 class LandingPageData {
   static List<ServiceCardData> get getNotLoggedInServiceCardsList => [
-    ServiceCardData(
-      serviceName: "emergency",
-      icon: AppAssets.emergency_services_icon,
-      title: getIt.get<AppState>().isArabic()?LocaleKeys.services3 :LocaleKeys.emergency2,
-      subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.emergency2:LocaleKeys.services3,
-      backgroundColor: AppColors.primaryRedColor,
-      iconColor: Colors.white,
-      textColor: Colors.white,
-      isBold: true,
-    ),
-    ServiceCardData(
-      serviceName: "search_doctor",
-      icon: AppAssets.search_doctor_icon,
-      title: LocaleKeys.finda,
-      subtitle: LocaleKeys.doctor,
-      backgroundColor: AppColors.whiteColor,
-      iconColor: AppColors.blackColor,
-      textColor: AppColors.blackColor,
-      isBold: false,
-    ),
-    ServiceCardData(
-      serviceName: "health_calculators_and_converts",
-      icon: AppAssets.health_calculators_icon,
-      title: getIt.get<AppState>().isArabic()? LocaleKeys.calculators:LocaleKeys.health ,
-      subtitle: getIt.get<AppState>().isArabic()? LocaleKeys.health:LocaleKeys.calculators,
-      backgroundColor: AppColors.whiteColor,
-      iconColor: AppColors.blackColor,
-      textColor: AppColors.blackColor,
-      isBold: false,
-    ),
-    ServiceCardData(
-      serviceName: "health_converters",
-      icon: AppAssets.health_converters_icon,
-      title: getIt.get<AppState>().isArabic()? LocaleKeys.converters:LocaleKeys.health,
-      subtitle: getIt.get<AppState>().isArabic()? LocaleKeys.health:LocaleKeys.converters,
-      backgroundColor: AppColors.whiteColor,
-      iconColor: AppColors.blackColor,
-      textColor: AppColors.blackColor,
-      isBold: false,
-    ),
-    // ServiceCardData(
-    //   serviceName: "parking_guide",
-    //   icon: AppAssets.car_parking_icon,
-    //   title: getIt.get<AppState>().isArabic()? LocaleKeys.guide:LocaleKeys.parking2,
-    //   subtitle: getIt.get<AppState>().isArabic()? LocaleKeys.parking2:LocaleKeys.guide,
-    //   backgroundColor: AppColors.whiteColor,
-    //   iconColor: AppColors.blackColor,
-    //   textColor: AppColors.blackColor,
-    //   isBold: false,
-    // ),
-    ServiceCardData(
-      serviceName: "indoor_navigation",
-      icon: AppAssets.indoor_nav_icon,
-      title: LocaleKeys.indoor,
-      subtitle: LocaleKeys.thehospital,
-      backgroundColor: AppColors.whiteColor,
-      iconColor: AppColors.blackColor,
-      textColor: AppColors.blackColor,
-      isBold: false,
-    ),
-  ];
+        ServiceCardData(
+          serviceName: "emergency",
+          icon: AppAssets.emergency_services_icon,
+          title: getIt.get<AppState>().isArabic() ? LocaleKeys.services3 : LocaleKeys.emergency2,
+          subtitle: getIt.get<AppState>().isArabic() ? LocaleKeys.emergency2 : LocaleKeys.services3,
+          backgroundColor: AppColors.primaryRedColorBase,
+          iconColor: Colors.white,
+          textColor: Colors.white,
+          isBold: true,
+        ),
+        ServiceCardData(
+          serviceName: "search_doctor",
+          icon: AppAssets.search_doctor_icon,
+          title: LocaleKeys.finda,
+          subtitle: LocaleKeys.doctor,
+          backgroundColor: AppColors.whiteColor,
+          iconColor: AppColors.blackColor,
+          textColor: AppColors.blackColor,
+          isBold: false,
+        ),
+        ServiceCardData(
+          serviceName: "health_calculators_and_converts",
+          icon: AppAssets.health_calculators_icon,
+          title: getIt.get<AppState>().isArabic() ? LocaleKeys.calculators : LocaleKeys.health,
+          subtitle: getIt.get<AppState>().isArabic() ? LocaleKeys.health : LocaleKeys.calculators,
+          backgroundColor: AppColors.whiteColor,
+          iconColor: AppColors.blackColor,
+          textColor: AppColors.blackColor,
+          isBold: false,
+        ),
+        ServiceCardData(
+          serviceName: "health_converters",
+          icon: AppAssets.health_converters_icon,
+          title: getIt.get<AppState>().isArabic() ? LocaleKeys.converters : LocaleKeys.health,
+          subtitle: getIt.get<AppState>().isArabic() ? LocaleKeys.health : LocaleKeys.converters,
+          backgroundColor: AppColors.whiteColor,
+          iconColor: AppColors.blackColor,
+          textColor: AppColors.blackColor,
+          isBold: false,
+        ),
+        // ServiceCardData(
+        //   serviceName: "parking_guide",
+        //   icon: AppAssets.car_parking_icon,
+        //   title: getIt.get<AppState>().isArabic()? LocaleKeys.guide:LocaleKeys.parking2,
+        //   subtitle: getIt.get<AppState>().isArabic()? LocaleKeys.parking2:LocaleKeys.guide,
+        //   backgroundColor: AppColors.whiteColor,
+        //   iconColor: AppColors.blackColor,
+        //   textColor: AppColors.blackColor,
+        //   isBold: false,
+        // ),
+        ServiceCardData(
+          serviceName: "indoor_navigation",
+          icon: AppAssets.indoor_nav_icon,
+          title: LocaleKeys.indoor,
+          subtitle: LocaleKeys.thehospital,
+          backgroundColor: AppColors.whiteColor,
+          iconColor: AppColors.blackColor,
+          textColor: AppColors.blackColor,
+          isBold: false,
+        ),
+      ];
 
   List<ServiceCardData> get getLoggedInServiceCardsList => [
-    ServiceCardData(
-      serviceName: "emergency",
-      icon: AppAssets.emergency_services_icon,
-      title: getIt.get<AppState>().isArabic()?LocaleKeys.services3 :LocaleKeys.emergency2,
-      subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.emergency2:LocaleKeys.services3,
-      backgroundColor: AppColors.primaryRedColor,
-      iconColor: Colors.white,
-      textColor: Colors.white,
-      isBold: true,
-    ),
-    ServiceCardData(
-      serviceName: "lab_results",
-      icon: AppAssets.home_lab_result_icon,
-      title: getIt.get<AppState>().isArabic()?LocaleKeys.labSubtitle:LocaleKeys.lab,
-      subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.lab:LocaleKeys.labSubtitle ,
-      backgroundColor: AppColors.whiteColor,
-      iconColor: AppColors.blackColor,
-      textColor: AppColors.blackColor,
-      isBold: false,
-    ),
-    ServiceCardData(
-      serviceName: "radiology_results",
-      icon: AppAssets.my_radiology_icon,
-      title: getIt.get<AppState>().isArabic()?LocaleKeys.labSubtitle:LocaleKeys.radiology,
-      subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.radiology:LocaleKeys.labSubtitle ,
-      backgroundColor: AppColors.whiteColor,
-      iconColor: AppColors.blackColor,
-      textColor: AppColors.blackColor,
-      isBold: false,
-    ),
-    ServiceCardData(
-      serviceName: "prescriptions",
-      icon: AppAssets.my_prescription_icon,
-      title: getIt.get<AppState>().isArabic()?LocaleKeys.medicinesSubtitle:LocaleKeys.medicalKey,
-      subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.medicalKey:LocaleKeys.medicinesSubtitle,
-      backgroundColor: AppColors.whiteColor,
-      iconColor: AppColors.blackColor,
-      textColor: AppColors.blackColor,
-      isBold: false,
-    ),
-    ServiceCardData(
-      serviceName: "insurance_update",
-      icon: AppAssets.insurance_update_icon,
-      title: getIt.get<AppState>().isArabic()?LocaleKeys.insurance :LocaleKeys.insurance,
-      subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.medical: LocaleKeys.details2,
-      backgroundColor: AppColors.whiteColor,
-      iconColor: AppColors.blackColor,
-      textColor: AppColors.blackColor,
-      isBold: false,
-    ),
-    ServiceCardData(
-      serviceName: "my_doctors",
-      icon: AppAssets.my_doctors_icon,
-      title: getIt.get<AppState>().isArabic() ? LocaleKeys.myDoctorSubtitle2.tr() : "My",
-      subtitle: getIt.get<AppState>().isArabic() ? LocaleKeys.myDoctor.tr() : "Doctors",
-      backgroundColor: AppColors.whiteColor,
-      iconColor: AppColors.blackColor,
-      textColor: AppColors.blackColor,
-      isBold: false,
-    ),
-    ServiceCardData(
-      serviceName: "sick_leaves",
-      icon: AppAssets.my_sick_leave_icon,
-      title: getIt.get<AppState>().isArabic()?LocaleKeys.sickSubtitle:LocaleKeys.sick2,
-      subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.sick2:LocaleKeys.sickSubtitle,
-      backgroundColor: AppColors.whiteColor,
-      iconColor: AppColors.blackColor,
-      textColor: AppColors.blackColor,
-      isBold: false,
-    ),
-    ServiceCardData(
-      serviceName: "my_invoice",
-      icon: AppAssets.invoiceListIcon,
-      title: getIt.get<AppState>().isArabic()?LocaleKeys.myDoctorSubtitle2:LocaleKeys.invoiceList2,
-      subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.invoiceList2:LocaleKeys.myDoctorSubtitle2,
-      backgroundColor: AppColors.whiteColor,
-      iconColor: AppColors.blackColor,
-      textColor: AppColors.blackColor,
-      isBold: false,
-    ),
-  ];
+        ServiceCardData(
+          serviceName: "emergency",
+          icon: AppAssets.emergency_services_icon,
+          title: getIt.get<AppState>().isArabic() ? LocaleKeys.services3 : LocaleKeys.emergency2,
+          subtitle: getIt.get<AppState>().isArabic() ? LocaleKeys.emergency2 : LocaleKeys.services3,
+          backgroundColor: AppColors.primaryRedColorBase,
+          iconColor: Colors.white,
+          textColor: Colors.white,
+          isBold: true,
+        ),
+        ServiceCardData(
+          serviceName: "lab_results",
+          icon: AppAssets.home_lab_result_icon,
+          title: getIt.get<AppState>().isArabic() ? LocaleKeys.labSubtitle : LocaleKeys.lab,
+          subtitle: getIt.get<AppState>().isArabic() ? LocaleKeys.lab : LocaleKeys.labSubtitle,
+          backgroundColor: AppColors.whiteColor,
+          iconColor: AppColors.blackColor,
+          textColor: AppColors.blackColor,
+          isBold: false,
+        ),
+        ServiceCardData(
+          serviceName: "radiology_results",
+          icon: AppAssets.my_radiology_icon,
+          title: getIt.get<AppState>().isArabic() ? LocaleKeys.labSubtitle : LocaleKeys.radiology,
+          subtitle: getIt.get<AppState>().isArabic() ? LocaleKeys.radiology : LocaleKeys.labSubtitle,
+          backgroundColor: AppColors.whiteColor,
+          iconColor: AppColors.blackColor,
+          textColor: AppColors.blackColor,
+          isBold: false,
+        ),
+        ServiceCardData(
+          serviceName: "prescriptions",
+          icon: AppAssets.my_prescription_icon,
+          title: getIt.get<AppState>().isArabic() ? LocaleKeys.medicinesSubtitle : LocaleKeys.medicalKey,
+          subtitle: getIt.get<AppState>().isArabic() ? LocaleKeys.medicalKey : LocaleKeys.medicinesSubtitle,
+          backgroundColor: AppColors.whiteColor,
+          iconColor: AppColors.blackColor,
+          textColor: AppColors.blackColor,
+          isBold: false,
+        ),
+        ServiceCardData(
+          serviceName: "insurance_update",
+          icon: AppAssets.insurance_update_icon,
+          title: getIt.get<AppState>().isArabic() ? LocaleKeys.insurance : LocaleKeys.insurance,
+          subtitle: getIt.get<AppState>().isArabic() ? LocaleKeys.medical : LocaleKeys.details2,
+          backgroundColor: AppColors.whiteColor,
+          iconColor: AppColors.blackColor,
+          textColor: AppColors.blackColor,
+          isBold: false,
+        ),
+        ServiceCardData(
+          serviceName: "my_doctors",
+          icon: AppAssets.my_doctors_icon,
+          title: getIt.get<AppState>().isArabic() ? LocaleKeys.myDoctorSubtitle2.tr() : "My",
+          subtitle: getIt.get<AppState>().isArabic() ? LocaleKeys.myDoctor.tr() : "Doctors",
+          backgroundColor: AppColors.whiteColor,
+          iconColor: AppColors.blackColor,
+          textColor: AppColors.blackColor,
+          isBold: false,
+        ),
+        ServiceCardData(
+          serviceName: "sick_leaves",
+          icon: AppAssets.my_sick_leave_icon,
+          title: getIt.get<AppState>().isArabic() ? LocaleKeys.sickSubtitle : LocaleKeys.sick2,
+          subtitle: getIt.get<AppState>().isArabic() ? LocaleKeys.sick2 : LocaleKeys.sickSubtitle,
+          backgroundColor: AppColors.whiteColor,
+          iconColor: AppColors.blackColor,
+          textColor: AppColors.blackColor,
+          isBold: false,
+        ),
+        ServiceCardData(
+          serviceName: "my_invoice",
+          icon: AppAssets.invoiceListIcon,
+          title: getIt.get<AppState>().isArabic() ? LocaleKeys.myDoctorSubtitle2 : LocaleKeys.invoiceList2,
+          subtitle: getIt.get<AppState>().isArabic() ? LocaleKeys.invoiceList2 : LocaleKeys.myDoctorSubtitle2,
+          backgroundColor: AppColors.whiteColor,
+          iconColor: AppColors.blackColor,
+          textColor: AppColors.blackColor,
+          isBold: false,
+        ),
+      ];
 
   static List<ServiceCardData> get getServiceCardsList => [
-    ServiceCardData(
-      serviceName: "livecare",
-      icon: AppAssets.small_livecare_icon,
-      title: LocaleKeys.liveCare,
-      subtitle: LocaleKeys.liveCareServiceDesc,
-      largeCardIcon: AppAssets.liveCareService,
-      backgroundColor: AppColors.successColor,
-      iconColor: AppColors.whiteColor,
-      isBold: false,
-      isPNG: false
-    ),
-    // ServiceCardData(
-    //   icon: AppAssets.homeBottom,
-    //   title: "Dermatology",
-    //   subtitle: "Explore our app, View our services and offers",
-    //   largeCardIcon: AppAssets.homeBottom,
-    //   backgroundColor: AppColors.primaryRedColor,
-    //   isBold: false,
-    // ),
-    ServiceCardData(
-      serviceName: "home_health_care",
-      icon: AppAssets.homeBottom,
-      title: LocaleKeys.homeHealthCare,
-          subtitle: LocaleKeys.homeHealthCareText,
-          largeCardIcon: AppAssets.homeHealthCareService,
-      backgroundColor: AppColors.primaryRedColor,
-      iconColor: AppColors.whiteColor,
-      isBold: false,
-        isPNG: false
-    ),
-    ServiceCardData(
-      serviceName: "pharmacy",
-      icon: AppAssets.defaultMEP, //359846
-      title: LocaleKeys.hmgPharmacy,
-          subtitle: LocaleKeys.hmgPharmacyText,
-          largeCardIcon: AppAssets.pharmacyService,
-      backgroundColor: AppColors.pharmacyBGColor,
-      iconColor: null,
-      isBold: true,
-        isPNG: true
-    ),
-  ];
+        ServiceCardData(
+            serviceName: "livecare",
+            icon: AppAssets.small_livecare_icon,
+            title: LocaleKeys.liveCare,
+            subtitle: LocaleKeys.liveCareServiceDesc,
+            largeCardIcon: AppAssets.liveCareService,
+            backgroundColor: AppColors.successColor,
+            iconColor: AppColors.whiteColor,
+            isBold: false,
+            isPNG: false),
+        // ServiceCardData(
+        //   icon: AppAssets.homeBottom,
+        //   title: "Dermatology",
+        //   subtitle: "Explore our app, View our services and offers",
+        //   largeCardIcon: AppAssets.homeBottom,
+        //   backgroundColor: AppColors.primaryRedColor,
+        //   isBold: false,
+        // ),
+        ServiceCardData(
+            serviceName: "home_health_care",
+            icon: AppAssets.homeBottom,
+            title: LocaleKeys.homeHealthCare,
+            subtitle: LocaleKeys.homeHealthCareText,
+            largeCardIcon: AppAssets.homeHealthCareService,
+            backgroundColor: AppColors.primaryRedColor,
+            iconColor: AppColors.whiteColor,
+            isBold: false,
+            isPNG: false),
+        ServiceCardData(
+            serviceName: "pharmacy",
+            icon: AppAssets.defaultMEP,
+            //359846
+            title: LocaleKeys.hmgPharmacy,
+            subtitle: LocaleKeys.hmgPharmacyText,
+            largeCardIcon: AppAssets.pharmacyService,
+            backgroundColor: AppColors.pharmacyBGColor,
+            iconColor: null,
+            isBold: true,
+            isPNG: true),
+      ];
 }
diff --git a/lib/presentation/home/landing_page.dart b/lib/presentation/home/landing_page.dart
index fdb8afcf..ec0b0ba9 100644
--- a/lib/presentation/home/landing_page.dart
+++ b/lib/presentation/home/landing_page.dart
@@ -5,6 +5,7 @@ import 'dart:ui' as ui;
 import 'package:clarity_flutter/clarity_flutter.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
 import 'package:flutter_swiper_view/flutter_swiper_view.dart';
 import 'package:get_it/get_it.dart';
@@ -31,34 +32,30 @@ import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/
 import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_queue_details_response_model.dart';
 import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart';
 import 'package:hmg_patient_app_new/features/notifications/notifications_view_model.dart';
+import 'package:hmg_patient_app_new/features/occasion_theme/occasion_theme_view_model.dart';
 import 'package:hmg_patient_app_new/features/profile_settings/profile_settings_view_model.dart';
-import 'package:hmg_patient_app_new/features/paytabs/paytabs_view_model.dart';
 import 'package:hmg_patient_app_new/features/todo_section/todo_section_view_model.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/presentation/appointments/appointment_queue_page.dart';
 import 'package:hmg_patient_app_new/presentation/appointments/my_appointments_page.dart';
 import 'package:hmg_patient_app_new/presentation/appointments/widgets/appointment_card.dart';
-import 'package:hmg_patient_app_new/presentation/authentication/login.dart';
 import 'package:hmg_patient_app_new/presentation/authentication/quick_login.dart';
 import 'package:hmg_patient_app_new/presentation/book_appointment/book_appointment_page.dart';
 import 'package:hmg_patient_app_new/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart';
 import 'package:hmg_patient_app_new/presentation/contact_us/contact_us.dart';
 import 'package:hmg_patient_app_new/presentation/hmg_services/services_page.dart';
-import 'package:hmg_patient_app_new/presentation/home/app_update_page.dart';
 import 'package:hmg_patient_app_new/presentation/home/data/landing_page_data.dart';
 import 'package:hmg_patient_app_new/presentation/home/widgets/habib_wallet_card.dart';
 import 'package:hmg_patient_app_new/presentation/home/widgets/lakum_wallet_card.dart';
 import 'package:hmg_patient_app_new/presentation/home/widgets/large_service_card.dart';
+import 'package:hmg_patient_app_new/presentation/home/widgets/occasion_banner_widget.dart';
 import 'package:hmg_patient_app_new/presentation/home/widgets/small_service_card.dart';
 import 'package:hmg_patient_app_new/presentation/home/widgets/welcome_widget.dart';
 import 'package:hmg_patient_app_new/presentation/insurance/widgets/insurance_update_details_card.dart';
 import 'package:hmg_patient_app_new/presentation/medical_file/medical_file_page.dart';
 import 'package:hmg_patient_app_new/presentation/my_family/my_family.dart';
 import 'package:hmg_patient_app_new/presentation/notifications/notifications_list_page.dart';
-import 'package:hmg_patient_app_new/presentation/offers_and_discounts/offers_and_discounts_page.dart';
-import 'package:hmg_patient_app_new/presentation/offers_and_discounts/widgets/offers_and_discounts.dart';
 import 'package:hmg_patient_app_new/presentation/rate_appointment/rate_appointment_doctor.dart';
-import 'package:hmg_patient_app_new/presentation/tele_consultation/zoom/call_screen.dart';
 import 'package:hmg_patient_app_new/presentation/todo_section/ancillary_procedures_details_page.dart';
 import 'package:hmg_patient_app_new/presentation/todo_section/todo_page.dart';
 import 'package:hmg_patient_app_new/presentation/todo_section/widgets/ancillary_orders_list.dart';
@@ -126,10 +123,7 @@ class _LandingPageState extends State<LandingPage> {
     authVM.savePushTokenToAppState();
     if (mounted) {
       final user = appState.getAuthenticatedUser();
-      final hasUserQuickLoginData =
-          user != null &&
-          (user.mobileNumber?.isNotEmpty ?? false) &&
-          (user.patientIdentificationNo?.isNotEmpty ?? false);
+      final hasUserQuickLoginData = user != null && (user.mobileNumber?.isNotEmpty ?? false) && (user.patientIdentificationNo?.isNotEmpty ?? false);
 
       if (hasUserQuickLoginData) {
         authVM.checkLastLoginStatus(() {
@@ -191,7 +185,7 @@ class _LandingPageState extends State<LandingPage> {
                   onSuccess: ((response) {
                     // Only open dialog if details are loaded AND widget is mounted
                     if (!mounted || appointmentRatingViewModel.appointmentDetails == null) return;
-                    
+
                     appointmentRatingViewModel.setClinicOrDoctor(false);
                     appointmentRatingViewModel.setTitle(LocaleKeys.rateDoctor.tr());
                     appointmentRatingViewModel.setSubTitle(LocaleKeys.howWasYourLastVisitWithDoctor.tr());
@@ -227,585 +221,697 @@ class _LandingPageState extends State<LandingPage> {
       child: Scaffold(
         backgroundColor: AppColors.bgScaffoldColor,
         body: Consumer<InsuranceViewModel>(builder: (context, insuranceVM, child) {
+          // Only when an occasion theme is active AND it publishes a header
+          // banner do we switch to the sticky-header layout below. Otherwise
+          // (no occasion, or occasion active but no banner configured) the
+          // page behaves exactly as it always has — banner (if any) scrolls
+          // inline with the rest of the content.
+          final hasStickyBanner = context.watch<OccasionThemeViewModel>().headerImage?.isNotEmpty ?? false;
+
+          log("hasStickyBanner: $hasStickyBanner");
           return Stack(
             children: [
-              RefreshIndicator(
-                color: AppColors.primaryRedColor,
-                onRefresh: () async {
-                  if (appState.isAuthenticated) {
-                    // Refresh Appointments Data
-                    myAppointmentsViewModel.setIsAppointmentDataToBeLoaded(true);
-                    myAppointmentsViewModel.initAppointmentsViewModel();
-                    myAppointmentsViewModel.getPatientAppointments(true, false, isForTimeLine: true);
-
-                    // Refresh Appointments Data
-                    // habibWalletVM.initHabibWalletProvider();
-                    // habibWalletVM.getPatientBalanceAmount();
-                    // habibWalletVM.getLakumAccountInformation();
-
-                    // Refresh Ancillary Orders
-                    todoSectionViewModel.setIsAncillaryOrdersNeedReloading(true);
-                    todoSectionViewModel.initializeTodoSectionViewModel();
-
-                    // Refresh Immediate LiveCare Data
-                    immediateLiveCareViewModel.initImmediateLiveCare();
-                    immediateLiveCareViewModel.getPatientLiveCareHistory();
-
-                    // appointmentRatingViewModel.getLastRatingAppointment(
-                    //   onSuccess: (response) {
-                    //     if (appointmentRatingViewModel.appointmentRatedList.isNotEmpty) {
-                    //       appointmentRatingViewModel.getAppointmentDetails(
-                    //         appointmentRatingViewModel.appointmentRatedList.last.appointmentNo!,
-                    //         appointmentRatingViewModel.appointmentRatedList.last.projectID!,
-                    //         onSuccess: ((response) {
-                    //           appointmentRatingViewModel.setClinicOrDoctor(false);
-                    //           appointmentRatingViewModel.setTitle(LocaleKeys.rateDoctor.tr(context: context));
-                    //           appointmentRatingViewModel.setSubTitle(LocaleKeys.howWasYourLastVisitWithDoctor.tr(context: context));
-                    //           openLastRating();
-                    //           appState.setRatedVisible(true);
-                    //         }),
-                    //       );
-                    //     }
-                    //   },
-                    // );
-
-                  }
-                },
-                child: SingleChildScrollView(
-                  controller: _scrollController,
-                  physics: const AlwaysScrollableScrollPhysics(),
-                  padding: EdgeInsets.only(
-                      top: (appState.isAuthenticated && !insuranceVM.isInsuranceLoading && insuranceVM.isInsuranceExpired && insuranceVM.isInsuranceExpiryBannerShown)
-                          ? (MediaQuery.paddingOf(context).top + 70.h)
-                          : kToolbarHeight + 16.h,
-                      bottom: 24.h),
-                  child: Column(
-                    spacing: 16.h,
-                    children: [
-                      Row(
-                        spacing: 8.h,
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          appState.isAuthenticated
-                              ? WelcomeWidget(
-                                  onTap: () {
-                                    // ...existing navigation code...
-
-                                    Navigator.of(context).push(
-                                      CustomPageRoute(
-                                        direction: AxisDirection.down,
-                                        page: FamilyMedicalScreen(),
-                                      ),
-                                    );
-
-                                    // Navigator.pushReplacementNamed(
-                                    //   // context,
-                                    //   GetIt.instance<NavigationService>().navigatorKey.currentContext!,
-                                    //   AppRoutes.zoomCallPage,
-                                    //   // arguments: CallArguments(appointmentID, "111", "Patient", "40", "1", true, 1),
-                                    //   arguments: CallArguments("yosemite-338", "123", "Patient", "40", "0", true, 1),
-                                    //   // arguments: CallArguments("SmallDailyStandup9875", "123", "Patient", "40", "0", false, int.parse(widget.incomingCallData!.appointmentNo!)),
-                                    // );
-                                  },
-                                  name: ('${appState.getAuthenticatedUser()!.firstName!} ${appState.getAuthenticatedUser()!.lastName!}'),
-                                  imageWidget: Selector<ProfileSettingsViewModel, String?>(
-                                    selector: (_, profileVM) => profileVM.profileImageData ?? appState.getProfileImageData,
-                                    shouldRebuild: (previous, next) => previous != next,
-                                    builder: (context, profileImageData, child) {
-                                      // Only rebuild when profile image data changes
-                                      return UserAvatarWidget(
-                                        key: ValueKey('landing_avatar_${profileImageData?.hashCode ?? 0}'),
-                                        width: 42.w,
-                                        height: 42.h,
-                                        fit: BoxFit.cover,
-                                        isCircular: true,
-                                        customProfileImageData: profileImageData,
-                                      );
-                                    },
-                                  ),
-                                ).expanded
-                              : CustomButton(
-                                  text: LocaleKeys.loginOrRegister.tr(context: context),
-                                  onPressed: () async {
-                                    await authVM.onLoginPressed();
-
-                                    // Navigator.pushReplacementNamed(
-                                    //   // context,
-                                    //   GetIt.instance<NavigationService>().navigatorKey.currentContext!,
-                                    //   AppRoutes.zoomCallPage,
-                                    //   arguments: CallArguments("lake-tahoe-289", "123", "Patient", "40", "0", true, 1),
-                                    // );
-
-                                    // Navigator.of(context).push(
-                                    //   CustomPageRoute(
-                                    //     // page: NotificationsListPage(),
-                                    //     page: AppUpdatePage(
-                                    //         appUpdateMessage:
-                                    //             "A new update for Dr.Alhabib app is now available with new features and services.\r\nFor technical support:\r\neservices.hmg@drsulaimanalhabib.com"),
-                                    //   ),
-                                    // );
-
-                                    // ...existing commented code...
-                                  },
-                                  backgroundColor: AppColors.secondaryLightRedColor,
-                                  borderColor: AppColors.secondaryLightRedColor,
-                                  textColor: AppColors.primaryRedColor,
-                                  fontSize: 14.f,
-                                  fontWeight: FontWeight.w700,
-                                  borderRadius: 12.r,
-                                  padding: EdgeInsets.fromLTRB(12.h, 0, 12.h, 0),
-                                  height: 40.h,
-                                ),
-                          Consumer<TodoSectionViewModel>(builder: (context, todoSectionVM, child) {
-                            return Row(
-                              mainAxisSize: MainAxisSize.min,
-                              // spacing: 18.h,
+              // Renders nothing unless a remote-config occasion theme (e.g.
+              // National Day) is currently active — fills the whole page,
+              // behind all other content below.
+              const OccasionBackgroundWidget(),
+
+              if (hasStickyBanner)
+                // Android 15+ (targetSdk 36) enforces edge-to-edge and
+                // silently ignores SystemUiOverlayStyle.statusBarColor, so
+                // the status bar's background must be painted manually.
+                // AppColors.primaryRedColor already resolves to the active
+                // occasion's color, so this needs no extra plumbing.
+                Positioned(
+                  top: 0,
+                  left: 0,
+                  right: 0,
+                  child: Container(
+                    height: MediaQuery.paddingOf(context).top,
+                    color: AppColors.primaryRedColor,
+                  ),
+                ),
+
+              Column(
+                children: [
+                  // Pinned/sticky header — only rendered here when an
+                  // occasion banner is active; scrollable content below
+                  // fills the remaining space and scrolls independently.
+                  // Only the banner itself is offset clear of the status
+                  // bar — the scrollable content underneath intentionally
+                  // keeps extending edge-to-edge behind it (unchanged from
+                  // before), with the AnimatedOpacity gradient smoothing
+                  // that transition as the user scrolls.
+                  if (hasStickyBanner)
+                    Padding(
+                      padding: EdgeInsets.only(top: MediaQuery.paddingOf(context).top - 12.h),
+                      child: const OccasionBannerWidget(),
+                    ),
+                  Expanded(
+                    child: RefreshIndicator(
+                      color: AppColors.primaryRedColor,
+                      onRefresh: () async {
+                        // Re-check Remote Config for occasion theme changes on
+                        // pull-to-refresh (independent of auth state) — handy for
+                        // testing without needing to restart the app.
+                        unawaited(GetIt.instance<OccasionThemeViewModel>().refresh());
+
+                        if (appState.isAuthenticated) {
+                          // Refresh Appointments Data
+                          myAppointmentsViewModel.setIsAppointmentDataToBeLoaded(true);
+                          myAppointmentsViewModel.initAppointmentsViewModel();
+                          myAppointmentsViewModel.getPatientAppointments(true, false, isForTimeLine: true);
+
+                          // Refresh Appointments Data
+                          // habibWalletVM.initHabibWalletProvider();
+                          // habibWalletVM.getPatientBalanceAmount();
+                          // habibWalletVM.getLakumAccountInformation();
+
+                          // Refresh Ancillary Orders
+                          todoSectionViewModel.setIsAncillaryOrdersNeedReloading(true);
+                          todoSectionViewModel.initializeTodoSectionViewModel();
+
+                          // Refresh Immediate LiveCare Data
+                          immediateLiveCareViewModel.initImmediateLiveCare();
+                          immediateLiveCareViewModel.getPatientLiveCareHistory();
+
+                          // appointmentRatingViewModel.getLastRatingAppointment(
+                          //   onSuccess: (response) {
+                          //     if (appointmentRatingViewModel.appointmentRatedList.isNotEmpty) {
+                          //       appointmentRatingViewModel.getAppointmentDetails(
+                          //         appointmentRatingViewModel.appointmentRatedList.last.appointmentNo!,
+                          //         appointmentRatingViewModel.appointmentRatedList.last.projectID!,
+                          //         onSuccess: ((response) {
+                          //           appointmentRatingViewModel.setClinicOrDoctor(false);
+                          //           appointmentRatingViewModel.setTitle(LocaleKeys.rateDoctor.tr(context: context));
+                          //           appointmentRatingViewModel.setSubTitle(LocaleKeys.howWasYourLastVisitWithDoctor.tr(context: context));
+                          //           openLastRating();
+                          //           appState.setRatedVisible(true);
+                          //         }),
+                          //       );
+                          //     }
+                          //   },
+                          // );
+                        }
+                      },
+                      child: SingleChildScrollView(
+                        controller: _scrollController,
+                        physics: const AlwaysScrollableScrollPhysics(),
+                        padding: EdgeInsets.only(
+                            top: (appState.isAuthenticated && !insuranceVM.isInsuranceLoading && insuranceVM.isInsuranceExpired && insuranceVM.isInsuranceExpiryBannerShown)
+                                ? (MediaQuery.paddingOf(context).top + 70.h)
+                                // When the occasion banner is pinned above (hasStickyBanner), it
+                                // already occupies the toolbar-height space that this padding
+                                // otherwise reserves — so only a small breathing gap is needed.
+                                : (hasStickyBanner ? 16.h : kToolbarHeight + 16.h),
+                            bottom: 24.h),
+                        child: Column(
+                          children: [
+                            if (!hasStickyBanner) const OccasionBannerWidget(),
+                            Row(
+                              spacing: 8.h,
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: [
-                                Stack(clipBehavior: Clip.none, children: [
-                                  if (appState.isAuthenticated) Utils.buildSvgWithAssets(icon: AppAssets.bell, height: 24.h, width: 24.h),
-                                  (appState.isAuthenticated && todoSectionVM.notificationsCount != null && todoSectionVM.notificationsCount != "0")
-                                      ? Positioned(
-                                          // right: appState.isArabic() ? 8.w : -8.w,
-                                          top: -8.h,
-                                          // left: 4.h,
-                                          // bottom: 4.h,
-                                          child: Container(
-                                            width: 18.w,
-                                            height: 18.h,
-                                            padding: EdgeInsets.all(2),
-                                            decoration: BoxDecoration(
-                                              color: AppColors.primaryRedColor,
-                                              borderRadius: BorderRadius.circular(20.r),
+                                appState.isAuthenticated
+                                    ? WelcomeWidget(
+                                        onTap: () {
+                                          // ...existing navigation code...
+
+                                          Navigator.of(context).push(
+                                            CustomPageRoute(
+                                              direction: AxisDirection.down,
+                                              page: FamilyMedicalScreen(),
                                             ),
-                                            child: Text(
-                                              todoSectionVM.notificationsCount ?? "0",
-                                              style: TextStyle(
-                                                color: Colors.white,
-                                                fontFamily: "Poppins",
-                                                fontSize: 10.f,
-                                                fontWeight: FontWeight.w600,
-                                              ),
-                                              textAlign: TextAlign.center,
+                                          );
+
+                                          // Navigator.pushReplacementNamed(
+                                          //   // context,
+                                          //   GetIt.instance<NavigationService>().navigatorKey.currentContext!,
+                                          //   AppRoutes.zoomCallPage,
+                                          //   // arguments: CallArguments(appointmentID, "111", "Patient", "40", "1", true, 1),
+                                          //   arguments: CallArguments("yosemite-338", "123", "Patient", "40", "0", true, 1),
+                                          //   // arguments: CallArguments("SmallDailyStandup9875", "123", "Patient", "40", "0", false, int.parse(widget.incomingCallData!.appointmentNo!)),
+                                          // );
+                                        },
+                                        name: ('${appState.getAuthenticatedUser()!.firstName!} ${appState.getAuthenticatedUser()!.lastName!}'),
+                                        imageWidget: Selector<ProfileSettingsViewModel, String?>(
+                                          selector: (_, profileVM) => profileVM.profileImageData ?? appState.getProfileImageData,
+                                          shouldRebuild: (previous, next) => previous != next,
+                                          builder: (context, profileImageData, child) {
+                                            // Only rebuild when profile image data changes
+                                            return UserAvatarWidget(
+                                              key: ValueKey('landing_avatar_${profileImageData?.hashCode ?? 0}'),
+                                              width: 42.w,
+                                              height: 42.h,
+                                              fit: BoxFit.cover,
+                                              isCircular: true,
+                                              customProfileImageData: profileImageData,
+                                            );
+                                          },
+                                        ),
+                                      ).expanded
+                                    : CustomButton(
+                                        text: LocaleKeys.loginOrRegister.tr(context: context),
+                                        onPressed: () async {
+                                          await authVM.onLoginPressed();
+
+                                          // Navigator.pushReplacementNamed(
+                                          //   // context,
+                                          //   GetIt.instance<NavigationService>().navigatorKey.currentContext!,
+                                          //   AppRoutes.zoomCallPage,
+                                          //   arguments: CallArguments("lake-tahoe-289", "123", "Patient", "40", "0", true, 1),
+                                          // );
+
+                                          // Navigator.of(context).push(
+                                          //   CustomPageRoute(
+                                          //     // page: NotificationsListPage(),
+                                          //     page: AppUpdatePage(
+                                          //         appUpdateMessage:
+                                          //             "A new update for Dr.Alhabib app is now available with new features and services.\r\nFor technical support:\r\neservices.hmg@drsulaimanalhabib.com"),
+                                          //   ),
+                                          // );
+
+                                          // ...existing commented code...
+                                        },
+                                        backgroundColor: AppColors.secondaryLightRedColor,
+                                        borderColor: Colors.transparent,
+                                        textColor: AppColors.primaryRedColor,
+                                        fontSize: 14.f,
+                                        fontWeight: FontWeight.w700,
+                                        borderRadius: 10.r,
+                                        padding: EdgeInsets.fromLTRB(12.h, 0, 12.h, 0),
+                                        height: 40.h,
+                                      ),
+                                Consumer<TodoSectionViewModel>(builder: (context, todoSectionVM, child) {
+                                  return Row(
+                                    mainAxisSize: MainAxisSize.min,
+                                    // spacing: 18.h,
+                                    children: [
+                                      Stack(clipBehavior: Clip.none, children: [
+                                        if (appState.isAuthenticated) Utils.buildSvgWithAssets(icon: AppAssets.bell, height: 24.h, width: 24.h),
+                                        (appState.isAuthenticated && todoSectionVM.notificationsCount != null && todoSectionVM.notificationsCount != "0")
+                                            ? Positioned(
+                                                // right: appState.isArabic() ? 8.w : -8.w,
+                                                top: -8.h,
+                                                // left: 4.h,
+                                                // bottom: 4.h,
+                                                child: Container(
+                                                  width: 18.w,
+                                                  height: 18.h,
+                                                  padding: EdgeInsets.all(2),
+                                                  decoration: BoxDecoration(
+                                                    color: AppColors.primaryRedColorBase,
+                                                    borderRadius: BorderRadius.circular(20.r),
+                                                  ),
+                                                  child: Text(
+                                                    todoSectionVM.notificationsCount ?? "0",
+                                                    style: TextStyle(
+                                                      color: Colors.white,
+                                                      fontFamily: "Poppins",
+                                                      fontSize: 10.f,
+                                                      fontWeight: FontWeight.w600,
+                                                    ),
+                                                    textAlign: TextAlign.center,
+                                                  ),
+                                                ),
+                                              )
+                                            : SizedBox.shrink(),
+                                      ]).onPress(() async {
+                                        if (appState.isAuthenticated) {
+                                          notificationsViewModel.onNotificationTabChange(0);
+                                          notificationsViewModel.setNotificationStatusID(2);
+                                          notificationsViewModel.getAllNotifications();
+                                          Navigator.of(context).push(
+                                            CustomPageRoute(
+                                              page: NotificationsListPage(),
+                                              // page: LoginScreen(),
                                             ),
-                                          ),
-                                        )
-                                      : SizedBox.shrink(),
-                                ]).onPress(() async {
-                                  if (appState.isAuthenticated) {
-                                    notificationsViewModel.setNotificationStatusID(2);
-                                    notificationsViewModel.getAllNotifications();
-                                    Navigator.of(context).push(
-                                      CustomPageRoute(
-                                        page: NotificationsListPage(),
-                                        // page: LoginScreen(),
+                                          );
+                                        } else {
+                                          await authVM.onLoginPressed();
+                                        }
+                                      }),
+                                      SizedBox(
+                                        width: 24.w,
                                       ),
-                                    );
-                                  } else {
-                                    await authVM.onLoginPressed();
-                                  }
-                                }),
-                                SizedBox(
-                                  width: 24.w,
-                                ),
-                                Utils.buildSvgWithAssets(icon: AppAssets.location, height: 24.h, width: 24.w).onPress(() {
-                                  // openIndoorNavigationBottomSheet(context);
-                                  showCommonBottomSheetWithoutHeight(
-                                    context,
-                                    title: LocaleKeys.contactUs.tr(),
-                                    child: ContactUs(),
-                                    callBackFunc: () {},
-                                    isFullScreen: false,
+                                      Utils.buildSvgWithAssets(icon: AppAssets.location, height: 24.h, width: 24.w).onPress(() {
+                                        // openIndoorNavigationBottomSheet(context);
+                                        showCommonBottomSheetWithoutHeight(
+                                          context,
+                                          title: LocaleKeys.contactUs.tr(),
+                                          child: ContactUs(),
+                                          callBackFunc: () {},
+                                          isFullScreen: false,
+                                        );
+                                      }),
+
+                                      // Utils.buildSvgWithAssets(icon: AppAssets.contact_icon, height: 24.h, width: 24.h).onPress(() {
+                                      //   showCommonBottomSheetWithoutHeight(
+                                      //     context,
+                                      //     title: LocaleKeys.contactUs.tr(),
+                                      //     child: ContactUs(),
+                                      //     callBackFunc: () {},
+                                      //     isFullScreen: false,
+                                      //   );
+                                      // }),
+                                      !appState.isAuthenticated
+                                          ? Row(children: [
+                                              SizedBox(width: 24.w),
+                                              Utils.buildSvgWithAssets(icon: appState.isArabic() ? AppAssets.enLangIcon : AppAssets.arLangIcon, height: 24.h, width: 24.h).onPress(() {
+                                                context.setLocale(appState.isArabic() ? Locale('en', 'US') : Locale('ar', 'SA'));
+                                              })
+                                            ])
+                                          : SizedBox()
+                                    ],
                                   );
                                 }),
-
-                                // Utils.buildSvgWithAssets(icon: AppAssets.contact_icon, height: 24.h, width: 24.h).onPress(() {
-                                //   showCommonBottomSheetWithoutHeight(
-                                //     context,
-                                //     title: LocaleKeys.contactUs.tr(),
-                                //     child: ContactUs(),
-                                //     callBackFunc: () {},
-                                //     isFullScreen: false,
-                                //   );
-                                // }),
-                                !appState.isAuthenticated
-                                    ? Row(children: [
-                                        SizedBox(width: 24.w),
-                                        Utils.buildSvgWithAssets(icon: appState.isArabic() ? AppAssets.enLangIcon : AppAssets.arLangIcon, height: 24.h, width: 24.h).onPress(() {
-                                          context.setLocale(appState.isArabic() ? Locale('en', 'US') : Locale('ar', 'SA'));
-                                        })
-                                      ])
-                                    : SizedBox()
                               ],
-                            );
-                          }),
-                        ],
-                      ).paddingSymmetrical(24.h, 0.h),
-                      !appState.isAuthenticated
-                          ? Container(
-                              decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-                                color: AppColors.whiteColor,
-                                borderRadius: 24.r,
-                                hasShadow: false,
-                              ),
-                              child: Padding(
-                                padding: EdgeInsets.all(16.h),
-                                child: Row(
-                                  children: [
-                                    Utils.buildSvgWithAssets(
-                                      width: 50.w,
-                                      height: 60.h,
-                                      icon: AppAssets.symptomCheckerIcon,
-                                      fit: BoxFit.contain,
+                            ).paddingSymmetrical(24.h, 0.h),
+                            SizedBox(height: 8.h),
+                            !appState.isAuthenticated
+                                ? Container(
+                                    decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+                                      color: AppColors.whiteColor,
+                                      borderRadius: 24.r,
+                                      hasShadow: false,
                                     ),
-                                    SizedBox(width: 12.w),
-                                    Column(
-                                      crossAxisAlignment: CrossAxisAlignment.start,
-                                      children: [
-                                        LocaleKeys.howAreYouFeelingToday.tr(context: context).toText14(isBold: true),
-                                        LocaleKeys.checkYourSymptomsWithScale.tr(context: context).toText12(isBold: true),
-                                        SizedBox(height: 14.h),
-                                        CustomButton(
-                                          text: LocaleKeys.checkYourSymptoms.tr(context: context),
-                                          onPressed: () async {
-                                            context.navigateWithName(AppRoutes.userInfoSelection);
-                                          },
-                                          padding: EdgeInsetsGeometry.zero,
-                                          backgroundColor: AppColors.primaryRedColor,
-                                          borderColor: AppColors.primaryRedColor,
-                                          textColor: Colors.white,
-                                          fontSize: 14.f,
-                                          fontWeight: FontWeight.w600,
-                                          borderRadius: 12.r,
-                                          height: 40.h,
-                                        ),
-                                      ],
-                                    ).expanded
-                                  ],
-                                ),
-                              ),
-                            ).paddingSymmetrical(24.w, 0.h)
-                          : SizedBox.shrink(),
-
-                      // Offers And Discounts Carousel - Auto-scrolling from right to left
-                      // appState.isAuthenticated && appState.isEnabledOffersAndDiscountsCarousel
-                      //     ? Column(
-                      //         children: [
-                      //           SizedBox(height: 12.h),
-                      //           Row(
-                      //             mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      //             children: [
-                      //               ("${LocaleKeys.offers.tr(context: context)} & ${LocaleKeys.discount.tr(context: context)}").toText16(isBold: true),
-                      //               Row(
-                      //                 children: [
-                      //                   LocaleKeys.viewAll.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true),
-                      //                   SizedBox(width: 2.h),
-                      //                   Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 14.h),
-                      //                 ],
-                      //               ),
-                      //             ],
-                      //           ).paddingSymmetrical(24.h, 0.h).onPress(() {
-                      //             Navigator.of(context).push(CustomPageRoute(page: OffersAndDiscountsPage()));
-                      //           }),
-                      //           SizedBox(height: 16.h),
-                      //           OffersAndDiscountsCarousel().paddingSymmetrical(24.h, 0.h),
-                      //           SizedBox(height: 18.h),
-                      //         ],
-                      //       )
-                      //     : SizedBox.shrink(),
-
-                      appState.isAuthenticated
-                          ? Column(
-                              children: [
-                                SizedBox(height: 12.h),
-                                Row(
-                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                  children: [
-                                    LocaleKeys.appointmentsAndVisits.tr(context: context).toText16(isBold: true),
-                                    Row(
-                                      children: [
-                                        LocaleKeys.viewAll.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true),
-                                        SizedBox(width: 2.h),
-                                        Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 14.h),
-                                      ],
+                                    child: Padding(
+                                      padding: EdgeInsets.all(16.h),
+                                      child: Row(
+                                        children: [
+                                          Utils.buildSvgWithAssets(
+                                            width: 50.w,
+                                            height: 60.h,
+                                            icon: AppAssets.symptomCheckerIcon,
+                                            fit: BoxFit.contain,
+                                          ),
+                                          SizedBox(width: 12.w),
+                                          Column(
+                                            crossAxisAlignment: CrossAxisAlignment.start,
+                                            children: [
+                                              LocaleKeys.howAreYouFeelingToday.tr(context: context).toText14(isBold: true),
+                                              LocaleKeys.checkYourSymptomsWithScale.tr(context: context).toText12(isBold: true),
+                                              SizedBox(height: 14.h),
+                                              CustomButton(
+                                                text: LocaleKeys.checkYourSymptoms.tr(context: context),
+                                                onPressed: () async {
+                                                  context.navigateWithName(AppRoutes.userInfoSelection);
+                                                },
+                                                padding: EdgeInsetsGeometry.zero,
+                                                backgroundColor: AppColors.primaryRedColor,
+                                                borderColor: AppColors.primaryRedColor,
+                                                textColor: Colors.white,
+                                                fontSize: 14.f,
+                                                fontWeight: FontWeight.w600,
+                                                borderRadius: 12.r,
+                                                height: 40.h,
+                                              ),
+                                            ],
+                                          ).expanded
+                                        ],
+                                      ),
                                     ),
-                                  ],
-                                ).paddingSymmetrical(24.h, 0.h).onPress(() {
-                                  myAppointmentsViewModel.onTabChange(0);
-                                  myAppointmentsViewModel.updateListWRTTab(0);
-
-                                  Navigator.of(context).push(CustomPageRoute(page: MyAppointmentsPage()));
-                                  // getIt.get<PayTabsViewModel>().setPaymentConfiguration("Appointment Payment", 15.5);
-                                  // getIt.get<PayTabsViewModel>().startCardPayment();
-                                }),
-                                Consumer3<MyAppointmentsViewModel, ImmediateLiveCareViewModel, TodoSectionViewModel>(
-                                  builder: (context, myAppointmentsVM, immediateLiveCareVM, todoSectionVM, child) {
-                                    return myAppointmentsVM.isMyAppointmentsLoading
-                                        ? Container(
-                                            decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-                                              color: AppColors.whiteColor,
-                                              borderRadius: 24.r,
-                                              hasShadow: true,
-                                            ),
-                                            child: AppointmentCard(
-                                              patientAppointmentHistoryResponseModel: PatientAppointmentHistoryResponseModel(),
-                                              myAppointmentsViewModel: myAppointmentsViewModel,
-                                              bookAppointmentsViewModel: bookAppointmentsViewModel,
-                                              isLoading: true,
-                                              isFromHomePage: true,
-                                            ),
-                                          ).paddingSymmetrical(24.h, 16.h)
-                                        : myAppointmentsVM.patientAppointmentsHistoryList.isNotEmpty
-                                            ? myAppointmentsVM.patientAppointmentsHistoryList.length == 1 && !immediateLiveCareVM.patientHasPendingLiveCareRequest
-                                                ? Container(
-                                                    decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-                                                      color: AppColors.whiteColor,
-                                                      borderRadius: 24.r,
-                                                      hasShadow: true,
-                                                    ),
-                                                    child: AppointmentCard(
-                                                      patientAppointmentHistoryResponseModel: myAppointmentsVM.patientAppointmentsHistoryList.first,
-                                                      myAppointmentsViewModel: myAppointmentsViewModel,
-                                                      bookAppointmentsViewModel: bookAppointmentsViewModel,
-                                                      isLoading: false,
-                                                      isFromHomePage: true,
-                                                    ),
-                                                  ).paddingSymmetrical(24.h, 0.h)
-                                                : isTablet
-                                                    ? SizedBox(
-                                                        height: isTablet ? 290.h : 255.h,
-                                                        child: ListView.separated(
-                                                          scrollDirection: Axis.horizontal,
-                                                          itemCount: () {
-                                                            final int baseCount =
-                                                                myAppointmentsVM.patientAppointmentsHistoryList.length + (immediateLiveCareVM.patientHasPendingLiveCareRequest ? 1 : 0);
-                                                            return baseCount < 3 ? baseCount : 3;
-                                                          }(),
-                                                          shrinkWrap: true,
-                                                          padding: EdgeInsets.only(left: 16.h, right: 16.h),
-                                                          itemBuilder: (context, index) {
-                                                            return SizedBox(
-                                                              height: isTablet ? 290.h : 255.h,
-                                                              width: 250.w,
-                                                              child: getIndexSwiperCard(index),
-                                                            );
-                                                            // return AnimationConfiguration.staggeredList(
-                                                            //   position: index,
-                                                            //   duration: const Duration(milliseconds: 1000),
-                                                            //   child: SlideAnimation(
-                                                            //     horizontalOffset: 100.0,
-                                                            //     child: FadeInAnimation(
-                                                            //       child: SizedBox(
-                                                            //         height: 255.h,
-                                                            //         width: 250.w,
-                                                            //         child: getIndexSwiperCard(index),
-                                                            //       ),
-                                                            //     ),
-                                                            //   ),
-                                                            // );
-                                                          },
-                                                          separatorBuilder: (BuildContext cxt, int index) => SizedBox(
-                                                            width: 10.w,
+                                  ).paddingSymmetrical(24.w, 0.h)
+                                : SizedBox.shrink(),
+                            SizedBox(height: 16.h),
+
+                            // Offers And Discounts Carousel - Auto-scrolling from right to left
+                            // appState.isAuthenticated && appState.isEnabledOffersAndDiscountsCarousel
+                            //     ? Column(
+                            //         children: [
+                            //           SizedBox(height: 12.h),
+                            //           Row(
+                            //             mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            //             children: [
+                            //               ("${LocaleKeys.offers.tr(context: context)} & ${LocaleKeys.discount.tr(context: context)}").toText16(isBold: true),
+                            //               Row(
+                            //                 children: [
+                            //                   LocaleKeys.viewAll.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true),
+                            //                   SizedBox(width: 2.h),
+                            //                   Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 14.h),
+                            //                 ],
+                            //               ),
+                            //             ],
+                            //           ).paddingSymmetrical(24.h, 0.h).onPress(() {
+                            //             Navigator.of(context).push(CustomPageRoute(page: OffersAndDiscountsPage()));
+                            //           }),
+                            //           SizedBox(height: 16.h),
+                            //           OffersAndDiscountsCarousel().paddingSymmetrical(24.h, 0.h),
+                            //           SizedBox(height: 18.h),
+                            //         ],
+                            //       )
+                            //     : SizedBox.shrink(),
+
+                            appState.isAuthenticated
+                                ? Column(
+                                    children: [
+                                      SizedBox(height: 12.h),
+                                      Row(
+                                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                        children: [
+                                          LocaleKeys.appointmentsAndVisits.tr(context: context).toText16(isBold: true),
+                                          Row(
+                                            children: [
+                                              LocaleKeys.viewAll.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true),
+                                              SizedBox(width: 2.h),
+                                              Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 14.h),
+                                            ],
+                                          ),
+                                        ],
+                                      ).paddingSymmetrical(24.h, 0.h).onPress(() {
+                                        myAppointmentsViewModel.onTabChange(0);
+                                        myAppointmentsViewModel.updateListWRTTab(0);
+
+                                        Navigator.of(context).push(CustomPageRoute(page: MyAppointmentsPage()));
+                                        // getIt.get<PayTabsViewModel>().setPaymentConfiguration("Appointment Payment", 15.5);
+                                        // getIt.get<PayTabsViewModel>().startCardPayment();
+                                      }),
+                                      Consumer3<MyAppointmentsViewModel, ImmediateLiveCareViewModel, TodoSectionViewModel>(
+                                        builder: (context, myAppointmentsVM, immediateLiveCareVM, todoSectionVM, child) {
+                                          return myAppointmentsVM.isMyAppointmentsLoading
+                                              ? Container(
+                                                  decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+                                                    color: AppColors.whiteColor,
+                                                    borderRadius: 24.r,
+                                                    hasShadow: true,
+                                                  ),
+                                                  child: AppointmentCard(
+                                                    patientAppointmentHistoryResponseModel: PatientAppointmentHistoryResponseModel(),
+                                                    myAppointmentsViewModel: myAppointmentsViewModel,
+                                                    bookAppointmentsViewModel: bookAppointmentsViewModel,
+                                                    isLoading: true,
+                                                    isFromHomePage: true,
+                                                  ),
+                                                ).paddingSymmetrical(24.h, 16.h)
+                                              : myAppointmentsVM.patientAppointmentsHistoryList.isNotEmpty
+                                                  ? myAppointmentsVM.patientAppointmentsHistoryList.length == 1 && !immediateLiveCareVM.patientHasPendingLiveCareRequest
+                                                      ? Container(
+                                                          decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+                                                            color: AppColors.whiteColor,
+                                                            borderRadius: 24.r,
+                                                            hasShadow: true,
                                                           ),
-                                                        ),
-                                                      )
-                                                    : SizedBox(
-                                                        height: 255.h + 20 + 30, // itemHeight + shadow padding (10 top + 10 bottom) + pagination dots space
-                                                        child: Builder(
-                                                          builder: (context) {
-                                                            final int baseAppointmentCount = myAppointmentsVM.patientAppointmentsHistoryList.length;
-                                                            final int liveCareCount = immediateLiveCareVM.patientHasPendingLiveCareRequest ? 1 : 0;
-                                                            final int totalCount = baseAppointmentCount + liveCareCount;
-
-                                                            final int swiperItemCount = myAppointmentsVM.isMyAppointmentsLoading
-                                                                ? 3
-                                                                : totalCount < 3
-                                                                    ? totalCount
-                                                                    : 3;
-                                                            final bool isArabic = appState.isArabic();
-                                                            return Swiper(
-                                                              itemCount: swiperItemCount,
-                                                              layout: SwiperLayout.STACK,
-                                                              loop: false,
-                                                              itemWidth: MediaQuery.of(context).size.width - 48.h,
-                                                              indicatorLayout: PageIndicatorLayout.COLOR,
-                                                              axisDirection: isArabic ? AxisDirection.right : AxisDirection.left,
-                                                              controller: _controller,
-                                                              index: isArabic ? swiperItemCount - 1 : 0,
-                                                              itemHeight: 255.h + 20,
-                                                              // extra space for shadow
-                                                              pagination: SwiperPagination(
-                                                                alignment: Alignment.bottomCenter,
-                                                                margin: EdgeInsets.only(top: 220.h + 20 + 8 + 24),
-                                                                builder: _DirectionalDotPaginationBuilder(
-                                                                  color: Color(0xffD9D9D9),
-                                                                  activeColor: AppColors.blackBgColor,
-                                                                  isRTL: isArabic,
-                                                                  totalCount: swiperItemCount,
+                                                          child: AppointmentCard(
+                                                            patientAppointmentHistoryResponseModel: myAppointmentsVM.patientAppointmentsHistoryList.first,
+                                                            myAppointmentsViewModel: myAppointmentsViewModel,
+                                                            bookAppointmentsViewModel: bookAppointmentsViewModel,
+                                                            isLoading: false,
+                                                            isFromHomePage: true,
+                                                          ),
+                                                        ).paddingSymmetrical(24.h, 0.h)
+                                                      : isTablet
+                                                          ? SizedBox(
+                                                              height: isTablet ? 290.h : 255.h,
+                                                              child: ListView.separated(
+                                                                scrollDirection: Axis.horizontal,
+                                                                itemCount: () {
+                                                                  final int baseCount =
+                                                                      myAppointmentsVM.patientAppointmentsHistoryList.length + (immediateLiveCareVM.patientHasPendingLiveCareRequest ? 1 : 0);
+                                                                  return baseCount < 3 ? baseCount : 3;
+                                                                }(),
+                                                                shrinkWrap: true,
+                                                                padding: EdgeInsets.only(left: 16.h, right: 16.h),
+                                                                itemBuilder: (context, index) {
+                                                                  return SizedBox(
+                                                                    height: isTablet ? 290.h : 255.h,
+                                                                    width: 250.w,
+                                                                    child: getIndexSwiperCard(index),
+                                                                  );
+                                                                  // return AnimationConfiguration.staggeredList(
+                                                                  //   position: index,
+                                                                  //   duration: const Duration(milliseconds: 1000),
+                                                                  //   child: SlideAnimation(
+                                                                  //     horizontalOffset: 100.0,
+                                                                  //     child: FadeInAnimation(
+                                                                  //       child: SizedBox(
+                                                                  //         height: 255.h,
+                                                                  //         width: 250.w,
+                                                                  //         child: getIndexSwiperCard(index),
+                                                                  //       ),
+                                                                  //     ),
+                                                                  //   ),
+                                                                  // );
+                                                                },
+                                                                separatorBuilder: (BuildContext cxt, int index) => SizedBox(
+                                                                  width: 10.w,
                                                                 ),
                                                               ),
-                                                              itemBuilder: (BuildContext context, int index) {
-                                                                final int actualIndex = isArabic ? (swiperItemCount - 1 - index) : index;
-                                                                return Padding(
-                                                                  padding: const EdgeInsets.symmetric(vertical: 10),
-                                                                  child: getIndexSwiperCard(actualIndex),
-                                                                );
-                                                              },
-                                                            );
-                                                          },
+                                                            )
+                                                          : SizedBox(
+                                                              height: 255.h + 20 + 30, // itemHeight + shadow padding (10 top + 10 bottom) + pagination dots space
+                                                              child: Builder(
+                                                                builder: (context) {
+                                                                  final int baseAppointmentCount = myAppointmentsVM.patientAppointmentsHistoryList.length;
+                                                                  final int liveCareCount = immediateLiveCareVM.patientHasPendingLiveCareRequest ? 1 : 0;
+                                                                  final int totalCount = baseAppointmentCount + liveCareCount;
+
+                                                                  final int swiperItemCount = myAppointmentsVM.isMyAppointmentsLoading
+                                                                      ? 3
+                                                                      : totalCount < 3
+                                                                          ? totalCount
+                                                                          : 3;
+                                                                  final bool isArabic = appState.isArabic();
+                                                                  return Swiper(
+                                                                    itemCount: swiperItemCount,
+                                                                    layout: SwiperLayout.STACK,
+                                                                    loop: false,
+                                                                    itemWidth: MediaQuery.of(context).size.width - 48.h,
+                                                                    indicatorLayout: PageIndicatorLayout.COLOR,
+                                                                    axisDirection: isArabic ? AxisDirection.right : AxisDirection.left,
+                                                                    controller: _controller,
+                                                                    index: isArabic ? swiperItemCount - 1 : 0,
+                                                                    itemHeight: 255.h + 20,
+                                                                    // extra space for shadow
+                                                                    pagination: SwiperPagination(
+                                                                      alignment: Alignment.bottomCenter,
+                                                                      margin: EdgeInsets.only(top: 220.h + 20 + 8 + 24),
+                                                                      builder: _DirectionalDotPaginationBuilder(
+                                                                        color: Color(0xffD9D9D9),
+                                                                        activeColor: AppColors.blackBgColor,
+                                                                        isRTL: isArabic,
+                                                                        totalCount: swiperItemCount,
+                                                                      ),
+                                                                    ),
+                                                                    itemBuilder: (BuildContext context, int index) {
+                                                                      final int actualIndex = isArabic ? (swiperItemCount - 1 - index) : index;
+                                                                      return Padding(
+                                                                        padding: const EdgeInsets.symmetric(vertical: 10),
+                                                                        child: getIndexSwiperCard(actualIndex),
+                                                                      );
+                                                                    },
+                                                                  );
+                                                                },
+                                                              ),
+                                                            )
+                                                  : immediateLiveCareVM.patientHasPendingLiveCareRequest
+                                                      ? _buildLiveCareRequestCard().paddingSymmetrical(24.h, 16.h)
+                                                      : Container(
+                                                          width: double.infinity,
+                                                          decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.r, hasShadow: true),
+                                                          child: Padding(
+                                                            padding: EdgeInsets.all(16.h),
+                                                            child: Column(
+                                                              children: [
+                                                                Utils.buildSvgWithAssets(icon: AppAssets.home_calendar_icon, width: 32.h, height: 32.h),
+                                                                SizedBox(height: 12.h),
+                                                                LocaleKeys.noUpcomingAppointmentPleaseBook.tr(context: context).toText12(isCenter: true),
+                                                                SizedBox(height: 12.h),
+                                                                CustomButton(
+                                                                  text: LocaleKeys.bookAppo.tr(context: context),
+                                                                  onPressed: () {
+                                                                    getIt.get<BookAppointmentsViewModel>().onTabChanged(0);
+                                                                    Navigator.of(context).push(CustomPageRoute(page: BookAppointmentPage()));
+                                                                  },
+                                                                  backgroundColor: AppColors.secondaryLightRedColor,
+                                                                  borderColor: AppColors.secondaryLightRedColor,
+                                                                  textColor: AppColors.primaryRedColor,
+                                                                  fontSize: 14.f,
+                                                                  fontWeight: FontWeight.w600,
+                                                                  padding: EdgeInsets.fromLTRB(10.h, 0, 10.h, 0),
+                                                                  icon: AppAssets.add_icon,
+                                                                  iconColor: AppColors.primaryRedColor,
+                                                                  height: 40.h,
+                                                                ),
+                                                              ],
+                                                            ),
+                                                          ),
+                                                        ).paddingSymmetrical(24.h, 16.h);
+                                        },
+                                      ),
+
+                                      // Consumer for ER Online Check-In pending request
+                                      // Consumer<EmergencyServicesViewModel>(
+                                      //   builder: (context, emergencyServicesVM, child) {
+                                      //     return emergencyServicesVM.patientHasAdvanceERBalance
+                                      //         ? Column(
+                                      //       children: [
+                                      //         SizedBox(height: 16.h),
+                                      //         Container(
+                                      //           decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+                                      //             color: AppColors.whiteColor,
+                                      //             borderRadius: 20.r,
+                                      //             hasShadow: false,
+                                      //             side: BorderSide(color: AppColors.primaryRedColor, width: 3.h),
+                                      //           ),
+                                      //           width: double.infinity,
+                                      //           child: Padding(
+                                      //             padding: EdgeInsets.all(16.h),
+                                      //             child: Column(
+                                      //               crossAxisAlignment: CrossAxisAlignment.start,
+                                      //               children: [
+                                      //                 // Row(
+                                      //                 //   mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                      //                 //   children: [
+                                      //                 //     AppCustomChipWidget(
+                                      //                 //       labelText: LocaleKeys.erOnlineCheckInRequest.tr(context: context),
+                                      //                 //       backgroundColor: AppColors.primaryRedColor.withValues(alpha: 0.10),
+                                      //                 //       textColor: AppColors.primaryRedColor,
+                                      //                 //     ),
+                                      //                 //     Utils.buildSvgWithAssets(icon: AppAssets.appointment_checkin_icon, width: 24.h, height: 24.h, iconColor: AppColors.primaryRedColor),
+                                      //                 //   ],
+                                      //                 // ),
+                                      //                 SizedBox(height: 8.h),
+                                      //                 Row(
+                                      //                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                      //                   children: [
+                                      //                     LocaleKeys.youHaveEROnlineCheckInRequest.tr(context: context).toText12(isBold: true),
+                                      //                     Transform.flip(
+                                      //                       flipX: getIt.get<AppState>().isArabic(),
+                                      //                       child: Utils.buildSvgWithAssets(
+                                      //                         icon: AppAssets.forward_arrow_icon_small,
+                                      //                         iconColor: AppColors.blackColor,
+                                      //                         width: 20.h,
+                                      //                         height: 15.h,
+                                      //                         fit: BoxFit.contain,
+                                      //                       ),
+                                      //                     ),
+                                      //                   ],
+                                      //                 ),
+                                      //               ],
+                                      //             ),
+                                      //           ),
+                                      //         ).paddingSymmetrical(24.h, 0.h).onPress(() {
+                                      //           Navigator.of(context).push(CustomPageRoute(page: ErOnlineCheckinHome()));
+                                      //           // context.read<EmergencyServicesViewModel>().navigateToEROnlineCheckIn();
+                                      //         }),
+                                      //         SizedBox(height: 12.h),
+                                      //       ],
+                                      //     )
+                                      //         : SizedBox(height: 0.h);
+                                      //   },
+                                      // ),
+                                      SizedBox(height: 16.h),
+                                      Row(
+                                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                        children: [
+                                          LocaleKeys.quickLinks.tr(context: context).toText16(isBold: true),
+                                          Row(
+                                            children: [
+                                              LocaleKeys.viewMedicalFileLandingPage.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true),
+                                              SizedBox(width: 2.h),
+                                              Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 14.h),
+                                            ],
+                                          ),
+                                        ],
+                                      ).paddingSymmetrical(24.h, 0.h).onPress(() {
+                                        Navigator.of(context).push(CustomPageRoute(page: MedicalFilePage()));
+                                      }),
+                                      SizedBox(height: 16.h),
+                                      Consumer(builder: (BuildContext context, TodoSectionViewModel todoSectionVM, Widget? child) {
+                                        return Container(
+                                          decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.r),
+                                          child: Column(
+                                            children: [
+                                              todoSectionVM.patientAncillaryOrdersList.isNotEmpty
+                                                  ? Container(
+                                                      height: 50.h,
+                                                      decoration: ShapeDecoration(
+                                                        color: AppColors.eReferralCardColor.withAlpha(50),
+                                                        shape: SmoothRectangleBorder(
+                                                          borderRadius: BorderRadius.only(topLeft: Radius.circular(24), topRight: Radius.circular(24)),
+                                                          smoothness: 1,
                                                         ),
-                                                      )
-                                            : immediateLiveCareVM.patientHasPendingLiveCareRequest
-                                                ? _buildLiveCareRequestCard().paddingSymmetrical(24.h, 16.h)
-                                                : Container(
-                                                    width: double.infinity,
-                                                    decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.r, hasShadow: true),
-                                                    child: Padding(
-                                                      padding: EdgeInsets.all(16.h),
-                                                      child: Column(
+                                                      ),
+                                                      child: Row(
+                                                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                                         children: [
-                                                          Utils.buildSvgWithAssets(icon: AppAssets.home_calendar_icon, width: 32.h, height: 32.h),
-                                                          SizedBox(height: 12.h),
-                                                          LocaleKeys.noUpcomingAppointmentPleaseBook.tr(context: context).toText12(isCenter: true),
-                                                          SizedBox(height: 12.h),
+                                                          LocaleKeys.pendingAncillaryOrders
+                                                              .tr(context: context)
+                                                              .toText14(color: AppColors.eReferralCardColor, isBold: true)
+                                                              .paddingSymmetrical(24.h, 0.h),
                                                           CustomButton(
-                                                            text: LocaleKeys.bookAppo.tr(context: context),
+                                                            text: LocaleKeys.view.tr(context: context),
                                                             onPressed: () {
-                                                              getIt.get<BookAppointmentsViewModel>().onTabChanged(0);
-                                                              Navigator.of(context).push(CustomPageRoute(page: BookAppointmentPage()));
+                                                              todoSectionVM.setIsAncillaryOrdersNeedReloading(true);
+                                                              Navigator.of(context).push(CustomPageRoute(page: ToDoPage()));
                                                             },
-                                                            backgroundColor: Color(0xffFEE9EA),
-                                                            borderColor: Color(0xffFEE9EA),
-                                                            textColor: Color(0xffED1C2B),
-                                                            fontSize: 14.f,
+                                                            backgroundColor: AppColors.eReferralCardColor,
+                                                            borderColor: AppColors.eReferralCardColor,
+                                                            textColor: AppColors.whiteColor,
+                                                            fontSize: 10.f,
                                                             fontWeight: FontWeight.w600,
-                                                            padding: EdgeInsets.fromLTRB(10.h, 0, 10.h, 0),
-                                                            icon: AppAssets.add_icon,
-                                                            iconColor: AppColors.primaryRedColor,
-                                                            height: 40.h,
-                                                          ),
+                                                            borderRadius: 8,
+                                                            padding: EdgeInsets.fromLTRB(15, 0, 15, 0),
+                                                            height: 30.h,
+                                                          ).paddingSymmetrical(24.h, 0.h),
                                                         ],
                                                       ),
-                                                    ),
-                                                  ).paddingSymmetrical(24.h, 16.h);
-                                  },
-                                ),
-
-                                // Consumer for ER Online Check-In pending request
-                                // Consumer<EmergencyServicesViewModel>(
-                                //   builder: (context, emergencyServicesVM, child) {
-                                //     return emergencyServicesVM.patientHasAdvanceERBalance
-                                //         ? Column(
-                                //       children: [
-                                //         SizedBox(height: 16.h),
-                                //         Container(
-                                //           decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-                                //             color: AppColors.whiteColor,
-                                //             borderRadius: 20.r,
-                                //             hasShadow: false,
-                                //             side: BorderSide(color: AppColors.primaryRedColor, width: 3.h),
-                                //           ),
-                                //           width: double.infinity,
-                                //           child: Padding(
-                                //             padding: EdgeInsets.all(16.h),
-                                //             child: Column(
-                                //               crossAxisAlignment: CrossAxisAlignment.start,
-                                //               children: [
-                                //                 // Row(
-                                //                 //   mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                //                 //   children: [
-                                //                 //     AppCustomChipWidget(
-                                //                 //       labelText: LocaleKeys.erOnlineCheckInRequest.tr(context: context),
-                                //                 //       backgroundColor: AppColors.primaryRedColor.withValues(alpha: 0.10),
-                                //                 //       textColor: AppColors.primaryRedColor,
-                                //                 //     ),
-                                //                 //     Utils.buildSvgWithAssets(icon: AppAssets.appointment_checkin_icon, width: 24.h, height: 24.h, iconColor: AppColors.primaryRedColor),
-                                //                 //   ],
-                                //                 // ),
-                                //                 SizedBox(height: 8.h),
-                                //                 Row(
-                                //                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                //                   children: [
-                                //                     LocaleKeys.youHaveEROnlineCheckInRequest.tr(context: context).toText12(isBold: true),
-                                //                     Transform.flip(
-                                //                       flipX: getIt.get<AppState>().isArabic(),
-                                //                       child: Utils.buildSvgWithAssets(
-                                //                         icon: AppAssets.forward_arrow_icon_small,
-                                //                         iconColor: AppColors.blackColor,
-                                //                         width: 20.h,
-                                //                         height: 15.h,
-                                //                         fit: BoxFit.contain,
-                                //                       ),
-                                //                     ),
-                                //                   ],
-                                //                 ),
-                                //               ],
-                                //             ),
-                                //           ),
-                                //         ).paddingSymmetrical(24.h, 0.h).onPress(() {
-                                //           Navigator.of(context).push(CustomPageRoute(page: ErOnlineCheckinHome()));
-                                //           // context.read<EmergencyServicesViewModel>().navigateToEROnlineCheckIn();
-                                //         }),
-                                //         SizedBox(height: 12.h),
-                                //       ],
-                                //     )
-                                //         : SizedBox(height: 0.h);
-                                //   },
-                                // ),
-                                SizedBox(height: 16.h),
-                                Row(
-                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                  children: [
-                                    LocaleKeys.quickLinks.tr(context: context).toText16(isBold: true),
-                                    Row(
-                                      children: [
-                                        LocaleKeys.viewMedicalFileLandingPage.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true),
-                                        SizedBox(width: 2.h),
-                                        Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 14.h),
-                                      ],
-                                    ),
-                                  ],
-                                ).paddingSymmetrical(24.h, 0.h).onPress(() {
-                                  Navigator.of(context).push(CustomPageRoute(page: MedicalFilePage()));
-                                }),
-                                SizedBox(height: 16.h),
-                                Consumer(builder: (BuildContext context, TodoSectionViewModel todoSectionVM, Widget? child) {
-                                  return Container(
+                                                    )
+                                                  : SizedBox.shrink(),
+                                              SizedBox(
+                                                height: 92.h + 32.h - 4.h,
+                                                child: RawScrollbar(
+                                                  controller: _horizontalScrollController,
+                                                  thumbVisibility: true,
+                                                  radius: Radius.circular(10.0),
+                                                  thumbColor: AppColors.primaryRedColor,
+                                                  trackVisibility: true,
+                                                  trackColor: Color(0xffD9D9D9),
+                                                  trackBorderColor: Colors.transparent,
+                                                  trackRadius: Radius.circular(10.0),
+                                                  padding: EdgeInsets.only(top: 92.h + 32.h, left: MediaQuery.sizeOf(context).width / 2.5 - 10, right: MediaQuery.sizeOf(context).width / 2.5 - 10),
+                                                  child: ListView.separated(
+                                                    scrollDirection: Axis.horizontal,
+                                                    itemCount: LandingPageData().getLoggedInServiceCardsList.length,
+                                                    shrinkWrap: true,
+                                                    controller: _horizontalScrollController,
+                                                    padding: EdgeInsets.only(left: 0.h, right: 0.h, top: 16.h, bottom: 12.h),
+                                                    itemBuilder: (context, index) {
+                                                      return AnimationConfiguration.staggeredList(
+                                                        position: index,
+                                                        duration: const Duration(milliseconds: 200),
+                                                        child: SlideAnimation(
+                                                          horizontalOffset: 100.0,
+                                                          child: FadeInAnimation(
+                                                            child: SmallServiceCard(
+                                                              icon: LandingPageData().getLoggedInServiceCardsList[index].icon,
+                                                              title: LandingPageData().getLoggedInServiceCardsList[index].title,
+                                                              subtitle: LandingPageData().getLoggedInServiceCardsList[index].subtitle,
+                                                              iconColor: LandingPageData().getLoggedInServiceCardsList[index].iconColor!,
+                                                              textColor: LandingPageData().getLoggedInServiceCardsList[index].textColor,
+                                                              backgroundColor: LandingPageData().getLoggedInServiceCardsList[index].backgroundColor,
+                                                              isBold: LandingPageData().getLoggedInServiceCardsList[index].isBold,
+                                                              serviceName: LandingPageData().getLoggedInServiceCardsList[index].serviceName,
+                                                            ),
+                                                          ),
+                                                        ),
+                                                      );
+                                                    },
+                                                    separatorBuilder: (BuildContext cxt, int index) => 10.width,
+                                                  ).paddingSymmetrical(16.h, 0.h),
+                                                ),
+                                              ),
+                                              SizedBox(height: 16.h),
+                                            ],
+                                          ),
+                                        ).paddingSymmetrical(24.h, 0.h);
+                                      }),
+                                    ],
+                                  )
+                                : Container(
                                     decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.r),
                                     child: Column(
                                       children: [
-                                        todoSectionVM.patientAncillaryOrdersList.isNotEmpty
-                                            ? Container(
-                                                height: 50.h,
-                                                decoration: ShapeDecoration(
-                                                  color: AppColors.eReferralCardColor.withAlpha(50),
-                                                  shape: SmoothRectangleBorder(
-                                                    borderRadius: BorderRadius.only(topLeft: Radius.circular(24), topRight: Radius.circular(24)),
-                                                    smoothness: 1,
-                                                  ),
-                                                ),
-                                                child: Row(
-                                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                                  children: [
-                                                    LocaleKeys.pendingAncillaryOrders.tr(context: context).toText14(color: AppColors.eReferralCardColor, isBold: true).paddingSymmetrical(24.h, 0.h),
-                                                    CustomButton(
-                                                      text: LocaleKeys.view.tr(context: context),
-                                                      onPressed: () {
-                                                        todoSectionVM.setIsAncillaryOrdersNeedReloading(true);
-                                                        Navigator.of(context).push(CustomPageRoute(page: ToDoPage()));
-                                                      },
-                                                      backgroundColor: AppColors.eReferralCardColor,
-                                                      borderColor: AppColors.eReferralCardColor,
-                                                      textColor: AppColors.whiteColor,
-                                                      fontSize: 10.f,
-                                                      fontWeight: FontWeight.w600,
-                                                      borderRadius: 8,
-                                                      padding: EdgeInsets.fromLTRB(15, 0, 15, 0),
-                                                      height: 30.h,
-                                                    ).paddingSymmetrical(24.h, 0.h),
-                                                  ],
-                                                ),
-                                              )
-                                            : SizedBox.shrink(),
                                         SizedBox(
                                           height: 92.h + 32.h - 4.h,
                                           child: RawScrollbar(
@@ -820,160 +926,112 @@ class _LandingPageState extends State<LandingPage> {
                                             padding: EdgeInsets.only(top: 92.h + 32.h, left: MediaQuery.sizeOf(context).width / 2.5 - 10, right: MediaQuery.sizeOf(context).width / 2.5 - 10),
                                             child: ListView.separated(
                                               scrollDirection: Axis.horizontal,
-                                              itemCount: LandingPageData().getLoggedInServiceCardsList.length,
+                                              itemCount: LandingPageData.getNotLoggedInServiceCardsList.length,
                                               shrinkWrap: true,
                                               controller: _horizontalScrollController,
                                               padding: EdgeInsets.only(left: 0.h, right: 0.h, top: 16.h, bottom: 12.h),
                                               itemBuilder: (context, index) {
                                                 return AnimationConfiguration.staggeredList(
                                                   position: index,
-                                                  duration: const Duration(milliseconds: 200),
+                                                  duration: const Duration(milliseconds: 1000),
                                                   child: SlideAnimation(
                                                     horizontalOffset: 100.0,
                                                     child: FadeInAnimation(
                                                       child: SmallServiceCard(
-                                                        icon: LandingPageData().getLoggedInServiceCardsList[index].icon,
-                                                        title: LandingPageData().getLoggedInServiceCardsList[index].title,
-                                                        subtitle: LandingPageData().getLoggedInServiceCardsList[index].subtitle,
-                                                        iconColor: LandingPageData().getLoggedInServiceCardsList[index].iconColor!,
-                                                        textColor: LandingPageData().getLoggedInServiceCardsList[index].textColor,
-                                                        backgroundColor: LandingPageData().getLoggedInServiceCardsList[index].backgroundColor,
-                                                        isBold: LandingPageData().getLoggedInServiceCardsList[index].isBold,
-                                                        serviceName: LandingPageData().getLoggedInServiceCardsList[index].serviceName,
+                                                        serviceName: LandingPageData.getNotLoggedInServiceCardsList[index].serviceName,
+                                                        icon: LandingPageData.getNotLoggedInServiceCardsList[index].icon,
+                                                        title: LandingPageData.getNotLoggedInServiceCardsList[index].title,
+                                                        subtitle: LandingPageData.getNotLoggedInServiceCardsList[index].subtitle,
+                                                        iconColor: LandingPageData.getNotLoggedInServiceCardsList[index].iconColor!,
+                                                        textColor: LandingPageData.getNotLoggedInServiceCardsList[index].textColor,
+                                                        backgroundColor: LandingPageData.getNotLoggedInServiceCardsList[index].backgroundColor,
+                                                        isBold: LandingPageData.getNotLoggedInServiceCardsList[index].isBold,
                                                       ),
                                                     ),
                                                   ),
                                                 );
                                               },
-                                              separatorBuilder: (BuildContext cxt, int index) => 10.width,
+                                              separatorBuilder: (BuildContext cxt, int index) => 0.width,
                                             ).paddingSymmetrical(16.h, 0.h),
                                           ),
                                         ),
                                         SizedBox(height: 16.h),
                                       ],
                                     ),
-                                  ).paddingSymmetrical(24.h, 0.h);
+                                  ).paddingSymmetrical(24.h, 0.h),
+                            SizedBox(height: 16.h),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                LocaleKeys.services2.tr(context: context).toText18(isBold: true),
+                                Row(
+                                  children: [
+                                    LocaleKeys.viewAll.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true),
+                                    SizedBox(width: 2.h),
+                                    Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 14.h),
+                                  ],
+                                ).onPress(() {
+                                  Navigator.of(context).push(CustomPageRoute(page: ServicesPage()));
                                 }),
                               ],
-                            )
-                          : Container(
-                              decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.r),
-                              child: Column(
-                                children: [
-                                  SizedBox(
-                                    height: 92.h + 32.h - 4.h,
-                                    child: RawScrollbar(
-                                      controller: _horizontalScrollController,
-                                      thumbVisibility: true,
-                                      radius: Radius.circular(10.0),
-                                      thumbColor: AppColors.primaryRedColor,
-                                      trackVisibility: true,
-                                      trackColor: Color(0xffD9D9D9),
-                                      trackBorderColor: Colors.transparent,
-                                      trackRadius: Radius.circular(10.0),
-                                      padding: EdgeInsets.only(top: 92.h + 32.h, left: MediaQuery.sizeOf(context).width / 2.5 - 10, right: MediaQuery.sizeOf(context).width / 2.5 - 10),
-                                      child: ListView.separated(
-                                        scrollDirection: Axis.horizontal,
-                                        itemCount: LandingPageData.getNotLoggedInServiceCardsList.length,
-                                        shrinkWrap: true,
-                                        controller: _horizontalScrollController,
-                                        padding: EdgeInsets.only(left: 0.h, right: 0.h, top: 16.h, bottom: 12.h),
-                                        itemBuilder: (context, index) {
-                                          return AnimationConfiguration.staggeredList(
-                                            position: index,
-                                            duration: const Duration(milliseconds: 1000),
-                                            child: SlideAnimation(
-                                              horizontalOffset: 100.0,
-                                              child: FadeInAnimation(
-                                                child: SmallServiceCard(
-                                                  serviceName: LandingPageData.getNotLoggedInServiceCardsList[index].serviceName,
-                                                  icon: LandingPageData.getNotLoggedInServiceCardsList[index].icon,
-                                                  title: LandingPageData.getNotLoggedInServiceCardsList[index].title,
-                                                  subtitle: LandingPageData.getNotLoggedInServiceCardsList[index].subtitle,
-                                                  iconColor: LandingPageData.getNotLoggedInServiceCardsList[index].iconColor!,
-                                                  textColor: LandingPageData.getNotLoggedInServiceCardsList[index].textColor,
-                                                  backgroundColor: LandingPageData.getNotLoggedInServiceCardsList[index].backgroundColor,
-                                                  isBold: LandingPageData.getNotLoggedInServiceCardsList[index].isBold,
-                                                ),
-                                              ),
-                                            ),
-                                          );
-                                        },
-                                        separatorBuilder: (BuildContext cxt, int index) => 0.width,
-                                      ).paddingSymmetrical(16.h, 0.h),
+                            ).paddingSymmetrical(24.w, 0.h),
+                            SizedBox(height: 16.h),
+                            ConstrainedBox(
+                              constraints: BoxConstraints(maxHeight: isFoldable ? 450.h : (isTablet ? 440.h : 431.h), minHeight: 411.h),
+                              child: ListView.separated(
+                                scrollDirection: Axis.horizontal,
+                                itemCount: LandingPageData.getServiceCardsList.length,
+                                shrinkWrap: true,
+                                padding: EdgeInsets.only(left: 24.w, right: 24.w),
+                                itemBuilder: (context, index) {
+                                  return AnimationConfiguration.staggeredList(
+                                    position: index,
+                                    duration: const Duration(milliseconds: 1000),
+                                    child: SlideAnimation(
+                                      horizontalOffset: 100.0,
+                                      child: FadeInAnimation(
+                                        child: FadedLargeServiceCard(
+                                          serviceCardData: LandingPageData.getServiceCardsList[index],
+                                          image: LandingPageData.getServiceCardsList[index].icon,
+                                          title: LandingPageData.getServiceCardsList[index].title,
+                                          subtitle: LandingPageData.getServiceCardsList[index].subtitle,
+                                          icon: LandingPageData.getServiceCardsList[index].largeCardIcon,
+                                          isPNG: LandingPageData.getServiceCardsList[index].isPNG,
+                                        ),
+                                      ),
                                     ),
-                                  ),
-                                  SizedBox(height: 16.h),
-                                ],
-                              ),
-                            ).paddingSymmetrical(24.h, 0.h),
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          LocaleKeys.services2.tr(context: context).toText18(isBold: true),
-                          Row(
-                            children: [
-                              LocaleKeys.viewAll.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true),
-                              SizedBox(width: 2.h),
-                              Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 14.h),
-                            ],
-                          ).onPress(() {
-                            Navigator.of(context).push(CustomPageRoute(page: ServicesPage()));
-                          }),
-                        ],
-                      ).paddingSymmetrical(24.w, 0.h),
-                      ConstrainedBox(
-                        constraints: BoxConstraints(maxHeight: isFoldable ? 450.h : (isTablet ? 440.h : 431.h), minHeight: 411.h),
-                        child: ListView.separated(
-                          scrollDirection: Axis.horizontal,
-                          itemCount: LandingPageData.getServiceCardsList.length,
-                          shrinkWrap: true,
-                          padding: EdgeInsets.only(left: 24.w, right: 24.w),
-                          itemBuilder: (context, index) {
-                            return AnimationConfiguration.staggeredList(
-                              position: index,
-                              duration: const Duration(milliseconds: 1000),
-                              child: SlideAnimation(
-                                horizontalOffset: 100.0,
-                                child: FadeInAnimation(
-                                  child: FadedLargeServiceCard(
-                                    serviceCardData: LandingPageData.getServiceCardsList[index],
-                                    image: LandingPageData.getServiceCardsList[index].icon,
-                                    title: LandingPageData.getServiceCardsList[index].title,
-                                    subtitle: LandingPageData.getServiceCardsList[index].subtitle,
-                                    icon: LandingPageData.getServiceCardsList[index].largeCardIcon,
-                                    isPNG: LandingPageData.getServiceCardsList[index].isPNG,
-                                  ),
-                                ),
+                                  );
+                                },
+                                separatorBuilder: (BuildContext cxt, int index) => SizedBox(width: 16.w),
                               ),
-                            );
-                          },
-                          separatorBuilder: (BuildContext cxt, int index) => SizedBox(width: 16.w),
+                            ),
+                            SizedBox(height: 16.h),
+                            appState.isAuthenticated
+                                ? Column(
+                                    crossAxisAlignment: CrossAxisAlignment.start,
+                                    children: [
+                                      LocaleKeys.myBalanceSubtitle.tr(context: context).toText16(isBold: true).paddingSymmetrical(24.h, 0.h),
+                                      SizedBox(
+                                        height: 180.h,
+                                        child: ListView.separated(
+                                          scrollDirection: Axis.horizontal,
+                                          itemCount: 2,
+                                          padding: EdgeInsetsDirectional.only(start: 24.h, end: 24.h),
+                                          itemBuilder: (BuildContext context, int index) {
+                                            return index == 0 ? HabibWalletCard() : LakumWalletCard();
+                                          },
+                                          separatorBuilder: (BuildContext context, int index) => SizedBox(width: 12.h),
+                                        ),
+                                      ),
+                                    ],
+                                  )
+                                : SizedBox(),
+                          ],
                         ),
                       ),
-                      appState.isAuthenticated
-                          ? Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                LocaleKeys.myBalanceSubtitle.tr(context: context).toText16(isBold: true).paddingSymmetrical(24.h, 0.h),
-                                SizedBox(
-                                  height: 180.h,
-                                  child: ListView.separated(
-                                    scrollDirection: Axis.horizontal,
-                                    itemCount: 2,
-                                    padding: EdgeInsetsDirectional.only(start: 24.h, end: 24.h),
-                                    itemBuilder: (BuildContext context, int index) {
-                                      return index == 0 ? HabibWalletCard() : LakumWalletCard();
-                                    },
-                                    separatorBuilder: (BuildContext context, int index) => SizedBox(width: 12.h),
-                                  ),
-                                ),
-                              ],
-                            )
-                          : SizedBox(),
-                    ],
+                    ),
                   ),
-                ),
+                ],
               ),
               AnimatedOpacity(
                 opacity: _scrollOpacity,
@@ -998,9 +1056,9 @@ class _LandingPageState extends State<LandingPage> {
                   ? Container(
                       height: MediaQuery.paddingOf(context).top + 50.h,
                       decoration: ShapeDecoration(
-                        color: AppColors.secondaryLightRedBorderColor,
+                        color: AppColors.secondaryLightRedColorBase,
                         shape: SmoothRectangleBorder(
-                          side: BorderSide(width: 1, color: AppColors.primaryRedColor.withAlpha(20)),
+                          side: BorderSide(width: 1, color: AppColors.primaryRedColorBase.withAlpha(20)),
                           // borderRadius: BorderRadius.only(bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
                           smoothness: 1,
                         ),
@@ -1011,7 +1069,7 @@ class _LandingPageState extends State<LandingPage> {
                           Row(
                             mainAxisAlignment: MainAxisAlignment.spaceBetween,
                             children: [
-                              LocaleKeys.insuranceExpiredOrInactive.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true).paddingSymmetrical(0.h, 0.h),
+                              LocaleKeys.insuranceExpiredOrInactive.tr(context: context).toText14(color: AppColors.primaryRedColorBase, isBold: true).paddingSymmetrical(0.h, 0.h),
                               Row(
                                 children: [
                                   CustomButton(
@@ -1023,8 +1081,8 @@ class _LandingPageState extends State<LandingPage> {
                                       showCommonBottomSheetWithoutHeight(context,
                                           child: PatientInsuranceCardUpdateCard(), callBackFunc: () {}, title: "", isCloseButtonVisible: false, isFullScreen: false);
                                     },
-                                    backgroundColor: AppColors.primaryRedColor,
-                                    borderColor: AppColors.secondaryLightRedBorderColor,
+                                    backgroundColor: AppColors.primaryRedColorBase,
+                                    borderColor: AppColors.primaryRedColorBase,
                                     textColor: Colors.white,
                                     fontSize: 12.f,
                                     fontWeight: FontWeight.bold,
@@ -1032,7 +1090,7 @@ class _LandingPageState extends State<LandingPage> {
                                     padding: EdgeInsets.fromLTRB(15, 0, 15, 0),
                                     height: 36.h,
                                   ).paddingSymmetrical(12.h, 0.h),
-                                  Icon(Icons.close, color: AppColors.primaryRedColor).onPress(() {
+                                  Icon(Icons.close, color: AppColors.primaryRedColorBase).onPress(() {
                                     insuranceVM.setIsInsuranceExpiryBannerShown(false);
                                   }),
                                 ],
diff --git a/lib/presentation/home/widgets/habib_wallet_card.dart b/lib/presentation/home/widgets/habib_wallet_card.dart
index 803b9b5a..604ed5f5 100644
--- a/lib/presentation/home/widgets/habib_wallet_card.dart
+++ b/lib/presentation/home/widgets/habib_wallet_card.dart
@@ -92,7 +92,7 @@ class HabibWalletCard extends StatelessWidget {
                                 ),
                                 SizedBox(width: 8.h),
                                 (habibWalletVM.isWalletAmountHidden
-                                        ? "••••"
+                                        ? "****"
                                         : NumberFormat.decimalPattern().format(habibWalletVM.habibWalletAmount).toString())
                                     .toText32(isBold: true, isEnglishOnly: true)
                                     .toShimmer2(isShow: habibWalletVM.isWalletAmountLoading, radius: 12.h, width: 80.h, height: 40.h),
diff --git a/lib/presentation/home/widgets/lakum_wallet_card.dart b/lib/presentation/home/widgets/lakum_wallet_card.dart
index feea02ba..cddfd309 100644
--- a/lib/presentation/home/widgets/lakum_wallet_card.dart
+++ b/lib/presentation/home/widgets/lakum_wallet_card.dart
@@ -92,7 +92,7 @@ class LakumWalletCard extends StatelessWidget {
                               crossAxisAlignment: CrossAxisAlignment.end,
                               children: [
                                 (habibWalletVM.isLakumPointsHidden
-                                        ? "••••"
+                                        ? "****"
                                         : NumberFormat.decimalPattern()
                                             .format(habibWalletVM.isLakumAccountInfoLoading
                                                 ? 123
diff --git a/lib/presentation/home/widgets/occasion_banner_widget.dart b/lib/presentation/home/widgets/occasion_banner_widget.dart
new file mode 100644
index 00000000..1f19b826
--- /dev/null
+++ b/lib/presentation/home/widgets/occasion_banner_widget.dart
@@ -0,0 +1,97 @@
+import 'dart:developer';
+
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
+import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
+import 'package:hmg_patient_app_new/features/occasion_theme/occasion_theme_view_model.dart';
+import 'package:provider/provider.dart';
+
+/// Renders the occasion's main header/banner (`header_image`, e.g. the
+/// National Day greeting banner) inline at the top of the landing page's
+/// scrollable content, drawn at full opacity.
+///
+/// Fully data-driven: when no occasion is active (the default), this widget
+/// renders nothing and takes zero space — the existing layout/UI is
+/// completely unaffected.
+///
+/// See also [OccasionBackgroundWidget], which renders the decorative
+/// backdrop image as a full-page background instead of inline content.
+class OccasionBannerWidget extends StatelessWidget {
+  const OccasionBannerWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<OccasionThemeViewModel>(
+      builder: (context, occasionThemeVm, _) {
+        final headerImageUrl = occasionThemeVm.headerImage;
+        final hasHeaderImage = occasionThemeVm.isOccasionActive && (headerImageUrl?.isNotEmpty ?? false);
+
+        if (!hasHeaderImage) {
+          return const SizedBox(height: 0);
+        }
+
+        return buildOccasionImage(headerImageUrl!).paddingOnly(bottom: 16.h);
+      },
+    );
+  }
+}
+
+/// Renders the occasion's decorative backdrop/watermark
+/// (`background_opacity_image`) as a full-page background. Place this as
+/// the first child of the landing page's outer [Stack] (behind the
+/// scrollable content) so it fills the whole screen and sits behind
+/// everything else, drawn at [OccasionThemeViewModel.backgroundImageOpacity].
+///
+/// Fully data-driven: when no occasion is active (the default), this widget
+/// renders nothing — the existing layout/UI is completely unaffected.
+class OccasionBackgroundWidget extends StatelessWidget {
+  const OccasionBackgroundWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<OccasionThemeViewModel>(
+      builder: (context, occasionThemeVm, _) {
+        final backgroundImageUrl = occasionThemeVm.backgroundOpacityImage;
+        final hasBackgroundImage = occasionThemeVm.isOccasionActive && (backgroundImageUrl?.isNotEmpty ?? false);
+
+        if (!hasBackgroundImage) {
+          return const SizedBox.shrink();
+        }
+
+        return Positioned.fill(
+          child: Opacity(
+            opacity: occasionThemeVm.backgroundImageOpacity.clamp(0.0, 1.0),
+            child: buildOccasionImage(backgroundImageUrl!, isNeedPadding: true),
+          ),
+        );
+      },
+    );
+  }
+}
+
+/// Remote-config image URLs may point to either an SVG (e.g. the National
+/// Day banner) or a raster image (PNG/JPG). [CachedNetworkImage] cannot
+/// decode SVG — it silently renders nothing — so SVG URLs are routed to
+/// [SvgPicture.network] instead, based on the URL's file extension.
+Widget buildOccasionImage(String url, {bool isNeedPadding = false}) {
+  final isSvg = url.split('?').first.toLowerCase().endsWith('.svg');
+  if (isSvg) {
+    return SvgPicture.network(
+      url,
+      width: double.infinity,
+      fit: BoxFit.contain,
+      placeholderBuilder: (_) => const SizedBox.shrink(),
+    );
+  }
+  return CachedNetworkImage(
+    imageUrl: url,
+    width: double.infinity,
+    fit: BoxFit.contain,
+    placeholder: (_, __) => const SizedBox.shrink(),
+    errorWidget: (_, __, error) {
+      return const SizedBox.shrink();
+    },
+  ).paddingSymmetrical(isNeedPadding ? 24.w : 0, 0);
+}
diff --git a/lib/presentation/home/widgets/small_service_card.dart b/lib/presentation/home/widgets/small_service_card.dart
index 45023c3b..3c5ebbf7 100644
--- a/lib/presentation/home/widgets/small_service_card.dart
+++ b/lib/presentation/home/widgets/small_service_card.dart
@@ -38,7 +38,7 @@ class SmallServiceCard extends StatelessWidget {
   final Color? backgroundColor;
   final bool isBold;
 
-  SmallServiceCard({
+  const SmallServiceCard({
     super.key,
     this.icon = "",
     this.serviceName = "",
diff --git a/lib/presentation/insurance/widgets/insurance_history.dart b/lib/presentation/insurance/widgets/insurance_history.dart
index 0f5bde1e..f2019c91 100644
--- a/lib/presentation/insurance/widgets/insurance_history.dart
+++ b/lib/presentation/insurance/widgets/insurance_history.dart
@@ -69,8 +69,8 @@ class InsuranceHistory extends StatelessWidget {
                                         CustomButton(
                                           text: insuranceVM.patientInsuranceCardHistoryList[index].statusDescription ?? "",
                                           onPressed: () {},
-                                          backgroundColor: AppColors.primaryRedColor.withOpacity(0.1),
-                                          borderColor: AppColors.primaryRedColor.withOpacity(0.0),
+                                          backgroundColor: AppColors.secondaryLightRedColor,
+                                          borderColor: Colors.transparent,
                                           textColor: AppColors.primaryRedColor,
                                           fontSize: 10,
                                           isBold: true,
diff --git a/lib/presentation/insurance/widgets/patient_insurance_card.dart b/lib/presentation/insurance/widgets/patient_insurance_card.dart
index 6fab990c..87ae3a97 100644
--- a/lib/presentation/insurance/widgets/patient_insurance_card.dart
+++ b/lib/presentation/insurance/widgets/patient_insurance_card.dart
@@ -117,7 +117,7 @@ class PatientInsuranceCard extends StatelessWidget {
                     }
                   },
                   backgroundColor: isCurrentPatientInsuranceExpired(insuranceCardDetailsModel.cardValidTo!)
-                      ? AppColors.primaryRedColor.withOpacity(0.1)
+                      ? AppColors.secondaryLightRedColor
                       : insuranceViewModel.isInsuranceActive
                           ? AppColors.successColor.withOpacity(0.1)
                           : AppColors.warningColorYellow.withOpacity(0.1),
@@ -129,7 +129,7 @@ class PatientInsuranceCard extends StatelessWidget {
                 //   iconColor: isInsuranceExpired ? AppColors.primaryRedColor : AppColors.successColor,
                 //   textColor: isInsuranceExpired ? AppColors.primaryRedColor : AppColors.successColor,
                 //   iconSize: 12,
-                //   backgroundColor: isInsuranceExpired ? AppColors.primaryRedColor.withOpacity(0.1) : AppColors.successColor.withOpacity(0.1),
+                //   backgroundColor: isInsuranceExpired ? AppColors.primaryRedColorBase.withOpacity(0.1) : AppColors.successColor.withOpacity(0.1),
                 //   labelPadding: EdgeInsetsDirectional.only(start: -4.h, end: 8.h),
                 // ),
               ],
diff --git a/lib/presentation/lab/alphabeticScroll.dart b/lib/presentation/lab/alphabeticScroll.dart
index ff0efbf4..a1a9add8 100644
--- a/lib/presentation/lab/alphabeticScroll.dart
+++ b/lib/presentation/lab/alphabeticScroll.dart
@@ -14,8 +14,8 @@ import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 import 'lab_order_by_test.dart';
 
-class AlphabeticScroll extends StatefulWidget{
-  final  List<String> alpahbetsAvailable;
+class AlphabeticScroll extends StatefulWidget {
+  final List<String> alpahbetsAvailable;
   final List<TestDetails> details;
   final AppState appState;
   final LabViewModel labViewModel;
@@ -38,13 +38,13 @@ class _AlphabetScrollPageState extends State<AlphabeticScroll> {
   Map<String, num> density = {};
 
   Map<String, double> _offsetMap = {};
-  Map<String, GlobalKey>  _offsetKeys = {};
+  Map<String, GlobalKey> _offsetKeys = {};
   int _activeIndex = 0; // <-- Highlighted letter
 
   @override
   void initState() {
     super.initState();
-    scheduleMicrotask((){
+    scheduleMicrotask(() {
       _rebuildData();
     });
     itemPositionsListener.itemPositions.addListener(_onPositionChanged);
@@ -61,9 +61,7 @@ class _AlphabetScrollPageState extends State<AlphabeticScroll> {
   void _rebuildData() {
     data.clear();
     for (var char in widget.alpahbetsAvailable) {
-      data[char] = widget.details
-          .where((element) => element.description?.toLowerCase().startsWith(char.toLowerCase()) == true)
-          .toList();
+      data[char] = widget.details.where((element) => element.description?.toLowerCase().startsWith(char.toLowerCase()) == true).toList();
     }
     if (_activeIndex >= widget.alpahbetsAvailable.length) {
       _activeIndex = 0;
@@ -79,15 +77,12 @@ class _AlphabetScrollPageState extends State<AlphabeticScroll> {
     // Get FIRST visible item (top-most)
     final firstVisible = positions
         .where((p) => p.itemTrailingEdge > 0) // visible
-        .reduce((min, p) =>
-    p.itemLeadingEdge < min.itemLeadingEdge ? p : min);
+        .reduce((min, p) => p.itemLeadingEdge < min.itemLeadingEdge ? p : min);
 
-    if(_activeIndex == firstVisible.index) return ;
+    if (_activeIndex == firstVisible.index) return;
     setState(() {
       _activeIndex = firstVisible.index;
     });
-
-    print("Active index = $_activeIndex");
   }
 
   @override
@@ -97,12 +92,8 @@ class _AlphabetScrollPageState extends State<AlphabeticScroll> {
   }
 
   void _scrollToLetter(String letter) async {
-
     // itemScrollController.jumpTo(index:density[letter]?.toInt()??0, );
-    itemScrollController.scrollTo(
-        index: data.keys.toList().indexOf(letter).toInt()??0,
-        duration: Duration(seconds: 2),
-        curve: Curves.easeInOutCubic);
+    itemScrollController.scrollTo(index: data.keys.toList().indexOf(letter).toInt() ?? 0, duration: Duration(seconds: 2), curve: Curves.easeInOutCubic);
     // final key = _offsetKeys[letter];
     // if (key == null) return;
     //
@@ -134,58 +125,52 @@ class _AlphabetScrollPageState extends State<AlphabeticScroll> {
   @override
   Widget build(BuildContext context) {
     return SizedBox(
-        width: MediaQuery.sizeOf(context).width,
-        child: Row(
-          crossAxisAlignment: CrossAxisAlignment.start, // Add this
-          children: [
-            Expanded(
-              child: Column(
-                children: [
-                  SizedBox(
-                      height: (MediaQuery.sizeOf(context).height),
-                      child: _buildList(widget.alpahbetsAvailable)
-                  ),
-                ],
-              ),
+      width: MediaQuery.sizeOf(context).width,
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start, // Add this
+        children: [
+          Expanded(
+            child: Column(
+              children: [
+                SizedBox(height: (MediaQuery.sizeOf(context).height), child: _buildList(widget.alpahbetsAvailable)),
+              ],
             ),
-              SizedBox(
-                width: 24.w,
-                height: MediaQuery.sizeOf(context).height-(70.h+ kToolbarHeight+100.h),
-                child: Column(
-                  mainAxisSize: MainAxisSize.max, // Add this
-                  mainAxisAlignment: MainAxisAlignment.center, // Changed from center to start
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children:List.generate(widget.alpahbetsAvailable.length, (i) {
-                    final isActive = (i == _activeIndex);
-                    return GestureDetector(
-                      onTap: () {
-                        setState(() => _activeIndex = i);
-                        _scrollToLetter(widget.alpahbetsAvailable[i]);
-                      },
-                      child: TweenAnimationBuilder<double>(
-                        tween: Tween(begin: 1.0, end: isActive ? 1.8 : 1.0),
-                        duration: Duration(milliseconds: 120),
-                        curve: Curves.easeOut,
-                        builder: (_, scale, child) {
-                          return Transform.scale(
-                            scale: scale,
-                            child: Opacity(
-                              opacity: isActive ? 1.0 : 0.5,
-                              child: widget.alpahbetsAvailable[i].toUpperCase().toText14(
-                                  color: !isActive ? AppColors.greyTextColor : AppColors.primaryRedColor, isEnglishOnly: true
-                              ),
-                            ),
-                          );
-                        },
-                      ),
-                    );
-                  }
+          ),
+          SizedBox(
+            width: 24.w,
+            height: MediaQuery.sizeOf(context).height - (70.h + kToolbarHeight + 100.h),
+            child: Column(
+              mainAxisSize: MainAxisSize.max, // Add this
+              mainAxisAlignment: MainAxisAlignment.center, // Changed from center to start
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: List.generate(widget.alpahbetsAvailable.length, (i) {
+                final isActive = (i == _activeIndex);
+                return GestureDetector(
+                  onTap: () {
+                    setState(() => _activeIndex = i);
+                    _scrollToLetter(widget.alpahbetsAvailable[i]);
+                  },
+                  child: TweenAnimationBuilder<double>(
+                    tween: Tween(begin: 1.0, end: isActive ? 1.8 : 1.0),
+                    duration: Duration(milliseconds: 120),
+                    curve: Curves.easeOut,
+                    builder: (_, scale, child) {
+                      return Transform.scale(
+                        scale: scale,
+                        child: Opacity(
+                          opacity: isActive ? 1.0 : 0.5,
+                          child: widget.alpahbetsAvailable[i].toUpperCase().toText14(color: !isActive ? AppColors.greyTextColor : AppColors.primaryRedColor, isEnglishOnly: true),
+                        ),
+                      );
+                    },
                   ),
-                ),
-              ),
-          ],
-        ),
-      );
+                );
+              }),
+            ),
+          ),
+        ],
+      ),
+    );
     // );
   }
 
@@ -205,35 +190,35 @@ class _AlphabetScrollPageState extends State<AlphabeticScroll> {
           key: _offsetKeys[letter],
           child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
-            children:
-             List.generate(items.length,(itemIndex)=>
-                 AnimationConfiguration.staggeredList(
-                   position: index,
-                   duration: const Duration(milliseconds: 500),
-                   child: SlideAnimation(
-                     verticalOffset: 100.0,
-                     child: FadeInAnimation(
-                         child: LabOrderByTest(
-                             appState: getIt<AppState>(),
-                             onTap: () {
-                               if (items[itemIndex].model != null) {
-                                 widget.rangeViewModel.flush();
-                                 widget.labViewModel.getPatientLabResult(items[itemIndex].model!, items[itemIndex].description!,
-                                     (widget.appState.isArabic() ? items[itemIndex].testDescriptionAr! : items[itemIndex].testDescriptionEn!),"");
-                               }
-                             },
-                             tests: items[itemIndex],
-                             index: itemIndex,
-                             isExpanded: true)),
-                   ),
-                 ))
+              children: List.generate(
+                  items.length,
+                  (itemIndex) => AnimationConfiguration.staggeredList(
+                        position: index,
+                        duration: const Duration(milliseconds: 500),
+                        child: SlideAnimation(
+                          verticalOffset: 100.0,
+                          child: FadeInAnimation(
+                              child: LabOrderByTest(
+                                  appState: getIt<AppState>(),
+                                  onTap: () {
+                                    if (items[itemIndex].model != null) {
+                                      widget.rangeViewModel.flush();
+                                      widget.labViewModel.getPatientLabResult(items[itemIndex].model!, items[itemIndex].description!,
+                                          (widget.appState.isArabic() ? items[itemIndex].testDescriptionAr! : items[itemIndex].testDescriptionEn!), "");
+                                    }
+                                  },
+                                  tests: items[itemIndex],
+                                  index: itemIndex,
+                                  isExpanded: true)),
+                        ),
+                      ))
               // ...items.indexed((item) =>
               //
               //
               //
               // )
 
-          ),
+              ),
         );
       },
     );
diff --git a/lib/presentation/lab/lab_order_by_test.dart b/lib/presentation/lab/lab_order_by_test.dart
index 7740a596..733fb792 100644
--- a/lib/presentation/lab/lab_order_by_test.dart
+++ b/lib/presentation/lab/lab_order_by_test.dart
@@ -26,64 +26,65 @@ class LabOrderByTest extends StatelessWidget {
   @override
   build(BuildContext context) {
     return AnimatedContainer(
-      key:key,
-        duration: Duration(milliseconds: 300),
-        curve: Curves.easeInOut,
-        margin: EdgeInsets.symmetric(vertical: 8.h),
-        decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 20.h, hasShadow: true),
-        child: Container(
-          key: ValueKey<int>(index),
-          padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 8.h),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              '${tests!.description}'.toText16(isBold: true, isEnglishOnly: true),
-              SizedBox(height: 4.h),
-              (appState.isArabic() ? tests!.testDescriptionAr : tests!.testDescriptionEn)!.toText12(isBold: true),
-              SizedBox(height: 8.h),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  AppCustomChipWidget(
-                    richText: Row(
-                      children: [
-                        "${LocaleKeys.lastTested.tr(context: context)}: ".toText12(isBold: true),
-                        Directionality(
-                            textDirection: ui.TextDirection.ltr,child: DateUtil.formatDateToDate(DateUtil.convertStringToDate(tests!.createdOn), false).toText12(isBold: true, isEnglishOnly: true))
-                      ],
-                    ),
-                    backgroundColor: AppColors.greyLightColor,
-                    textColor: AppColors.textColor,
+      key: key,
+      duration: Duration(milliseconds: 300),
+      curve: Curves.easeInOut,
+      margin: EdgeInsets.symmetric(vertical: 8.h),
+      decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 20.h, hasShadow: true),
+      child: Container(
+        key: ValueKey<int>(index),
+        padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 8.h),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            '${tests!.description}'.toText16(isBold: true, isEnglishOnly: true),
+            SizedBox(height: 4.h),
+            (appState.isArabic() ? tests!.testDescriptionAr : tests!.testDescriptionEn)!.toText12(isBold: true),
+            SizedBox(height: 8.h),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                AppCustomChipWidget(
+                  richText: Row(
+                    children: [
+                      "${LocaleKeys.lastTested.tr(context: context)}: ".toText12(isBold: true),
+                      Directionality(
+                          textDirection: ui.TextDirection.ltr, child: DateUtil.formatDateToDate(DateUtil.convertStringToDate(tests!.createdOn), false).toText12(isBold: true, isEnglishOnly: true))
+                    ],
                   ),
-                ],
-              ),
-              SizedBox(height: 16.h),
-              Row(
-                children: [
-                  Expanded(child: Container()),
-                  Expanded(
-                    child: CustomButton(
-                      icon: AppAssets.view_report_icon,
-                      iconColor: AppColors.primaryRedColor,
-                      iconSize: 16.h,
-                      text: LocaleKeys.viewResults.tr(context: context),
-                      onPressed: () {
-                        onTap();
-                      },
-                      backgroundColor: AppColors.secondaryLightRedColor,
-                      borderColor: AppColors.secondaryLightRedColor,
-                      textColor: AppColors.primaryRedColor,
-                      fontSize: 14.f,
-                      fontWeight: FontWeight.w600,
-                      borderRadius: 12,
-                      padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
-                      height: 40.h,
-                    ),
+                  backgroundColor: AppColors.greyLightColor,
+                  textColor: AppColors.textColor,
+                ),
+              ],
+            ),
+            SizedBox(height: 16.h),
+            Row(
+              children: [
+                Expanded(child: Container()),
+                Expanded(
+                  child: CustomButton(
+                    icon: AppAssets.view_report_icon,
+                    iconColor: AppColors.primaryRedColor,
+                    iconSize: 16.h,
+                    text: LocaleKeys.viewResults.tr(context: context),
+                    onPressed: () {
+                      onTap();
+                    },
+                    backgroundColor: AppColors.secondaryLightRedColor,
+                    borderColor: Colors.transparent,
+                    textColor: AppColors.primaryRedColor,
+                    fontSize: 14.f,
+                    fontWeight: FontWeight.w600,
+                    borderRadius: 10.r,
+                    padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
+                    height: 40.h,
                   ),
-                ],
-              ),
-            ],
-          ),
-        ));
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
   }
 }
diff --git a/lib/presentation/lab/lab_orders_page.dart b/lib/presentation/lab/lab_orders_page.dart
index 0e8890ba..332a89da 100644
--- a/lib/presentation/lab/lab_orders_page.dart
+++ b/lib/presentation/lab/lab_orders_page.dart
@@ -1 +1 @@
-import 'dart:async';
import 'dart:ui' as ui;

import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
import 'package:hmg_patient_app_new/core/app_assets.dart';
import 'package:hmg_patient_app_new/core/app_state.dart';
import 'package:hmg_patient_app_new/core/dependencies.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/core/utils/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/features/lab/lab_view_model.dart';
import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_orders_response_model.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart';
import 'package:hmg_patient_app_new/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart';
import 'package:hmg_patient_app_new/presentation/lab/search_lab_report.dart';
import 'package:hmg_patient_app_new/theme/colors.dart';
import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart';
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart';
import 'package:hmg_patient_app_new/widgets/custom_tab_bar.dart';
import 'package:hmg_patient_app_new/widgets/date_range_selector/viewmodel/date_range_view_model.dart';
import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart';
import 'package:provider/provider.dart';

import 'alphabeticScroll.dart';

class LabOrdersPage extends StatefulWidget {
  const LabOrdersPage({super.key});

  @override
  State<LabOrdersPage> createState() => _LabOrdersPageState();
}

class _LabOrdersPageState extends State<LabOrdersPage> {
  late LabViewModel labProvider;
  late DateRangeSelectorRangeViewModel rangeViewModel;
  late AppState _appState;
  List<List<TestDetails>?> labSuggestions = [];
  int? expandedIndex;
  String? selectedFilterText = '';
  int activeIndex = 0;

  @override
  void initState() {
    scheduleMicrotask(() {
      labProvider.initLabProvider();
    });
    super.initState();
  }

  @override
  Widget build(BuildContext context) {
    labProvider = Provider.of<LabViewModel>(context, listen: false);
    rangeViewModel = Provider.of<DateRangeSelectorRangeViewModel>(context);
    _appState = getIt<AppState>();

    return CollapsingListView(
      title: LocaleKeys.labResults.tr(context: context),
      physics: activeIndex == 1 ? NeverScrollableScrollPhysics() : ScrollPhysics(),
      search: () async {
        if (labProvider.isLabOrdersLoading) {
          return;
        } else {
          String? value = await Navigator.of(context).push(
            CustomPageRoute(
              page: SearchLabResultsContent(labSuggestionsList: labProvider.labSuggestions),
              fullScreenDialog: true,
              direction: AxisDirection.down,
            ),
          );
          if (value != null) {
            selectedFilterText = value;
            labProvider.filterLabReports(value);
          }
        }
      },
      child: Consumer<LabViewModel>(
        builder: (context, labViewModel, child) {
          return SingleChildScrollView(
              physics: NeverScrollableScrollPhysics(),
              padding: EdgeInsets.all(24.h),
              child: Column(
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
                  Row(
                    children: [
                      Expanded(
                        child: CustomTabBar(
                          activeTextColor: Color(0xffED1C2B),
                          activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1),
                          tabs: [
                            CustomTabBarModel(null, LocaleKeys.byVisit.tr()),
                            CustomTabBarModel(null, LocaleKeys.byTest.tr()),
                          ],
                          onTabChange: (index) {
                            activeIndex = index;
                            setState(() {});
                          },
                        ),
                      ),
                    ],
                  ),
                  if (activeIndex == 0)
                    Padding(
                      padding: EdgeInsets.symmetric(vertical: 10.h),
                      child: Row(
                        children: [
                          // CustomButton(
                          //   text: LocaleKeys.byClinic.tr(context: context),
                          //   onPressed: () {
                          //     labViewModel.setIsSortByClinic(true);
                          //   },
                          //   backgroundColor: labViewModel.isSortByClinic ? AppColors.bgRedLightColor : AppColors.whiteColor,
                          //   borderColor: labViewModel.isSortByClinic ? AppColors.primaryRedColor : AppColors.textColor.withValues(alpha: 0.2),
                          //   textColor: labViewModel.isSortByClinic ? AppColors.primaryRedColor : AppColors.blackColor,
                          //   fontSize: 12.f,
                          //   isBold: true,
                          //   borderRadius: 10,
                          //   padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
                          //   height: 40.h,
                          // ),
                          // SizedBox(width: 8.h),
                          // CustomButton(
                          //   text: LocaleKeys.byHospital.tr(context: context),
                          //   onPressed: () {
                          //     labViewModel.setIsSortByClinic(false);
                          //   },
                          //   backgroundColor: labViewModel.isSortByClinic ? AppColors.whiteColor : AppColors.bgRedLightColor,
                          //   borderColor: labViewModel.isSortByClinic ? AppColors.textColor.withValues(alpha: 0.2) : AppColors.primaryRedColor,
                          //   textColor: labViewModel.isSortByClinic ? AppColors.blackColor : AppColors.primaryRedColor,
                          //   fontSize: 12,
                          //   isBold: true,
                          //   borderRadius: 10,
                          //   padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
                          //   height: 40.h,
                          // ),
                        ],
                      ),
                    ),
                  SizedBox(height: 8.h),
                  selectedFilterText!.isNotEmpty
                      ? Column(
                          children: [
                            AppCustomChipWidget(
                              labelText: selectedFilterText!,
                              backgroundColor: AppColors.alertColor,
                              textColor: AppColors.whiteColor,
                              deleteIcon: AppAssets.close_bottom_sheet_icon,
                              deleteIconColor: AppColors.whiteColor,
                              deleteIconHasColor: true,
                              isEnglishOnly: true,
                              onDeleteTap: () {
                                selectedFilterText = "";
                                labProvider.filterLabReports("");
                              },
                            ),
                            SizedBox(height: 8.h),
                          ],
                        )
                      : SizedBox(),
                  activeIndex == 0
                      ? // By Visit - show grouped view when available
                      labViewModel.isLabOrdersLoading
                          ? ListView.builder(
                              shrinkWrap: true,
                              physics: AlwaysScrollableScrollPhysics(),
                              padding: EdgeInsets.zero,
                              itemCount: 5,
                              itemBuilder: (context, index) => LabResultItemView(
                                onTap: () {},
                                labOrder: null,
                                index: index,
                                isLoading: true,
                              ),
                            )
                          : (labViewModel.patientLabOrders.isNotEmpty
                              ? ListView.builder(
                                  shrinkWrap: true,
                                  physics: NeverScrollableScrollPhysics(),
                                  padding: EdgeInsets.zero,
                                  itemCount: labViewModel.filteredLabOrders.length,
                                  itemBuilder: (context, index) {
                                    final group = labViewModel.filteredLabOrders[index];
                                    final isExpanded = expandedIndex == index;
                                    return AnimationConfiguration.staggeredList(
                                        position: index,
                                        duration: const Duration(milliseconds: 500),
                                        child: SlideAnimation(
                                          verticalOffset: 100.0,
                                          child: FadeInAnimation(
                                            child: AnimatedContainer(
                                              duration: Duration(milliseconds: 300),
                                              curve: Curves.easeInOut,
                                              margin: EdgeInsets.symmetric(vertical: 8.h),
                                              decoration: RoundedRectangleBorder()
                                                  .toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 20.h, hasShadow: true),
                                              child: InkWell(
                                                onTap: () {
                                                  setState(() {
                                                    expandedIndex = isExpanded ? null : index;
                                                  });
                                                },
                                                child: Column(
                                                  crossAxisAlignment: CrossAxisAlignment.start,
                                                  children: [
                                                    Padding(
                                                      padding: EdgeInsets.all(16.h),
                                                      child: Column(
                                                        crossAxisAlignment: CrossAxisAlignment.start,
                                                        children: [
                                                          Row(
                                                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                                            children: [
                                                              Wrap(
                                                                direction: Axis.horizontal,
                                                                spacing: 4.h,
                                                                runSpacing: 4.h,
                                                                children: [
                                                                  AppCustomChipWidget(
                                                                    richText: Row(
                                                                      children: [
                                                                        "${group.testDetails!.length} ".toText10(
                                                                            color: AppColors.successColor,
                                                                            isEnglishOnly: true,
                                                                            weight: FontWeight.w600),
                                                                        LocaleKeys.tests
                                                                            .tr(context: context)
                                                                            .toText10(color: AppColors.successColor, weight: FontWeight.w600),
                                                                      ],
                                                                    ),
                                                                    labelText:
                                                                        "${group.testDetails!.length} ${LocaleKeys.tests.tr(context: context)}",
                                                                    backgroundColor: AppColors.successColor.withOpacity(0.1),
                                                                    textColor: AppColors.successColor,
                                                                  ),
                                                                  AppCustomChipWidget(
                                                                    labelText:
                                                                        "${_appState.isArabic() ? group.isInOutPatientDescriptionN : group.isInOutPatientDescription}",
                                                                    backgroundColor: AppColors.warningColorYellow.withOpacity(0.1),
                                                                    textColor: AppColors.warningColorYellow,
                                                                  )
                                                                ],
                                                              ),
                                                              Icon(isExpanded ? Icons.expand_less : Icons.expand_more),
                                                            ],
                                                          ),
                                                          SizedBox(height: 8.h),
                                                          Row(
                                                            mainAxisSize: MainAxisSize.min,
                                                            children: [
                                                              Image.network(
                                                                group.doctorImageURL ??
                                                                    "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png",
                                                                width: 24.w,
                                                                height: 24.h,
                                                                fit: BoxFit.cover,
                                                              ).circle(100),
                                                              SizedBox(width: 8.h),
                                                              Expanded(
                                                                  child: (group.doctorName ?? group.doctorNameEnglish ?? "")
                                                                      .toString()
                                                                      .toText14(isBold: true)),
                                                            ],
                                                          ),
                                                          SizedBox(height: 8.h),
                                                          Wrap(
                                                            direction: Axis.horizontal,
                                                            spacing: 4.h,
                                                            runSpacing: 4.h,
                                                            children: [
                                                              Directionality(
                                                                  textDirection: ui.TextDirection.ltr,
                                                                  child: AppCustomChipWidget(
                                                                    labelText: DateUtil.formatDateToDate(
                                                                        DateUtil.convertStringToDate(group.orderDate ?? ""), false),
                                                                    isEnglishOnly: true,
                                                                  )),
                                                              AppCustomChipWidget(
                                                                labelText: (group.projectName ?? ""),
                                                              ),
                                                              AppCustomChipWidget(
                                                                labelText: (group.clinicDescription ?? ""),
                                                              ),
                                                            ],
                                                          ),
                                                        ],
                                                      ),
                                                    ),
                                                    AnimatedSwitcher(
                                                      duration: Duration(milliseconds: 500),
                                                      switchInCurve: Curves.easeIn,
                                                      switchOutCurve: Curves.easeOut,
                                                      transitionBuilder: (Widget child, Animation<double> animation) {
                                                        return FadeTransition(
                                                          opacity: animation,
                                                          child: SizeTransition(
                                                            sizeFactor: animation,
                                                            axisAlignment: 0.0,
                                                            child: child,
                                                          ),
                                                        );
                                                      },
                                                      child: isExpanded
                                                          ? Container(
                                                              key: ValueKey<int>(index),
                                                              padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 0.h),
                                                              child: Column(
                                                                children: [
                                                                  ListView.separated(
                                                                      shrinkWrap: true,
                                                                      physics: NeverScrollableScrollPhysics(),
                                                                      padding: EdgeInsets.zero,
                                                                      itemBuilder: (cxt, index) {
                                                                        PatientLabOrdersResponseModel order = group;
                                                                        return Column(
                                                                          crossAxisAlignment: CrossAxisAlignment.start,
                                                                          children: [
                                                                            "• ${order.testDetails![index].description!}"
                                                                                .toText14(isBold: true, isEnglishOnly: true),
                                                                            SizedBox(height: 4.h),
                                                                            (_appState.isArabic() ? order.testDetails![index].testDescriptionAr! : order.testDetails![index].testDescriptionEn!).toText12(
                                                                                isBold: true, color: AppColors.textColorLight, isEnglishOnly: true),
                                                                          ],
                                                                        ).paddingOnly(top: 16, bottom: 16);
                                                                      },
                                                                      separatorBuilder: (cxt, index) => Divider(
                                                                          color: AppColors.borderOnlyColor.withValues(alpha: 0.05), height: 1.h),
                                                                      itemCount: group.testDetails!.length > 3 ? 3 : group.testDetails!.length),
                                                                  SizedBox(height: 16.h),
                                                                  CustomButton(
                                                                    text: "${LocaleKeys.viewResults.tr()} (${group.testDetails!.length})",
                                                                    onPressed: () {
                                                                      labProvider.currentlySelectedPatientOrder = group;
                                                                      labProvider.getPatientLabResultByHospital(group);
                                                                      labProvider.getPatientSpecialResult(group);
                                                                      Navigator.of(context).push(
                                                                        CustomPageRoute(
                                                                          page: LabResultByClinic(labOrder: group),
                                                                        ),
                                                                      );
                                                                    },
                                                                    backgroundColor: AppColors.infoColor.withAlpha(20),
                                                                    borderColor: AppColors.infoColor.withAlpha(0),
                                                                    textColor: AppColors.infoColor,
                                                                    fontSize: (isFoldable || isTablet) ? 12.f : 14.f,
                                                                    isBold: true,
                                                                    borderRadius: 12.r,
                                                                    padding: EdgeInsets.fromLTRB(10.w, 0, 10.w, 0),
                                                                    height: 40.h,
                                                                    iconSize: 14.h,
                                                                    icon: AppAssets.view_report_icon,
                                                                    iconColor: AppColors.infoColor,
                                                                  ),
                                                                  SizedBox(height: 16.h),
                                                                ],
                                                              ),
                                                            )
                                                          : SizedBox.shrink(),
                                                    ),
                                                  ],
                                                ),
                                              ),
                                            ),
                                          ),
                                        ));
                                  },
                                )
                              : Utils.getNoDataWidget(context, noDataText: LocaleKeys.noLabResults.tr(context: context)))
                      : // By Test or other tabs keep existing behavior
                      (labViewModel.isLabOrdersLoading)
                          ? Column(
                              children: List.generate(
                                  5,
                                  (index) => LabResultItemView(
                                        onTap: () {},
                                        labOrder: null,
                                        index: index,
                                        isLoading: true,
                                      )),
                            )
                          : AlphabeticScroll(
                              alpahbetsAvailable: labViewModel.filteredIndexedCharacterForUniqueTest,
                              details: labViewModel.filteredUniqueTestsList,
                              labViewModel: labViewModel,
                              rangeViewModel: rangeViewModel,
                              appState: _appState,
                            )
                ],
              ));
        },
      ),
    );
  }

  Color getLabOrderStatusColor(num status) {
    switch (status) {
      case 44:
        return AppColors.warningColorYellow;
      case 45:
        return AppColors.warningColorYellow;
      case 16:
        return AppColors.successColor;
      case 17:
        return AppColors.successColor;
      default:
        return AppColors.greyColor;
    }
  }

  String getLabOrderStatusText(num status) {
    switch (status) {
      case 44:
        return LocaleKeys.resultsPending.tr(context: context);
      case 45:
        return LocaleKeys.resultsPending.tr(context: context);
      case 16:
        return LocaleKeys.resultsAvailable.tr(context: context);
      case 17:
        return LocaleKeys.resultsAvailable.tr(context: context);
      default:
        return "";
    }
  }

  getLabSuggestions(LabViewModel model) {
    if (model.patientLabOrders.isEmpty) {
      return [];
    }
    return model.patientLabOrders.map((m) => m.testDetails).toList();
  }
}
\ No newline at end of file
+import 'dart:async';
import 'dart:ui' as ui;

import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
import 'package:hmg_patient_app_new/core/app_assets.dart';
import 'package:hmg_patient_app_new/core/app_state.dart';
import 'package:hmg_patient_app_new/core/dependencies.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/core/utils/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/features/lab/lab_view_model.dart';
import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_orders_response_model.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart';
import 'package:hmg_patient_app_new/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart';
import 'package:hmg_patient_app_new/presentation/lab/search_lab_report.dart';
import 'package:hmg_patient_app_new/theme/colors.dart';
import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart';
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart';
import 'package:hmg_patient_app_new/widgets/custom_tab_bar.dart';
import 'package:hmg_patient_app_new/widgets/date_range_selector/viewmodel/date_range_view_model.dart';
import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart';
import 'package:provider/provider.dart';

import 'alphabeticScroll.dart';

class LabOrdersPage extends StatefulWidget {
  const LabOrdersPage({super.key});

  @override
  State<LabOrdersPage> createState() => _LabOrdersPageState();
}

class _LabOrdersPageState extends State<LabOrdersPage> {
  late LabViewModel labProvider;
  late DateRangeSelectorRangeViewModel rangeViewModel;
  late AppState _appState;
  List<List<TestDetails>?> labSuggestions = [];
  int? expandedIndex;
  String? selectedFilterText = '';
  int activeIndex = 0;

  @override
  void initState() {
    scheduleMicrotask(() {
      labProvider.initLabProvider();
    });
    super.initState();
  }

  @override
  Widget build(BuildContext context) {
    labProvider = Provider.of<LabViewModel>(context, listen: false);
    rangeViewModel = Provider.of<DateRangeSelectorRangeViewModel>(context);
    _appState = getIt<AppState>();

    return CollapsingListView(
      title: LocaleKeys.labResults.tr(context: context),
      physics: activeIndex == 1 ? NeverScrollableScrollPhysics() : ScrollPhysics(),
      search: () async {
        if (labProvider.isLabOrdersLoading) {
          return;
        } else {
          String? value = await Navigator.of(context).push(
            CustomPageRoute(
              page: SearchLabResultsContent(labSuggestionsList: labProvider.labSuggestions),
              fullScreenDialog: true,
              direction: AxisDirection.down,
            ),
          );
          if (value != null) {
            selectedFilterText = value;
            labProvider.filterLabReports(value);
          }
        }
      },
      child: Consumer<LabViewModel>(
        builder: (context, labViewModel, child) {
          return SingleChildScrollView(
              physics: NeverScrollableScrollPhysics(),
              padding: EdgeInsets.all(24.h),
              child: Column(
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
                  Row(
                    children: [
                      Expanded(
                        child: CustomTabBar(
                          activeTextColor: AppColors.primaryRedColor,
                          activeBackgroundColor: AppColors.secondaryLightRedColor,
                          tabs: [
                            CustomTabBarModel(null, LocaleKeys.byVisit.tr()),
                            CustomTabBarModel(null, LocaleKeys.byTest.tr()),
                          ],
                          onTabChange: (index) {
                            activeIndex = index;
                            setState(() {});
                          },
                        ),
                      ),
                    ],
                  ),
                  if (activeIndex == 0)
                    Padding(
                      padding: EdgeInsets.symmetric(vertical: 10.h),
                      child: Row(
                        children: [
                          // CustomButton(
                          //   text: LocaleKeys.byClinic.tr(context: context),
                          //   onPressed: () {
                          //     labViewModel.setIsSortByClinic(true);
                          //   },
                          //   backgroundColor: labViewModel.isSortByClinic ? AppColors.bgRedLightColor : AppColors.whiteColor,
                          //   borderColor: labViewModel.isSortByClinic ? AppColors.primaryRedColor : AppColors.textColor.withValues(alpha: 0.2),
                          //   textColor: labViewModel.isSortByClinic ? AppColors.primaryRedColor : AppColors.blackColor,
                          //   fontSize: 12.f,
                          //   isBold: true,
                          //   borderRadius: 10,
                          //   padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
                          //   height: 40.h,
                          // ),
                          // SizedBox(width: 8.h),
                          // CustomButton(
                          //   text: LocaleKeys.byHospital.tr(context: context),
                          //   onPressed: () {
                          //     labViewModel.setIsSortByClinic(false);
                          //   },
                          //   backgroundColor: labViewModel.isSortByClinic ? AppColors.whiteColor : AppColors.bgRedLightColor,
                          //   borderColor: labViewModel.isSortByClinic ? AppColors.textColor.withValues(alpha: 0.2) : AppColors.primaryRedColor,
                          //   textColor: labViewModel.isSortByClinic ? AppColors.blackColor : AppColors.primaryRedColor,
                          //   fontSize: 12,
                          //   isBold: true,
                          //   borderRadius: 10,
                          //   padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
                          //   height: 40.h,
                          // ),
                        ],
                      ),
                    ),
                  SizedBox(height: 8.h),
                  selectedFilterText!.isNotEmpty
                      ? Column(
                          children: [
                            AppCustomChipWidget(
                              labelText: selectedFilterText!,
                              backgroundColor: AppColors.alertColor,
                              textColor: AppColors.whiteColor,
                              deleteIcon: AppAssets.close_bottom_sheet_icon,
                              deleteIconColor: AppColors.whiteColor,
                              deleteIconHasColor: true,
                              isEnglishOnly: true,
                              onDeleteTap: () {
                                selectedFilterText = "";
                                labProvider.filterLabReports("");
                              },
                            ),
                            SizedBox(height: 8.h),
                          ],
                        )
                      : SizedBox(),
                  activeIndex == 0
                      ? // By Visit - show grouped view when available
                      labViewModel.isLabOrdersLoading
                          ? ListView.builder(
                              shrinkWrap: true,
                              physics: AlwaysScrollableScrollPhysics(),
                              padding: EdgeInsets.zero,
                              itemCount: 5,
                              itemBuilder: (context, index) => LabResultItemView(
                                onTap: () {},
                                labOrder: null,
                                index: index,
                                isLoading: true,
                              ),
                            )
                          : (labViewModel.patientLabOrders.isNotEmpty
                              ? ListView.builder(
                                  shrinkWrap: true,
                                  physics: NeverScrollableScrollPhysics(),
                                  padding: EdgeInsets.zero,
                                  itemCount: labViewModel.filteredLabOrders.length,
                                  itemBuilder: (context, index) {
                                    final group = labViewModel.filteredLabOrders[index];
                                    final isExpanded = expandedIndex == index;
                                    return AnimationConfiguration.staggeredList(
                                        position: index,
                                        duration: const Duration(milliseconds: 500),
                                        child: SlideAnimation(
                                          verticalOffset: 100.0,
                                          child: FadeInAnimation(
                                            child: AnimatedContainer(
                                              duration: Duration(milliseconds: 300),
                                              curve: Curves.easeInOut,
                                              margin: EdgeInsets.symmetric(vertical: 8.h),
                                              decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 20.h, hasShadow: true),
                                              child: InkWell(
                                                onTap: () {
                                                  setState(() {
                                                    expandedIndex = isExpanded ? null : index;
                                                  });
                                                },
                                                child: Column(
                                                  crossAxisAlignment: CrossAxisAlignment.start,
                                                  children: [
                                                    Padding(
                                                      padding: EdgeInsets.all(16.h),
                                                      child: Column(
                                                        crossAxisAlignment: CrossAxisAlignment.start,
                                                        children: [
                                                          Row(
                                                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                                            children: [
                                                              Wrap(
                                                                direction: Axis.horizontal,
                                                                spacing: 4.h,
                                                                runSpacing: 4.h,
                                                                children: [
                                                                  AppCustomChipWidget(
                                                                    richText: Row(
                                                                      children: [
                                                                        "${group.testDetails!.length} ".toText10(color: AppColors.successColor, isEnglishOnly: true, weight: FontWeight.w600),
                                                                        LocaleKeys.tests.tr(context: context).toText10(color: AppColors.successColor, weight: FontWeight.w600),
                                                                      ],
                                                                    ),
                                                                    labelText: "${group.testDetails!.length} ${LocaleKeys.tests.tr(context: context)}",
                                                                    backgroundColor: AppColors.successColor.withOpacity(0.1),
                                                                    textColor: AppColors.successColor,
                                                                  ),
                                                                  AppCustomChipWidget(
                                                                    labelText: "${_appState.isArabic() ? group.isInOutPatientDescriptionN : group.isInOutPatientDescription}",
                                                                    backgroundColor: AppColors.warningColorYellow.withOpacity(0.1),
                                                                    textColor: AppColors.warningColorYellow,
                                                                  )
                                                                ],
                                                              ),
                                                              Icon(isExpanded ? Icons.expand_less : Icons.expand_more),
                                                            ],
                                                          ),
                                                          SizedBox(height: 8.h),
                                                          Row(
                                                            mainAxisSize: MainAxisSize.min,
                                                            children: [
                                                              Image.network(
                                                                group.doctorImageURL ?? "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png",
                                                                width: 24.w,
                                                                height: 24.h,
                                                                fit: BoxFit.cover,
                                                              ).circle(100),
                                                              SizedBox(width: 8.h),
                                                              Expanded(child: (group.doctorName ?? group.doctorNameEnglish ?? "").toString().toText14(isBold: true)),
                                                            ],
                                                          ),
                                                          SizedBox(height: 8.h),
                                                          Wrap(
                                                            direction: Axis.horizontal,
                                                            spacing: 4.h,
                                                            runSpacing: 4.h,
                                                            children: [
                                                              Directionality(
                                                                  textDirection: ui.TextDirection.ltr,
                                                                  child: AppCustomChipWidget(
                                                                    labelText: DateUtil.formatDateToDate(DateUtil.convertStringToDate(group.orderDate ?? ""), false),
                                                                    isEnglishOnly: true,
                                                                  )),
                                                              AppCustomChipWidget(
                                                                labelText: (group.projectName ?? ""),
                                                              ),
                                                              AppCustomChipWidget(
                                                                labelText: (group.clinicDescription ?? ""),
                                                              ),
                                                            ],
                                                          ),
                                                        ],
                                                      ),
                                                    ),
                                                    AnimatedSwitcher(
                                                      duration: Duration(milliseconds: 500),
                                                      switchInCurve: Curves.easeIn,
                                                      switchOutCurve: Curves.easeOut,
                                                      transitionBuilder: (Widget child, Animation<double> animation) {
                                                        return FadeTransition(
                                                          opacity: animation,
                                                          child: SizeTransition(
                                                            sizeFactor: animation,
                                                            axisAlignment: 0.0,
                                                            child: child,
                                                          ),
                                                        );
                                                      },
                                                      child: isExpanded
                                                          ? Container(
                                                              key: ValueKey<int>(index),
                                                              padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 0.h),
                                                              child: Column(
                                                                children: [
                                                                  ListView.separated(
                                                                      shrinkWrap: true,
                                                                      physics: NeverScrollableScrollPhysics(),
                                                                      padding: EdgeInsets.zero,
                                                                      itemBuilder: (cxt, index) {
                                                                        PatientLabOrdersResponseModel order = group;
                                                                        return Column(
                                                                          crossAxisAlignment: CrossAxisAlignment.start,
                                                                          children: [
                                                                            "• ${order.testDetails![index].description!}".toText14(isBold: true, isEnglishOnly: true),
                                                                            SizedBox(height: 4.h),
                                                                            (_appState.isArabic() ? order.testDetails![index].testDescriptionAr! : order.testDetails![index].testDescriptionEn!)
                                                                                .toText12(isBold: true, color: AppColors.textColorLight, isEnglishOnly: true),
                                                                          ],
                                                                        ).paddingOnly(top: 16, bottom: 16);
                                                                      },
                                                                      separatorBuilder: (cxt, index) => Divider(color: AppColors.borderOnlyColor.withValues(alpha: 0.05), height: 1.h),
                                                                      itemCount: group.testDetails!.length > 3 ? 3 : group.testDetails!.length),
                                                                  SizedBox(height: 16.h),
                                                                  CustomButton(
                                                                    text: "${LocaleKeys.viewResults.tr()} (${group.testDetails!.length})",
                                                                    onPressed: () {
                                                                      labProvider.currentlySelectedPatientOrder = group;
                                                                      labProvider.getPatientLabResultByHospital(group);
                                                                      labProvider.getPatientSpecialResult(group);
                                                                      Navigator.of(context).push(
                                                                        CustomPageRoute(
                                                                          page: LabResultByClinic(labOrder: group),
                                                                        ),
                                                                      );
                                                                    },
                                                                    backgroundColor: AppColors.infoColor.withAlpha(20),
                                                                    borderColor: AppColors.infoColor.withAlpha(0),
                                                                    textColor: AppColors.infoColor,
                                                                    fontSize: (isFoldable || isTablet) ? 12.f : 14.f,
                                                                    isBold: true,
                                                                    borderRadius: 12.r,
                                                                    padding: EdgeInsets.fromLTRB(10.w, 0, 10.w, 0),
                                                                    height: 40.h,
                                                                    iconSize: 14.h,
                                                                    icon: AppAssets.view_report_icon,
                                                                    iconColor: AppColors.infoColor,
                                                                  ),
                                                                  SizedBox(height: 16.h),
                                                                ],
                                                              ),
                                                            )
                                                          : SizedBox.shrink(),
                                                    ),
                                                  ],
                                                ),
                                              ),
                                            ),
                                          ),
                                        ));
                                  },
                                )
                              : Utils.getNoDataWidget(context, noDataText: LocaleKeys.noLabResults.tr(context: context)))
                      : // By Test or other tabs keep existing behavior
                      (labViewModel.isLabOrdersLoading)
                          ? Column(
                              children: List.generate(
                                  5,
                                  (index) => LabResultItemView(
                                        onTap: () {},
                                        labOrder: null,
                                        index: index,
                                        isLoading: true,
                                      )),
                            )
                          : AlphabeticScroll(
                              alpahbetsAvailable: labViewModel.filteredIndexedCharacterForUniqueTest,
                              details: labViewModel.filteredUniqueTestsList,
                              labViewModel: labViewModel,
                              rangeViewModel: rangeViewModel,
                              appState: _appState,
                            )
                ],
              ));
        },
      ),
    );
  }

  Color getLabOrderStatusColor(num status) {
    switch (status) {
      case 44:
        return AppColors.warningColorYellow;
      case 45:
        return AppColors.warningColorYellow;
      case 16:
        return AppColors.successColor;
      case 17:
        return AppColors.successColor;
      default:
        return AppColors.greyColor;
    }
  }

  String getLabOrderStatusText(num status) {
    switch (status) {
      case 44:
        return LocaleKeys.resultsPending.tr(context: context);
      case 45:
        return LocaleKeys.resultsPending.tr(context: context);
      case 16:
        return LocaleKeys.resultsAvailable.tr(context: context);
      case 17:
        return LocaleKeys.resultsAvailable.tr(context: context);
      default:
        return "";
    }
  }

  getLabSuggestions(LabViewModel model) {
    if (model.patientLabOrders.isEmpty) {
      return [];
    }
    return model.patientLabOrders.map((m) => m.testDetails).toList();
  }
}
\ No newline at end of file
diff --git a/lib/presentation/medical_file/medical_file_page.dart b/lib/presentation/medical_file/medical_file_page.dart
index 27978723..add423d8 100644
--- a/lib/presentation/medical_file/medical_file_page.dart
+++ b/lib/presentation/medical_file/medical_file_page.dart
@@ -280,7 +280,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
                       AppCustomChipWidget(
                         icon: AppAssets.blood_icon,
                         labelText: appState.getUserBloodGroup.isEmpty ? "N/A" : appState.getUserBloodGroup,
-                        iconColor: AppColors.primaryRedColor,
+                        iconColor: AppColors.primaryRedColorBase,
                         labelPadding: EdgeInsetsDirectional.only(start: -6.w, end: 6.w),
                         padding: EdgeInsets.zero,
                       ),
@@ -340,7 +340,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
                             }
                           },
                           backgroundColor: insuranceVM.isInsuranceExpired
-                              ? AppColors.primaryRedColor.withOpacity(0.1)
+                              ? AppColors.secondaryLightRedColor
                               : insuranceVM.isInsuranceActive
                                   ? AppColors.successColor.withOpacity(0.1)
                                   : AppColors.warningColorYellow.withOpacity(0.1),
diff --git a/lib/presentation/medical_file/widgets/medical_report_card.dart b/lib/presentation/medical_file/widgets/medical_report_card.dart
index 1a43b83b..905823b4 100644
--- a/lib/presentation/medical_file/widgets/medical_report_card.dart
+++ b/lib/presentation/medical_file/widgets/medical_report_card.dart
@@ -84,15 +84,15 @@ class MedicalReportCard extends StatelessWidget {
                           ),
                         );
               },
-              backgroundColor: AppColors.lightRedButtonColor,
-              borderColor: AppColors.lightRedButtonColor,
+              backgroundColor: AppColors.secondaryLightRedColor,
+              borderColor: AppColors.secondaryLightRedColor,
               textColor: AppColors.primaryRedColor,
               iconColor: AppColors.primaryRedColor,
               fontSize: 14.f,
-              // fontWeight: FontWeight.w600,
               isBold: true,
               borderRadius: 12.r,
               height: 40.h,
+              iconSize: 18.f,
             ).toShimmer2(isShow: isLoading),
           ],
         ),
diff --git a/lib/presentation/medical_file/widgets/patient_sick_leave_card.dart b/lib/presentation/medical_file/widgets/patient_sick_leave_card.dart
index f06e6a0e..2bb879b5 100644
--- a/lib/presentation/medical_file/widgets/patient_sick_leave_card.dart
+++ b/lib/presentation/medical_file/widgets/patient_sick_leave_card.dart
@@ -122,7 +122,7 @@ class PatientSickLeaveCard extends StatelessWidget {
                             });
                           },
                           backgroundColor: AppColors.secondaryLightRedColor,
-                          borderColor: AppColors.secondaryLightRedColor,
+                          borderColor: AppColors.transparent,
                           textColor: AppColors.primaryRedColor,
                           fontSize: 14.f,
                           isBold: true,
diff --git a/lib/presentation/medical_report/medical_report_request_page.dart b/lib/presentation/medical_report/medical_report_request_page.dart
index 47a2df32..859a6b2f 100644
--- a/lib/presentation/medical_report/medical_report_request_page.dart
+++ b/lib/presentation/medical_report/medical_report_request_page.dart
@@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
+import 'package:hmg_patient_app_new/core/utils/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/features/book_appointments/book_appointments_view_model.dart';
@@ -26,8 +27,9 @@ class MedicalReportRequestPage extends StatelessWidget {
       isClose: true,
       child: Column(
         children: [
-          ListView.separated(
-            padding: EdgeInsets.only(top: 24.h),
+          medicalFileViewModel.patientMedicalReportAppointmentHistoryList.isNotEmpty
+              ? ListView.separated(
+                  padding: EdgeInsets.only(top: 24.h),
             shrinkWrap: true,
             physics: NeverScrollableScrollPhysics(),
             itemCount: medicalFileViewModel.patientMedicalReportAppointmentHistoryList.length,
@@ -57,7 +59,8 @@ class MedicalReportRequestPage extends StatelessWidget {
               );
             },
             separatorBuilder: (BuildContext cxt, int index) => SizedBox(height: 16.h),
-          ),
+                )
+              : Utils.getNoDataWidget(context),
           SizedBox(height: 24.h),
         ],
       ),
diff --git a/lib/presentation/medical_report/medical_reports_page.dart b/lib/presentation/medical_report/medical_reports_page.dart
index e1ac3969..33f9e6e3 100644
--- a/lib/presentation/medical_report/medical_reports_page.dart
+++ b/lib/presentation/medical_report/medical_reports_page.dart
@@ -50,42 +50,7 @@ class _MedicalReportsPageState extends State<MedicalReportsPage> {
                 child: Consumer<MedicalFileViewModel>(builder: (context, medicalFileVM, child) {
                   return Column(
                     children: [
-                      SizedBox(height: 16.h),
-                      // Status filter tabs
-                      // Row(
-                      //   children: [
-                      //     CustomButton(
-                      //       text: LocaleKeys.byClinic.tr(context: context),
-                      //       onPressed: () {
-                      //         medicalFileVM.setIsMedicalReportsSortByClinic(true);
-                      //       },
-                      //       backgroundColor: medicalFileVM.isMedicalReportsSortByClinic ? AppColors.bgRedLightColor : AppColors.whiteColor,
-                      //       borderColor: medicalFileVM.isMedicalReportsSortByClinic ? AppColors.primaryRedColor : AppColors.textColor.withValues(alpha: 0.2),
-                      //       textColor: medicalFileVM.isMedicalReportsSortByClinic ? AppColors.primaryRedColor : AppColors.blackColor,
-                      //       fontSize: 12,
-                      //       isBold: true,
-                      //       borderRadius: 10,
-                      //       padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
-                      //       height: 40.h,
-                      //     ),
-                      //     SizedBox(width: 8.h),
-                      //     CustomButton(
-                      //       text: LocaleKeys.byHospital.tr(context: context),
-                      //       onPressed: () {
-                      //         medicalFileVM.setIsMedicalReportsSortByClinic(false);
-                      //       },
-                      //       backgroundColor: medicalFileVM.isMedicalReportsSortByClinic ? AppColors.whiteColor : AppColors.bgRedLightColor,
-                      //       borderColor: medicalFileVM.isMedicalReportsSortByClinic ? AppColors.textColor.withValues(alpha: 0.2) : AppColors.primaryRedColor,
-                      //       textColor: medicalFileVM.isMedicalReportsSortByClinic ? AppColors.blackColor : AppColors.primaryRedColor,
-                      //       fontSize: 12,
-                      //       isBold: true,
-                      //       borderRadius: 10,
-                      //       padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
-                      //       height: 40.h,
-                      //     ),
-                      //   ],
-                      // ).paddingSymmetrical(24.h, 0.h),
-                      SizedBox(height: 8.h),
+                      SizedBox(height: 24.h),
                       Row(
                         children: [
                           CustomButton(
@@ -404,6 +369,7 @@ class _MedicalReportsPageState extends State<MedicalReportsPage> {
               showCommonBottomSheetWithoutHeight(context,
                   child: Utils.getSuccessWidget(loadingText: LocaleKeys.yourMedicalReportRequestSubmittedSuccessfully.tr(context: context)),
                   callBackFunc: () async{
+                medicalFileViewModel.setIsMedicalReportsDataNeedsReloading(true);
                 medicalFileViewModel.setIsPatientMedicalReportsLoading(true);
                 medicalFileViewModel.onMedicalReportTabChange(0);
                 medicalFileViewModel.getPatientMedicalReportList();
diff --git a/lib/presentation/my_family/my_family.dart b/lib/presentation/my_family/my_family.dart
index 4b6f820a..76f318f7 100644
--- a/lib/presentation/my_family/my_family.dart
+++ b/lib/presentation/my_family/my_family.dart
@@ -34,14 +34,13 @@ class _FamilyMedicalScreenState extends State<FamilyMedicalScreen> {
     super.initState();
     medicalVM = context.read<MedicalFileViewModel>();
     WidgetsBinding.instance.addPostFrameCallback((_) async {
-      if(medicalVM!.isFamilyFilesLoading) {
+      if (medicalVM!.isFamilyFilesLoading) {
         LoaderBottomSheet.showLoader();
       } else {
         LoaderBottomSheet.hideLoader();
       }
       medicalVM?.onFamilyFileTabChange(0);
       medicalVM?.getAllPendingRecordsByResponseId();
-
     });
   }
 
@@ -71,6 +70,8 @@ class _FamilyMedicalScreenState extends State<FamilyMedicalScreen> {
                               medicalVM!.addFamilyFile(otpTypeEnum: OTPTypeEnum.sms);
                             });
                       },
+                      borderColor: AppColors.primaryRedColor,
+                      backgroundColor: AppColors.primaryRedColor,
                       icon: AppAssets.add_icon,
                       fontSize: 16.f,
                       borderRadius: 12.r,
@@ -104,9 +105,7 @@ class _FamilyMedicalScreenState extends State<FamilyMedicalScreen> {
             ),
             shouldRebuild: (previous, next) {
               // Only rebuild if something actually changed
-              return previous.selectedIndex != next.selectedIndex ||
-                     !identical(previous.patientFiles, next.patientFiles) ||
-                     !identical(previous.pendingFiles, next.pendingFiles);
+              return previous.selectedIndex != next.selectedIndex || !identical(previous.patientFiles, next.patientFiles) || !identical(previous.pendingFiles, next.pendingFiles);
             },
             builder: (context, data, child) => getFamilyTabs(
               index: data.selectedIndex,
@@ -127,7 +126,6 @@ class _FamilyMedicalScreenState extends State<FamilyMedicalScreen> {
   }) {
     switch (index) {
       case 0:
-
         return FamilyCards(
           profiles: patientFiles,
           onSelect: (FamilyFileResponseModelLists profile) {
diff --git a/lib/presentation/my_family/widget/family_cards.dart b/lib/presentation/my_family/widget/family_cards.dart
index 8feb8434..362aada0 100644
--- a/lib/presentation/my_family/widget/family_cards.dart
+++ b/lib/presentation/my_family/widget/family_cards.dart
@@ -165,67 +165,63 @@ class _FamilyCardsState extends State<FamilyCards> {
                 title: LocaleKeys.whoCanViewMyMedicalFile.tr(context: context).toText18(isBold: true),
                 expandedBackgroundColor: Colors.transparent,
                 initiallyExpanded: true,
-                children: [
-                  SizedBox(height: 10.h),
-                  manageFamily()
-                ],
+                children: [SizedBox(height: 10.h), manageFamily()],
               ),
               ExpandableListItem(title: LocaleKeys.notifications.tr(context: context).toText18(isBold: true), expandedBackgroundColor: Colors.transparent, initiallyExpanded: true, children: [
                 SizedBox(height: 10.h),
                 widget.profileViewList!.where((profile) => profile.isRequestFromMySide ?? false).isEmpty
                     ? Utils.getNoDataWidget(context)
                     : ListView.builder(
-                  shrinkWrap: true,
-                  physics: NeverScrollableScrollPhysics(),
-                  padding: EdgeInsets.zero,
-                  itemCount: widget.profileViewList!.where((profile) => profile.isRequestFromMySide ?? false).length,
-                  itemBuilder: (context, index) {
-                    final mySideProfiles = widget.profileViewList!.where((profile) => profile.isRequestFromMySide ?? false).toList();
-                    FamilyFileResponseModelLists profile = mySideProfiles[index];
-                    return Container(
-                      margin: EdgeInsets.only(bottom: 12.h),
-                      padding: EdgeInsets.symmetric(vertical: 15.h, horizontal: 15.h),
-                      decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24),
-                      child: Opacity(
-                        opacity: 1.0,
-                        child: Column(
-                          mainAxisSize: MainAxisSize.min,
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          children: [
-                            AppCustomChipWidget(
-                              labelText: profile.statusDescription ?? " N/A",
-                              backgroundColor: profile.status == FamilyFileEnum.pending.toInt
-                                  ? AppColors.alertLightColor.withValues(alpha: 0.20)
-                                  : profile.status == FamilyFileEnum.rejected.toInt
-                                  ? AppColors.primaryRedColor.withValues(alpha: 0.20)
-                                  : profile.status == FamilyFileEnum.active.toInt
-                                  ? AppColors.lightGreenColor
-                                  : AppColors.lightGrayBGColor,
-                                textColor: profile.status == FamilyFileEnum.pending.toInt
-                                    ? AppColors.alertLightColor
-                                    : profile.status == FamilyFileEnum.rejected.toInt
-                                    ? AppColors.primaryRedColor
-                                    : profile.status == FamilyFileEnum.active.toInt
-                                    ? AppColors.textGreenColor
-                                    : AppColors.alertColor
-                            ),
-                            SizedBox(height: 8.h),
-                            Wrap(alignment: WrapAlignment.start, crossAxisAlignment: WrapCrossAlignment.start, runAlignment: WrapAlignment.start, spacing: 0.h, children: [
-                              (profile.patientName ?? "").toText14(isBold: true, isCenter: false, maxlines: 1),
-                              (getStatusTextByRequest(FamilyFileEnum.values.firstWhere((e) => e.toInt == profile.status), profile.isRequestFromMySide ?? false))
-                                  .toText12(isCenter: false, maxLine: 1, isBold: true, color: AppColors.greyTextColor),
-                            ]),
-                            SizedBox(height: 8.h),
-                            AppCustomChipWidget(
-                              labelText: "Medical File: ${profile.responseId ?? "N/A"}",
+                        shrinkWrap: true,
+                        physics: NeverScrollableScrollPhysics(),
+                        padding: EdgeInsets.zero,
+                        itemCount: widget.profileViewList!.where((profile) => profile.isRequestFromMySide ?? false).length,
+                        itemBuilder: (context, index) {
+                          final mySideProfiles = widget.profileViewList!.where((profile) => profile.isRequestFromMySide ?? false).toList();
+                          FamilyFileResponseModelLists profile = mySideProfiles[index];
+                          return Container(
+                            margin: EdgeInsets.only(bottom: 12.h),
+                            padding: EdgeInsets.symmetric(vertical: 15.h, horizontal: 15.h),
+                            decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24),
+                            child: Opacity(
+                              opacity: 1.0,
+                              child: Column(
+                                mainAxisSize: MainAxisSize.min,
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                mainAxisAlignment: MainAxisAlignment.start,
+                                children: [
+                                  AppCustomChipWidget(
+                                      labelText: profile.statusDescription ?? " N/A",
+                                      backgroundColor: profile.status == FamilyFileEnum.pending.toInt
+                                          ? AppColors.alertLightColor.withValues(alpha: 0.20)
+                                          : profile.status == FamilyFileEnum.rejected.toInt
+                                              ? AppColors.primaryRedColor.withValues(alpha: 0.20)
+                                              : profile.status == FamilyFileEnum.active.toInt
+                                                  ? AppColors.lightGreenColor
+                                                  : AppColors.lightGrayBGColor,
+                                      textColor: profile.status == FamilyFileEnum.pending.toInt
+                                          ? AppColors.alertLightColor
+                                          : profile.status == FamilyFileEnum.rejected.toInt
+                                              ? AppColors.primaryRedColor
+                                              : profile.status == FamilyFileEnum.active.toInt
+                                                  ? AppColors.textGreenColor
+                                                  : AppColors.alertColor),
+                                  SizedBox(height: 8.h),
+                                  Wrap(alignment: WrapAlignment.start, crossAxisAlignment: WrapCrossAlignment.start, runAlignment: WrapAlignment.start, spacing: 0.h, children: [
+                                    (profile.patientName ?? "").toText14(isBold: true, isCenter: false, maxlines: 1),
+                                    (getStatusTextByRequest(FamilyFileEnum.values.firstWhere((e) => e.toInt == profile.status), profile.isRequestFromMySide ?? false))
+                                        .toText12(isCenter: false, maxLine: 1, isBold: true, color: AppColors.greyTextColor),
+                                  ]),
+                                  SizedBox(height: 8.h),
+                                  AppCustomChipWidget(
+                                    labelText: "Medical File: ${profile.responseId ?? "N/A"}",
+                                  ),
+                                ],
+                              ),
                             ),
-                          ],
-                        ),
+                          );
+                        },
                       ),
-                    );
-                  },
-                ),
               ])
             ],
             theme: ExpandableListTheme.custom(
@@ -463,7 +459,7 @@ class _FamilyCardsState extends State<FamilyCards> {
                             isCircular: true,
                             isFamilyMember: true, // Prevent AppState fallback
                           ),
-                          SizedBox(height: 4.h),
+                          SizedBox(height: 3.h),
                           (profile.patientName ?? "Unknown").toText14(isBold: true, isCenter: true, maxlines: 1),
                           // SizedBox(height: 8.h),
                           // CustomChipWidget(
@@ -479,7 +475,7 @@ class _FamilyCardsState extends State<FamilyCards> {
                               ? Wrap(direction: Axis.horizontal, spacing: 4.h, runSpacing: 4.h, children: [
                                   AppCustomChipWidget(
                                     icon: AppAssets.file_icon,
-                                    richText: "${LocaleKeys.fileno.tr(context: context)}: ${profile.responseId}".toText10(isBold: true),
+                                    richText: "${profile.responseId}".toText10(isBold: true),
                                     labelPadding: EdgeInsetsDirectional.only(start: -4.w, end: 6.w),
                                   ),
                                   AppCustomChipWidget(
@@ -493,7 +489,7 @@ class _FamilyCardsState extends State<FamilyCards> {
                               : SizedBox(
                                   height: 4.h,
                                 ),
-                          Spacer(),
+                          SizedBox(height: 8.h),
                           widget.isForWalletRecharge
                               ? CustomButton(
                                   height: 40.h,
@@ -517,7 +513,7 @@ class _FamilyCardsState extends State<FamilyCards> {
                                   },
                                   text: isActive ? LocaleKeys.active.tr(context: context) : LocaleKeys.switchLogin.tr(context: context),
                                   backgroundColor: isActive || !canSwitch ? Colors.grey.shade200 : AppColors.secondaryLightRedColor,
-                                  borderColor: isActive || !canSwitch ? Colors.grey.shade200 : AppColors.secondaryLightRedColor,
+                                  borderColor: Colors.transparent,
                                   textColor: isActive || !canSwitch ? AppColors.greyTextColor : AppColors.primaryRedColor,
                                   fontSize: 13.h,
                                   icon: isActive ? AppAssets.activeCheck : AppAssets.switch_user,
@@ -527,13 +523,15 @@ class _FamilyCardsState extends State<FamilyCards> {
                         ],
                       ),
                       if (widget.isShowRemoveButton) ...[
-                        isParentUser ? Positioned(
-                          top: 0,
-                          right: 0,
-                          child: Utils.buildSvgWithAssets(icon: AppAssets.deleteIcon).onPress(() {
-                            if (!isActive) widget.onRemove(profile);
-                          }),
-                        ) : SizedBox(),
+                        isParentUser
+                            ? Positioned(
+                                top: 0,
+                                right: 0,
+                                child: Utils.buildSvgWithAssets(icon: AppAssets.deleteIcon).onPress(() {
+                                  if (!isActive) widget.onRemove(profile);
+                                }),
+                              )
+                            : SizedBox(),
                       ],
                     ],
                   ),
diff --git a/lib/presentation/my_invoices/my_invoices_list.dart b/lib/presentation/my_invoices/my_invoices_list.dart
index 67ee05a6..95ff3e16 100644
--- a/lib/presentation/my_invoices/my_invoices_list.dart
+++ b/lib/presentation/my_invoices/my_invoices_list.dart
@@ -122,8 +122,8 @@ class _MyInvoicesListState extends State<MyInvoicesList> {
             children: [
               SizedBox(height: 16.h),
               CustomTabBar(
-                activeTextColor: Color(0xffED1C2B),
-                activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1),
+                activeTextColor: AppColors.primaryRedColor,
+                activeBackgroundColor: AppColors.secondaryLightRedColor,
                 initialIndex: 0,
                 tabs: [
                   CustomTabBarModel(null, LocaleKeys.visitsOrders.tr(context: context)),
@@ -149,13 +149,11 @@ class _MyInvoicesListState extends State<MyInvoicesList> {
                                 myInvoicesViewModel.filterInvoices(InvoiceFilterType.all);
                               },
                               backgroundColor: myInvoicesVM.currentFilter == InvoiceFilterType.all ? AppColors.bgRedLightColor : AppColors.whiteColor,
-                              borderColor: myInvoicesVM.currentFilter == InvoiceFilterType.all
-                                  ? AppColors.primaryRedColor
-                                  : AppColors.textColor.withValues(alpha: 0.2),
+                              borderColor: myInvoicesVM.currentFilter == InvoiceFilterType.all ? AppColors.primaryRedColor : AppColors.textColor.withValues(alpha: 0.2),
                               textColor: myInvoicesVM.currentFilter == InvoiceFilterType.all ? AppColors.primaryRedColor : AppColors.blackColor,
-                              fontSize: 12,
+                              fontSize: 12.f,
                               fontWeight: FontWeight.w600,
-                              borderRadius: 10,
+                              borderRadius: 10.r,
                               padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
                               height: 40.h,
                             ),
@@ -166,15 +164,12 @@ class _MyInvoicesListState extends State<MyInvoicesList> {
                                 if (myInvoicesVM.getOriginalInvoicesList().isEmpty) return;
                                 _showHospitalFilterBottomSheet(context);
                               },
-                              backgroundColor:
-                                  myInvoicesVM.currentFilter == InvoiceFilterType.hospital ? AppColors.bgRedLightColor : AppColors.whiteColor,
-                              borderColor: myInvoicesVM.currentFilter == InvoiceFilterType.hospital
-                                  ? AppColors.primaryRedColor
-                                  : AppColors.textColor.withValues(alpha: 0.2),
+                              backgroundColor: myInvoicesVM.currentFilter == InvoiceFilterType.hospital ? AppColors.bgRedLightColor : AppColors.whiteColor,
+                              borderColor: myInvoicesVM.currentFilter == InvoiceFilterType.hospital ? AppColors.primaryRedColor : AppColors.textColor.withValues(alpha: 0.2),
                               textColor: myInvoicesVM.currentFilter == InvoiceFilterType.hospital ? AppColors.primaryRedColor : AppColors.blackColor,
-                              fontSize: 12,
+                              fontSize: 12.f,
                               fontWeight: FontWeight.w600,
-                              borderRadius: 10,
+                              borderRadius: 10.r,
                               padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
                               height: 40.h,
                             ),
@@ -185,15 +180,12 @@ class _MyInvoicesListState extends State<MyInvoicesList> {
                                 if (myInvoicesVM.getOriginalInvoicesList().isEmpty) return;
                                 _showClinicFilterBottomSheet(context);
                               },
-                              backgroundColor:
-                                  myInvoicesVM.currentFilter == InvoiceFilterType.clinic ? AppColors.bgRedLightColor : AppColors.whiteColor,
-                              borderColor: myInvoicesVM.currentFilter == InvoiceFilterType.clinic
-                                  ? AppColors.primaryRedColor
-                                  : AppColors.textColor.withValues(alpha: 0.2),
+                              backgroundColor: myInvoicesVM.currentFilter == InvoiceFilterType.clinic ? AppColors.bgRedLightColor : AppColors.whiteColor,
+                              borderColor: myInvoicesVM.currentFilter == InvoiceFilterType.clinic ? AppColors.primaryRedColor : AppColors.textColor.withValues(alpha: 0.2),
                               textColor: myInvoicesVM.currentFilter == InvoiceFilterType.clinic ? AppColors.primaryRedColor : AppColors.blackColor,
-                              fontSize: 12,
+                              fontSize: 12.f,
                               fontWeight: FontWeight.w600,
-                              borderRadius: 10,
+                              borderRadius: 10.r,
                               padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
                               height: 40.h,
                             ),
@@ -204,15 +196,12 @@ class _MyInvoicesListState extends State<MyInvoicesList> {
                                 if (myInvoicesVM.getOriginalInvoicesList().isEmpty) return;
                                 _showDoctorFilterBottomSheet(context);
                               },
-                              backgroundColor:
-                                  myInvoicesVM.currentFilter == InvoiceFilterType.doctor ? AppColors.bgRedLightColor : AppColors.whiteColor,
-                              borderColor: myInvoicesVM.currentFilter == InvoiceFilterType.doctor
-                                  ? AppColors.primaryRedColor
-                                  : AppColors.textColor.withValues(alpha: 0.2),
+                              backgroundColor: myInvoicesVM.currentFilter == InvoiceFilterType.doctor ? AppColors.bgRedLightColor : AppColors.whiteColor,
+                              borderColor: myInvoicesVM.currentFilter == InvoiceFilterType.doctor ? AppColors.primaryRedColor : AppColors.textColor.withValues(alpha: 0.2),
                               textColor: myInvoicesVM.currentFilter == InvoiceFilterType.doctor ? AppColors.primaryRedColor : AppColors.blackColor,
-                              fontSize: 12,
+                              fontSize: 12.f,
                               fontWeight: FontWeight.w600,
-                              borderRadius: 10,
+                              borderRadius: 10.r,
                               padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
                               height: 40.h,
                             ),
@@ -245,16 +234,14 @@ class _MyInvoicesListState extends State<MyInvoicesList> {
                                                   getInvoicesListResponseModel: myInvoicesVM.allInvoicesList[index],
                                                   onTap: () async {
                                                     if (Utils.isVidaPlusProject(myInvoicesVM.allInvoicesList[index].projectId ?? 0)) {
-                                                      LoaderBottomSheet.showLoader(
-                                                          loadingText: LocaleKeys.sendingEmailPleaseWait.tr(context: context));
+                                                      LoaderBottomSheet.showLoader(loadingText: LocaleKeys.sendingEmailPleaseWait.tr(context: context));
                                                       await myInvoicesViewModel.sendInvoiceEmail(
                                                           appointmentNo: myInvoicesVM.allInvoicesList[index].appointmentNo!,
                                                           projectID: myInvoicesVM.allInvoicesList[index].projectId!,
                                                           onSuccess: (val) {
                                                             LoaderBottomSheet.hideLoader();
                                                             showCommonBottomSheetWithoutHeight(context,
-                                                                child: Utils.getSuccessWidget(
-                                                                    loadingText: LocaleKeys.emailSentSuccessfullyMessage.tr(context: context)),
+                                                                child: Utils.getSuccessWidget(loadingText: LocaleKeys.emailSentSuccessfullyMessage.tr(context: context)),
                                                                 callBackFunc: () {},
                                                                 isFullScreen: false,
                                                                 isCloseButtonVisible: true,
@@ -289,8 +276,7 @@ class _MyInvoicesListState extends State<MyInvoicesList> {
                                                         onSuccess: (value) async {
                                                           LoaderBottomSheet.hideLoader();
                                                           if (myInvoicesViewModel.downloadInvoicePDFBase64!.isNotEmpty) {
-                                                            String path = await Utils.createFileFromString(
-                                                                myInvoicesViewModel.downloadInvoicePDFBase64!, "pdf");
+                                                            String path = await Utils.createFileFromString(myInvoicesViewModel.downloadInvoicePDFBase64!, "pdf");
                                                             try {
                                                               OpenFilex.open(path);
                                                             } catch (ex) {
@@ -377,8 +363,7 @@ class _MyInvoicesListState extends State<MyInvoicesList> {
                                                       onSuccess: (value) async {
                                                         LoaderBottomSheet.hideLoader();
                                                         if (myInvoicesViewModel.downloadPharmacyInvoicePDFBase64!.isNotEmpty) {
-                                                          String path = await Utils.createFileFromString(
-                                                              myInvoicesViewModel.downloadPharmacyInvoicePDFBase64!, "pdf");
+                                                          String path = await Utils.createFileFromString(myInvoicesViewModel.downloadPharmacyInvoicePDFBase64!, "pdf");
                                                           try {
                                                             OpenFilex.open(path);
                                                           } catch (ex) {
diff --git a/lib/presentation/notifications/notifications_list_page.dart b/lib/presentation/notifications/notifications_list_page.dart
index 77f9a20a..eb1af696 100644
--- a/lib/presentation/notifications/notifications_list_page.dart
+++ b/lib/presentation/notifications/notifications_list_page.dart
@@ -17,6 +17,7 @@ import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart';
 import 'package:hmg_patient_app_new/presentation/notifications/notification_details_page.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart';
+import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
 import 'package:provider/provider.dart';
 import 'package:intl/intl.dart';
 import 'dart:ui' as ui;
@@ -51,6 +52,54 @@ class _NotificationsListPageState extends State<NotificationsListPage> {
       child: Consumer<NotificationsViewModel>(builder: (context, notificationsVM, child) {
         return Column(
           children: [
+            Row(
+              children: [
+                CustomButton(
+                  text: LocaleKeys.all.tr(context: context),
+                  onPressed: () {
+                    notificationsVM.onNotificationTabChange(0);
+                  },
+                  backgroundColor: notificationsVM.selectedNotificationsTabIndex == 0 ? AppColors.bgRedLightColor : AppColors.whiteColor,
+                  borderColor: notificationsVM.selectedNotificationsTabIndex == 0 ? AppColors.primaryRedColor : AppColors.textColor.withValues(alpha: 0.2),
+                  textColor: notificationsVM.selectedNotificationsTabIndex == 0 ? AppColors.primaryRedColor : AppColors.blackColor,
+                  fontSize: 12,
+                  isBold: true,
+                  borderRadius: 10,
+                  padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
+                  height: 40.h,
+                ),
+                SizedBox(width: 8.h),
+                CustomButton(
+                  text: LocaleKeys.unread.tr(context: context),
+                  onPressed: () {
+                    notificationsVM.onNotificationTabChange(1);
+                  },
+                  backgroundColor: notificationsVM.selectedNotificationsTabIndex == 1 ? AppColors.bgRedLightColor : AppColors.whiteColor,
+                  borderColor: notificationsVM.selectedNotificationsTabIndex == 1 ? AppColors.primaryRedColor : AppColors.textColor.withValues(alpha: 0.2),
+                  textColor: notificationsVM.selectedNotificationsTabIndex == 1 ? AppColors.primaryRedColor : AppColors.blackColor,
+                  fontSize: 12,
+                  isBold: true,
+                  borderRadius: 10,
+                  padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
+                  height: 40.h,
+                ),
+                SizedBox(width: 8.h),
+                CustomButton(
+                  text: LocaleKeys.read.tr(context: context),
+                  onPressed: () {
+                    notificationsVM.onNotificationTabChange(2);
+                  },
+                  backgroundColor: notificationsVM.selectedNotificationsTabIndex == 2 ? AppColors.bgRedLightColor : AppColors.whiteColor,
+                  borderColor: notificationsVM.selectedNotificationsTabIndex == 2 ? AppColors.primaryRedColor : AppColors.textColor.withValues(alpha: 0.2),
+                  textColor: notificationsVM.selectedNotificationsTabIndex == 2 ? AppColors.primaryRedColor : AppColors.blackColor,
+                  fontSize: 12,
+                  isBold: true,
+                  borderRadius: 10,
+                  padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
+                  height: 40.h,
+                ),
+              ],
+            ).paddingSymmetrical(24.h, 0.h),
             Container(
               margin: EdgeInsets.symmetric(vertical: 24.h),
               decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
diff --git a/lib/presentation/onboarding/onboarding_screen.dart b/lib/presentation/onboarding/onboarding_screen.dart
index 0af63b40..1c5b64d8 100644
--- a/lib/presentation/onboarding/onboarding_screen.dart
+++ b/lib/presentation/onboarding/onboarding_screen.dart
@@ -111,7 +111,7 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
                           onPressed: () => goToHomePage(),
                           width: 86.w,
                           height: 56.h,
-                          backgroundColor: Color(0xffFEE9EA),
+                          backgroundColor: AppColors.secondaryLightRedColor,
                           textColor: AppColors.primaryRedColor,
                           borderColor: Colors.transparent,
                         ).paddingOnly(left: 24.w)
diff --git a/lib/presentation/onboarding/splash_animation_screen.dart b/lib/presentation/onboarding/splash_animation_screen.dart
index 105922bb..0fdd86a8 100644
--- a/lib/presentation/onboarding/splash_animation_screen.dart
+++ b/lib/presentation/onboarding/splash_animation_screen.dart
@@ -164,7 +164,7 @@ class _AnimatedScreenState extends State<AnimatedScreen> with TickerProviderStat
                     width: 400.h,
                     height: 653.h,
                     decoration: BoxDecoration(
-                      color: Color(0xffED1C2B),
+                      color: AppColors.primaryRedColor,
                       borderRadius: BorderRadius.circular(330.h),
                     ),
                   ),
@@ -273,7 +273,7 @@ class _MoveObjectDemoState extends State<MoveObjectDemo> with SingleTickerProvid
                 width: 200,
                 height: 375,
                 decoration: BoxDecoration(
-                  color: const Color(0xffED1C2B),
+                  color: AppColors.primaryRedColor,
                   borderRadius: BorderRadius.circular(330),
                 ),
               ),
@@ -367,7 +367,7 @@ class _MoveOnClickDemoState extends State<MoveOnClickDemo> with TickerProviderSt
                   width: 100,
                   height: 150,
                   decoration: BoxDecoration(
-                    color: const Color(0xffED1C2B),
+                    color: AppColors.primaryRedColor,
                     borderRadius: BorderRadius.circular(330),
                   ),
                 ),
diff --git a/lib/presentation/prescriptions/prescription_item_view.dart b/lib/presentation/prescriptions/prescription_item_view.dart
index b0e11af0..59b10620 100644
--- a/lib/presentation/prescriptions/prescription_item_view.dart
+++ b/lib/presentation/prescriptions/prescription_item_view.dart
@@ -177,8 +177,8 @@ class PrescriptionItemView extends StatelessWidget {
           //       child: CustomButton(
           //         text: LocaleKeys.checkAvailability.tr(context: context),
           //         onPressed: () {},
-          //         backgroundColor: AppColors.primaryRedColor.withOpacity(0.1),
-          //         borderColor: AppColors.primaryRedColor.withOpacity(0.0),
+          //         backgroundColor: AppColors.primaryRedColorBase.withOpacity(0.1),
+          //         borderColor: AppColors.primaryRedColorBase.withOpacity(0.0),
           //         textColor: AppColors.primaryRedColor,
           //         fontSize: 14.f,
           //         isBold: true,
diff --git a/lib/presentation/profile_settings/profile_settings.dart b/lib/presentation/profile_settings/profile_settings.dart
index 2e9bb3b7..ce300c9b 100644
--- a/lib/presentation/profile_settings/profile_settings.dart
+++ b/lib/presentation/profile_settings/profile_settings.dart
@@ -52,14 +52,13 @@ class ProfileSettings extends StatefulWidget {
 }
 
 class ProfileSettingsState extends State<ProfileSettings> {
-
   final InAppReview inAppReview = InAppReview.instance;
 
   @override
   void initState() {
     super.initState();
     _loadPermissions();
-    
+
     // Load data after first frame
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (mounted) {
@@ -434,7 +433,15 @@ class ProfileSettingsState extends State<ProfileSettings> {
           if (trailingLabel.isNotEmpty)
             ConstrainedBox(
               constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 0.35),
-              child: isEnglishOnly ? Directionality(textDirection: ui.TextDirection.ltr, child: trailingLabel.toText14(color: AppColors.greyTextColor, isBold: true, textOverflow: TextOverflow.ellipsis, maxlines: 1, isEnglishOnly: isEnglishOnly).toShimmer2(isShow: isShowLoading)) : trailingLabel.toText14(color: AppColors.greyTextColor, isBold: true, textOverflow: TextOverflow.ellipsis, maxlines: 1, isEnglishOnly: isEnglishOnly).toShimmer2(isShow: isShowLoading),
+              child: isEnglishOnly
+                  ? Directionality(
+                      textDirection: ui.TextDirection.ltr,
+                      child: trailingLabel
+                          .toText14(color: AppColors.greyTextColor, isBold: true, textOverflow: TextOverflow.ellipsis, maxlines: 1, isEnglishOnly: isEnglishOnly)
+                          .toShimmer2(isShow: isShowLoading))
+                  : trailingLabel
+                      .toText14(color: AppColors.greyTextColor, isBold: true, textOverflow: TextOverflow.ellipsis, maxlines: 1, isEnglishOnly: isEnglishOnly)
+                      .toShimmer2(isShow: isShowLoading),
             ),
           switchValue != null
               ? Switch(
@@ -452,8 +459,10 @@ class ProfileSettingsState extends State<ProfileSettings> {
     );
   }
 
-  Widget socialMedia(String icon, String label,
-      ) {
+  Widget socialMedia(
+    String icon,
+    String label,
+  ) {
     return SizedBox(
       height: 56.h,
       child: Row(
@@ -461,14 +470,13 @@ class ProfileSettingsState extends State<ProfileSettings> {
         children: [
           Utils.buildSvgWithAssets(icon: icon, iconColor: AppColors.greyTextColor),
           label.toText14(isBold: true, textOverflow: TextOverflow.ellipsis, maxlines: 1).expanded,
-
           Row(
             spacing: 24.w,
             children: [
-              Utils.buildSvgWithAssets(icon: AppAssets.x2).onPress(()=> launchUrl(Uri.parse("https://twitter.com/HMG"))),
-              Utils.buildSvgWithAssets(icon: AppAssets.fb).onPress(()=> launchUrl(Uri.parse("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn"))),
-              Utils.buildSvgWithAssets(icon: AppAssets.linkedin).onPress(()=> launchUrl(Uri.parse("https://www.linkedin.com/company/drsulaiman-alhabib-medical-group"))),
-              Utils.buildSvgWithAssets(icon: AppAssets.youtube).onPress(()=> launchUrl(Uri.parse("https://www.youtube.com/c/DrsulaimanAlhabibHospitals"))),
+              Utils.buildSvgWithAssets(icon: AppAssets.x2).onPress(() => launchUrl(Uri.parse("https://twitter.com/HMG"))),
+              Utils.buildSvgWithAssets(icon: AppAssets.fb).onPress(() => launchUrl(Uri.parse("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn"))),
+              Utils.buildSvgWithAssets(icon: AppAssets.linkedin).onPress(() => launchUrl(Uri.parse("https://www.linkedin.com/company/drsulaiman-alhabib-medical-group"))),
+              Utils.buildSvgWithAssets(icon: AppAssets.youtube).onPress(() => launchUrl(Uri.parse("https://www.youtube.com/c/DrsulaimanAlhabibHospitals"))),
             ],
           )
         ],
@@ -546,9 +554,7 @@ class _FamilyCardWidgetState extends State<FamilyCardWidget> {
     // final isParentUser = appState.getAuthenticatedUser()?.isParentUser ?? false;
     // final canSwitch = isParentUser || (!isParentUser && widget.profile.responseId == appState.getSuperUserID);
     return Container(
-      decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-        color: AppColors.whiteColor,
-        borderRadius: 24.r, hasShadow: true, hasDenseShadow: true),
+      decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.r, hasShadow: true, hasDenseShadow: true),
       child: Column(
         children: [
           Column(
@@ -607,12 +613,14 @@ class _FamilyCardWidgetState extends State<FamilyCardWidget> {
                             labelText: "${LocaleKeys.fileno.tr(context: context)}: ${widget.profile.responseId}",
                             iconSize: 12.w,
                           ),
-                          isActive ? AppCustomChipWidget(
-                            icon: AppAssets.checkmark_icon,
-                            labelText: LocaleKeys.verified.tr(context: context),
-                            iconColor: AppColors.successColor,
-                            labelPadding: EdgeInsetsDirectional.only(start: -6.w, end: 6.w),
-                          ) : SizedBox.shrink(),
+                          isActive
+                              ? AppCustomChipWidget(
+                                  icon: AppAssets.checkmark_icon,
+                                  labelText: LocaleKeys.verified.tr(context: context),
+                                  iconColor: AppColors.successColor,
+                                  labelPadding: EdgeInsetsDirectional.only(start: -6.w, end: 6.w),
+                                )
+                              : SizedBox.shrink(),
                         ],
                       ),
                     ],
@@ -639,73 +647,76 @@ class _FamilyCardWidgetState extends State<FamilyCardWidget> {
                     ),
                     // isActive && appState.getAuthenticatedUser()!.bloodGroup != null
                     //     ?
-                    isActive ? AppCustomChipWidget(
-                        icon: AppAssets.blood_icon,
+                    isActive
+                        ? AppCustomChipWidget(
+                            icon: AppAssets.blood_icon,
                             labelPadding: EdgeInsetsDirectional.only(start: -6.w, end: 8.w),
-                        labelText: appState.getAuthenticatedUser()!.bloodGroup ?? "N/A",
-                        iconColor: AppColors.primaryRedColor)
-                    : SizedBox(),
+                            labelText: appState.getAuthenticatedUser()!.bloodGroup ?? "N/A",
+                            iconColor: AppColors.primaryRedColor)
+                        : SizedBox(),
                     Consumer<InsuranceViewModel>(builder: (context, insuranceVM, child) {
                       return isActive
                           ? AppCustomChipWidget(
                               icon: insuranceVM.isInsuranceExpired
                                   ? AppAssets.cancel_circle_icon
                                   : insuranceVM.isInsuranceActive
-                                ? AppAssets.insurance_active_icon
-                                : AppAssets.alertSquare,
-                        labelText: insuranceVM.isInsuranceExpired
-                            ? LocaleKeys.insuranceExpired.tr(context: context)
-                            : insuranceVM.isInsuranceActive
-                                ? LocaleKeys.insuranceActive.tr(context: context)
-                                : LocaleKeys.insuranceInActive.tr(context: context),
-                        iconColor: insuranceVM.isInsuranceExpired
-                            ? AppColors.primaryRedColor
-                            : insuranceVM.isInsuranceActive
-                                ? AppColors.successColor
-                                : AppColors.warningColorYellow,
-                        textColor: insuranceVM.isInsuranceExpired
-                            ? AppColors.primaryRedColor
-                            : insuranceVM.isInsuranceActive
-                                ? AppColors.successColor
-                                : AppColors.warningColorYellow,
-                        iconSize: 12.w,
-                        deleteIcon: insuranceVM.isInsuranceActive ? null : AppAssets.forward_chevron_icon,
-                        deleteIconColor: insuranceVM.isInsuranceExpired
-                            ? AppColors.primaryRedColor
-                            : insuranceVM.isInsuranceActive
-                                ? AppColors.successColor
-                                : AppColors.warningColorYellow,
-                        deleteIconHasColor: true,
-                        onChipTap: () {
-                          if (!insuranceVM.isInsuranceActive) {
-                            insuranceVM.setIsInsuranceUpdateDetailsLoading(true);
-                            insuranceVM.getPatientInsuranceDetailsForUpdate(appState.getAuthenticatedUser()!.patientId.toString(), appState.getAuthenticatedUser()!.patientIdentificationNo.toString());
-                            showCommonBottomSheetWithoutHeight(context, child: PatientInsuranceCardUpdateCard(), callBackFunc: () {}, title: "", isCloseButtonVisible: false, isFullScreen: false);
-                            // showCommonBottomSheetWithoutHeight(
-                            //   title: LocaleKeys.notice.tr(context: context),
-                            //   context,
-                            //   child: Utils.getWarningWidget(
-                            //       loadingText: LocaleKeys.insuranceInActiveContactSupport.tr(context: context),
-                            //       confirmText: LocaleKeys.contactUs.tr(context: context),
-                            //       isShowActionButtons: true,
-                            //       onCancelTap: () {
-                            //         Navigator.pop(context);
-                            //       },
-                            //       onConfirmTap: () async {
-                            //         launchUrl(Uri.parse("tel://" + "+966 92 006 6666"));
-                            //       }),
-                            //   callBackFunc: () {},
-                            //   isFullScreen: false,
-                            //   isCloseButtonVisible: true,
-                            // );
-                          }
-                        },
-                        backgroundColor: insuranceVM.isInsuranceExpired
-                            ? AppColors.primaryRedColor.withValues(alpha: 0.1)
-                            : insuranceVM.isInsuranceActive
-                                ? AppColors.successColor.withValues(alpha: 0.1)
-                                : AppColors.warningColorYellow.withValues(alpha: 0.1),
-                        labelPadding: EdgeInsetsDirectional.only(start: -4.w, end: insuranceVM.isInsuranceActive ? 6.w : 0.w),
+                                      ? AppAssets.insurance_active_icon
+                                      : AppAssets.alertSquare,
+                              labelText: insuranceVM.isInsuranceExpired
+                                  ? LocaleKeys.insuranceExpired.tr(context: context)
+                                  : insuranceVM.isInsuranceActive
+                                      ? LocaleKeys.insuranceActive.tr(context: context)
+                                      : LocaleKeys.insuranceInActive.tr(context: context),
+                              iconColor: insuranceVM.isInsuranceExpired
+                                  ? AppColors.primaryRedColor
+                                  : insuranceVM.isInsuranceActive
+                                      ? AppColors.successColor
+                                      : AppColors.warningColorYellow,
+                              textColor: insuranceVM.isInsuranceExpired
+                                  ? AppColors.primaryRedColor
+                                  : insuranceVM.isInsuranceActive
+                                      ? AppColors.successColor
+                                      : AppColors.warningColorYellow,
+                              iconSize: 12.w,
+                              deleteIcon: insuranceVM.isInsuranceActive ? null : AppAssets.forward_chevron_icon,
+                              deleteIconColor: insuranceVM.isInsuranceExpired
+                                  ? AppColors.primaryRedColor
+                                  : insuranceVM.isInsuranceActive
+                                      ? AppColors.successColor
+                                      : AppColors.warningColorYellow,
+                              deleteIconHasColor: true,
+                              onChipTap: () {
+                                if (!insuranceVM.isInsuranceActive) {
+                                  insuranceVM.setIsInsuranceUpdateDetailsLoading(true);
+                                  insuranceVM.getPatientInsuranceDetailsForUpdate(
+                                      appState.getAuthenticatedUser()!.patientId.toString(), appState.getAuthenticatedUser()!.patientIdentificationNo.toString());
+                                  showCommonBottomSheetWithoutHeight(context,
+                                      child: PatientInsuranceCardUpdateCard(), callBackFunc: () {}, title: "", isCloseButtonVisible: false, isFullScreen: false);
+                                  // showCommonBottomSheetWithoutHeight(
+                                  //   title: LocaleKeys.notice.tr(context: context),
+                                  //   context,
+                                  //   child: Utils.getWarningWidget(
+                                  //       loadingText: LocaleKeys.insuranceInActiveContactSupport.tr(context: context),
+                                  //       confirmText: LocaleKeys.contactUs.tr(context: context),
+                                  //       isShowActionButtons: true,
+                                  //       onCancelTap: () {
+                                  //         Navigator.pop(context);
+                                  //       },
+                                  //       onConfirmTap: () async {
+                                  //         launchUrl(Uri.parse("tel://" + "+966 92 006 6666"));
+                                  //       }),
+                                  //   callBackFunc: () {},
+                                  //   isFullScreen: false,
+                                  //   isCloseButtonVisible: true,
+                                  // );
+                                }
+                              },
+                              backgroundColor: insuranceVM.isInsuranceExpired
+                                  ? AppColors.primaryRedColor.withValues(alpha: 0.1)
+                                  : insuranceVM.isInsuranceActive
+                                      ? AppColors.successColor.withValues(alpha: 0.1)
+                                      : AppColors.warningColorYellow.withValues(alpha: 0.1),
+                              labelPadding: EdgeInsetsDirectional.only(start: -4.w, end: insuranceVM.isInsuranceActive ? 6.w : 0.w),
                             ).toShimmer2(isShow: insuranceVM.isInsuranceLoading)
                           : SizedBox.shrink();
                     }),
@@ -747,7 +758,7 @@ class _FamilyCardWidgetState extends State<FamilyCardWidget> {
       height: isFoldable ? 50.h : 45.h,
       fontSize: 14.f,
     ).paddingOnly(top: 12.h, right: 16.w, left: 16.w, bottom: 16.h);
-  }
+  } 
 
   Widget _buildNonParentUserButton(int? superUserId) {
     final canSwitchBack = superUserId != null && superUserId == widget.profile.responseId;
diff --git a/lib/presentation/rate_appointment/rate_appointment_clinic.dart b/lib/presentation/rate_appointment/rate_appointment_clinic.dart
index c8aedea8..e285a7c1 100644
--- a/lib/presentation/rate_appointment/rate_appointment_clinic.dart
+++ b/lib/presentation/rate_appointment/rate_appointment_clinic.dart
@@ -159,9 +159,9 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
                   Expanded(
                     child: CustomButton(
                       text: LocaleKeys.back.tr(context: context),
-                      backgroundColor: Color(0xffFEE9EA),
-                      borderColor: Color(0xffFEE9EA),
-                      textColor: Color(0xffED1C2B),
+                      backgroundColor: AppColors.secondaryLightRedColor,
+                      borderColor: AppColors.secondaryLightRedColor,
+                      textColor: AppColors.primaryRedColor,
                       onPressed: () {
                         appointmentRatingViewModel!.setTitle(LocaleKeys.rateDoctor.tr(context: context));
                         appointmentRatingViewModel!.setSubTitle(LocaleKeys.howWasYourLastVisitWithDoctor.tr(context: context));
diff --git a/lib/presentation/rate_appointment/rate_appointment_doctor.dart b/lib/presentation/rate_appointment/rate_appointment_doctor.dart
index d78dc59e..b54b5741 100644
--- a/lib/presentation/rate_appointment/rate_appointment_doctor.dart
+++ b/lib/presentation/rate_appointment/rate_appointment_doctor.dart
@@ -181,9 +181,9 @@ class _RateAppointmentDoctorState extends State<RateAppointmentDoctor> {
                             Expanded(
                               child: CustomButton(
                                 text: LocaleKeys.later.tr(context: context),
-                                backgroundColor: Color(0xffFEE9EA),
-                                borderColor: Color(0xffFEE9EA),
-                                textColor: Color(0xffED1C2B),
+                                backgroundColor: AppColors.secondaryLightRedColor,
+                                borderColor: AppColors.secondaryLightRedColor,
+                                textColor: AppColors.primaryRedColor,
                                 onPressed: () {
                                   Navigator.pop(context);
                                 },
diff --git a/lib/presentation/smartwatches/activity_detail.dart b/lib/presentation/smartwatches/activity_detail.dart
index 7911baf6..888533af 100644
--- a/lib/presentation/smartwatches/activity_detail.dart
+++ b/lib/presentation/smartwatches/activity_detail.dart
@@ -1,5 +1,6 @@
 import 'dart:math';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/app_export.dart';
@@ -43,7 +44,7 @@ class _ActivityDetailsState extends State<ActivityDetails> {
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
       body: CollapsingListView(
-        title: "All Health Data".needTranslation,
+        title: "allHealthData".tr(),
         child: Column(
           spacing: 16.h,
           children: [
@@ -66,8 +67,8 @@ class _ActivityDetailsState extends State<ActivityDetails> {
           children: [
             Expanded(
               child: CustomTabBar(
-                activeTextColor: Color(0xffED1C2B),
-                activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1),
+                activeTextColor: AppColors.primaryRedColor,
+                activeBackgroundColor: AppColors.secondaryLightRedColor,
                 tabs: [
                   CustomTabBarModel(null, "D"),
                   CustomTabBarModel(null, "W"),
@@ -113,8 +114,8 @@ class _ActivityDetailsState extends State<ActivityDetails> {
             Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                widget.sectionName.capitalizeFirstofEach.toText32(isBold: true, color: AppColors.textColor),
-                "Average".toText12(isBold: true, color: AppColors.greyTextColor)
+                widget.sectionName.capitalizeFirstofEach.tr().toText32(isBold: true, color: AppColors.textColor),
+                "average".tr().needTranslation.toText12(isBold: true, color: AppColors.greyTextColor)
               ],
             ),
             Selector<HealthProvider, Tuple2<double?, String?>>(
@@ -242,6 +243,7 @@ class _ActivityDetailsState extends State<ActivityDetails> {
         builder: (_, data, __) {
           // if (context.read<HealthProvider>().selectedData.values.toList().first.isEmpty == true) return SizedBox();
           if (context.read<HealthProvider>().selectedData.values.toList().isEmpty == true) return SizedBox();
+          if (context.read<HealthProvider>().selectedData.values.toList().first.isEmpty == true) return SizedBox();
 
           return CustomBarChart(
               dataPoints: context.read<HealthProvider>().selectedData.values.toList().first,
diff --git a/lib/presentation/smartwatches/health_dashboard/health_dashboard.dart b/lib/presentation/smartwatches/health_dashboard/health_dashboard.dart
index f30d87a9..84ec64e9 100644
--- a/lib/presentation/smartwatches/health_dashboard/health_dashboard.dart
+++ b/lib/presentation/smartwatches/health_dashboard/health_dashboard.dart
@@ -56,8 +56,8 @@ class _HealthDashboardState extends State<HealthDashboard> with SingleTickerProv
               children: [
                 SizedBox(height: 96.h),
                 CustomTabBar(
-                  activeTextColor: Color(0xffED1C2B),
-                  activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1),
+                  activeTextColor: AppColors.primaryRedColor,
+                  activeBackgroundColor: AppColors.secondaryLightRedColor,
                   tabs: [
                     CustomTabBarModel(null, "Overview".needTranslation),
                     CustomTabBarModel(null, "Details".needTranslation),
diff --git a/lib/presentation/smartwatches/smart_watches_health_data_screen.dart b/lib/presentation/smartwatches/smart_watches_health_data_screen.dart
index baa65b49..78e888ad 100644
--- a/lib/presentation/smartwatches/smart_watches_health_data_screen.dart
+++ b/lib/presentation/smartwatches/smart_watches_health_data_screen.dart
@@ -1,3 +1,4 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
 import 'package:hmg_patient_app_new/core/app_export.dart';
@@ -20,14 +21,14 @@ class SmartWatchesHealthDataScreen extends StatelessWidget {
     return Scaffold(
         backgroundColor: AppColors.bgScaffoldColor,
         body: CollapsingListView(
-          title: "All Health Data".needTranslation,
+          title: "allHealthData".tr(context: context),
           child: Column(
             spacing: 16.h,
             children: [
               resultItem(
                       leadingIcon: AppAssets.watchActivity,
-                      title: "Activity Calories".needTranslation,
-                      description: "Activity rings give you a quick visual reference of how active you are each day. ".needTranslation,
+                      title: "activityCalories".tr(context: context),
+                      description: "activityCaloriesDescription".tr(context: context),
                       trailingIcon: AppAssets.watchActivityTrailing,
                       result: context.read<HealthProvider>().sumOfNonEmptyData(context.read<HealthProvider>().vitals?.activity ?? []),
                       unitsOfMeasure: "Kcal")
@@ -36,12 +37,12 @@ class SmartWatchesHealthDataScreen extends StatelessWidget {
                 context.read<HealthProvider>().deleteDataIfSectionIsDifferent("activity");
                 context.read<HealthProvider>().saveSelectedSection("activity");
                 context.read<HealthProvider>().fetchData();
-                context.read<HealthProvider>().navigateToDetails("activity", sectionName: "Activity Calories", uom: "Kcal");
+                context.read<HealthProvider>().navigateToDetails("activity", sectionName: "activityCalories".tr(), uom: "Kcal");
               }),
               resultItem(
                       leadingIcon: AppAssets.watchSteps,
-                      title: "Steps".needTranslation,
-                      description: "Step count is the number of steps you take throughout the day.".needTranslation,
+                      title: "steps".tr(context: context),
+                      description: "stepsDescription".tr(context: context),
                       trailingIcon: AppAssets.watchStepsTrailing,
                       result: context.read<HealthProvider>().sumOfNonEmptyData(context.read<HealthProvider>().vitals?.step ?? []),
                       unitsOfMeasure: "Steps")
@@ -60,12 +61,12 @@ class SmartWatchesHealthDataScreen extends StatelessWidget {
                 context.read<HealthProvider>().deleteDataIfSectionIsDifferent("steps");
                 context.read<HealthProvider>().saveSelectedSection("steps");
                 context.read<HealthProvider>().fetchData();
-                context.read<HealthProvider>().navigateToDetails("steps", sectionName: "Steps", uom: "Steps");
+                context.read<HealthProvider>().navigateToDetails("steps", sectionName: "steps".tr(), uom: "Steps");
               }),
               resultItem(
                       leadingIcon: AppAssets.watchSteps,
-                      title: "Distance Covered".needTranslation,
-                      description: "Step count is the distance you take throughout the day.".needTranslation,
+                      title: "distanceCovered".tr(context: context),
+                      description: "distanceCoveredDescription".tr(context: context),
                       trailingIcon: AppAssets.watchStepsTrailing,
                       result: context.read<HealthProvider>().sumOfNonEmptyData(context.read<HealthProvider>().vitals?.distance ?? []),
                       unitsOfMeasure: "Km")
@@ -74,12 +75,12 @@ class SmartWatchesHealthDataScreen extends StatelessWidget {
                 context.read<HealthProvider>().deleteDataIfSectionIsDifferent("distance");
                 context.read<HealthProvider>().saveSelectedSection("distance");
                 context.read<HealthProvider>().fetchData();
-                context.read<HealthProvider>().navigateToDetails("distance", sectionName: "Distance Covered", uom: "km");
+                context.read<HealthProvider>().navigateToDetails("distance", sectionName: "distanceCovered".tr(), uom: "km");
               }),
               resultItem(
                       leadingIcon: AppAssets.watchSleep,
-                      title: "Sleep Score".needTranslation,
-                      description: "This will keep track of how much hours you sleep in a day".needTranslation,
+                      title: "sleepScore".tr(context: context),
+                      description: "sleepScoreDescription".tr(context: context),
                       trailingIcon: AppAssets.watchSleepTrailing,
                       result: DateUtil.millisToHourMin(
                               int.parse(context.read<HealthProvider>().firstNonEmptyValue(context.read<HealthProvider>().vitals?.sleep ?? [])))
@@ -94,12 +95,12 @@ class SmartWatchesHealthDataScreen extends StatelessWidget {
                 context.read<HealthProvider>().deleteDataIfSectionIsDifferent("sleep");
                 context.read<HealthProvider>().saveSelectedSection("sleep");
                 context.read<HealthProvider>().fetchData();
-                context.read<HealthProvider>().navigateToDetails("sleep", sectionName: "Sleep Score", uom: "");
+                context.read<HealthProvider>().navigateToDetails("sleep", sectionName: "sleepScore".tr(), uom: "");
               }),
               resultItem(
                       leadingIcon: AppAssets.watchWeight,
-                      title: "Blood Oxygen".needTranslation,
-                      description: "This will calculate your Blood Oxygen to keep track and update history".needTranslation,
+                      title: "bloodOxygen".tr(context: context),
+                      description: "bloodOxygenTrackingDescription".tr(context: context),
                       trailingIcon: AppAssets.watchWeightTrailing,
                       result: context.read<HealthProvider>().firstNonEmptyValue(
                             context.read<HealthProvider>().vitals?.bodyOxygen ?? [],
@@ -110,12 +111,12 @@ class SmartWatchesHealthDataScreen extends StatelessWidget {
                 context.read<HealthProvider>().deleteDataIfSectionIsDifferent("bodyOxygen");
                 context.read<HealthProvider>().saveSelectedSection("bodyOxygen");
                 context.read<HealthProvider>().fetchData();
-                context.read<HealthProvider>().navigateToDetails("bodyOxygen", uom: "%", sectionName: "Blood Oxygen");
+                context.read<HealthProvider>().navigateToDetails("bodyOxygen", uom: "%", sectionName: "bloodOxygen".tr());
               }),
               resultItem(
                       leadingIcon: AppAssets.watchWeight,
-                      title: "Body temperature".needTranslation,
-                      description: "This will calculate your Body temprerature to keep track and update history".needTranslation,
+                      title: "bodyTemperature".tr(context: context),
+                      description: "bodyTemperatureTrackingDescription".tr(context: context),
                       trailingIcon: AppAssets.watchWeightTrailing,
                       result: context.read<HealthProvider>().firstNonEmptyValue(context.read<HealthProvider>().vitals?.bodyTemperature ?? []),
                       unitsOfMeasure: "C")
@@ -124,7 +125,7 @@ class SmartWatchesHealthDataScreen extends StatelessWidget {
                 context.read<HealthProvider>().deleteDataIfSectionIsDifferent("bodyTemperature");
                 context.read<HealthProvider>().saveSelectedSection("bodyTemperature");
                 context.read<HealthProvider>().fetchData();
-                context.read<HealthProvider>().navigateToDetails("bodyTemperature", sectionName: "Body temperature".capitalizeFirstofEach, uom: "C");
+                context.read<HealthProvider>().navigateToDetails("bodyTemperature", sectionName: "bodyTemperature".tr().capitalizeFirstofEach, uom: "C");
               }),
             ],
           ).paddingSymmetrical(24.w, 24.h),
diff --git a/lib/presentation/smartwatches/smartwatch_home_page.dart b/lib/presentation/smartwatches/smartwatch_home_page.dart
index 3bd8e9f5..2c3c88ae 100644
--- a/lib/presentation/smartwatches/smartwatch_home_page.dart
+++ b/lib/presentation/smartwatches/smartwatch_home_page.dart
@@ -25,203 +25,269 @@ class SmartwatchHomePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: AppColors.bgScaffoldColor,
-      body: CollapsingListView(
-        title: LocaleKeys.smartWatches.tr(),
-        bottomChild: Container(
-          decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-            color: AppColors.whiteColor,
-            borderRadius: 24.r,
+    return Consumer<HealthProvider>(builder: (context, healthProvider, child) {
+
+      return Scaffold(
+        backgroundColor: AppColors.bgScaffoldColor,
+        body: CollapsingListView(
+          title: LocaleKeys.smartWatches.tr(),
+          bottomChild: Container(
+            decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+              color: AppColors.whiteColor,
+              borderRadius: 24.r,
+            ),
+            child: CustomButton(
+              text: LocaleKeys.supportedSmartWatches.tr(context: context),
+              onPressed: () {
+                showCommonBottomSheetWithoutHeight(
+                  title: LocaleKeys.supportedSmartWatches.tr(context: context),
+                  context,
+                  child: SupportedWatchesList(),
+                  callBackFunc: () {},
+                  isFullScreen: false,
+                  isCloseButtonVisible: true,
+                );
+              },
+              backgroundColor: AppColors.infoColor.withAlpha(40),
+              borderColor: AppColors.infoColor.withAlpha(0),
+              textColor: AppColors.infoColor,
+              fontSize: 16.f,
+              isBold: true,
+              borderRadius: 12.r,
+              height: 50.h,
+              icon: AppAssets.ask_doctor_icon,
+              iconColor: AppColors.infoColor,
+              iconSize: 18.h,
+            ).paddingSymmetrical(24.w, 30.h),
           ),
-          child: CustomButton(
-            text: LocaleKeys.supportedSmartWatches.tr(context: context),
-            onPressed: () {
-              showCommonBottomSheetWithoutHeight(
-                title: LocaleKeys.supportedSmartWatches.tr(context: context),
-                context,
-                child: SupportedWatchesList(),
-                callBackFunc: () {},
-                isFullScreen: false,
-                isCloseButtonVisible: true,
-              );
-            },
-            backgroundColor: AppColors.infoColor.withAlpha(40),
-            borderColor: AppColors.infoColor.withAlpha(0),
-            textColor: AppColors.infoColor,
-            fontSize: 16.f,
-            isBold: true,
-            borderRadius: 12.r,
-            height: 50.h,
-            icon: AppAssets.ask_doctor_icon,
-            iconColor: AppColors.infoColor,
-            iconSize: 18.h,
-          ).paddingSymmetrical(24.w, 30.h),
-        ),
-        child: SingleChildScrollView(
-          child: Column(
-            children: [
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 24.w, vertical: 24.h),
-                child: GridView(
-                  padding: EdgeInsets.zero,
-                  shrinkWrap: true,
-                  physics: NeverScrollableScrollPhysics(),
-                  gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                    crossAxisCount: 2,
-                    crossAxisSpacing: 16.h, 
-                    mainAxisSpacing: 16.w,
-                    childAspectRatio: isFoldable ? 1.1 : (isTablet ? 1.3 : 0.7),
-                  ),
-                  children: [
-                    Container(
-                      decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-                        color: AppColors.whiteColor,
-                        borderRadius: 24.r,
-                      ),
-                      child: Column(
-                        children: [
-                          Utils.buildImgWithAssets(icon: "assets/images/png/smartwatches/apple-watch-5.jpg", width: 136.h, height: 136.h).paddingSymmetrical(24.w, 8.h),
-                          "Apple Watch".needTranslation.toText16(isBold: true),
-                          CustomButton(
-                            text: LocaleKeys.selectSmartWatch.tr(context: context),
-                            onPressed: () {
-                              context
-                                  .read<HealthProvider>()
-                                  .setSelectedWatchType(SmartWatchTypes.apple, "assets/images/png/smartwatches/apple-watch-5.jpg");
-                              getIt.get<NavigationService>().pushPage(
-                                      page: SmartwatchInstructionsPage(
-                                    smartwatchDetails: SmartwatchDetails(
-                                        SmartWatchTypes.apple,
+          child: SingleChildScrollView(
+            child: Column(
+              children: [
+                Padding(
+                  padding:
+                      EdgeInsets.symmetric(horizontal: 24.w, vertical: 24.h),
+                  child: GridView(
+                    padding: EdgeInsets.zero,
+                    shrinkWrap: true,
+                    physics: NeverScrollableScrollPhysics(),
+                    gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                      crossAxisCount: 2,
+                      crossAxisSpacing: 16.h,
+                      mainAxisSpacing: 16.w,
+                      childAspectRatio:
+                          isFoldable ? 1.1 : (isTablet ? 1.3 : 0.7),
+                    ),
+                    children: [
+                      Container(
+                        decoration:
+                            RoundedRectangleBorder().toSmoothCornerDecoration(
+                          color: AppColors.whiteColor,
+                          borderRadius: 24.r,
+                        ),
+                        child: Column(
+                          children: [
+                            Utils.buildImgWithAssets(
+                                    icon:
                                         "assets/images/png/smartwatches/apple-watch-5.jpg",
-                                        AppAssets.bluetooth,
-                                        LocaleKeys.applehealthapplicationshouldbeinstalledinyourphone.tr(context: context),
-                                        LocaleKeys.unabletodetectapplicationinstalledpleasecomebackonceinstalled.tr(context: context),
-                                        LocaleKeys.applewatchshouldbeconnected.tr(context: context)),
-                                  ));
-                            },
-                            backgroundColor: AppColors.primaryRedColor.withAlpha(40),
-                            borderColor: AppColors.primaryRedColor.withAlpha(0),
-                            textColor: AppColors.primaryRedColor,
-                            fontSize: 14.f,
-                            isBold: true,
-                            borderRadius: 12.r,
-                            height: 40.h,
-                          ).paddingSymmetrical(16.w, 12.h),
-                        ],
+                                    width: 136.h,
+                                    height: 136.h)
+                                .paddingSymmetrical(24.w, 8.h),
+                            "applewatch"
+                                .tr()
+                                .needTranslation
+                                .toText16(isBold: true),
+                            CustomButton(
+                              text: LocaleKeys.selectSmartWatch
+                                  .tr(context: context),
+                              onPressed: () {
+                                context.read<HealthProvider>().setSelectedWatchType(
+                                    SmartWatchTypes.apple,
+                                    "assets/images/png/smartwatches/apple-watch-5.jpg");
+                                getIt.get<NavigationService>().pushPage(
+                                        page: SmartwatchInstructionsPage(
+                                      smartwatchDetails: SmartwatchDetails(
+                                          SmartWatchTypes.apple,
+                                          "assets/images/png/smartwatches/apple-watch-5.jpg",
+                                          AppAssets.bluetooth,
+                                          LocaleKeys
+                                              .applehealthapplicationshouldbeinstalledinyourphone
+                                              .tr(context: context),
+                                          LocaleKeys
+                                              .unabletodetectapplicationinstalledpleasecomebackonceinstalled
+                                              .tr(context: context),
+                                          LocaleKeys.applewatchshouldbeconnected
+                                              .tr(context: context)),
+                                    ));
+                              },
+                              backgroundColor:
+                                  AppColors.primaryRedColor.withAlpha(40),
+                              borderColor:
+                                  AppColors.primaryRedColor.withAlpha(0),
+                              textColor: AppColors.primaryRedColor,
+                              fontSize: 14.f,
+                              isBold: true,
+                              borderRadius: 12.r,
+                              height: 40.h,
+                            ).paddingSymmetrical(16.w, 12.h),
+                          ],
+                        ),
                       ),
-                    ),
-                    Container(
-                      decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.r),
-                      child: Column(
-                        children: [
-                          Utils.buildImgWithAssets(icon: "assets/images/png/smartwatches/galaxy_watch_8_classic.jpeg", fit: BoxFit.contain, width: 136.w, height: 136.h)
-                              .paddingSymmetrical(24.w, 8.h),
-                          "Samsung Watch".needTranslation.toText16(isBold: true),
-                          CustomButton(
-                            text: LocaleKeys.selectSmartWatch.tr(context: context),
-                            onPressed: () {
-                              context
-                                  .read<HealthProvider>()
-                                  .setSelectedWatchType(SmartWatchTypes.samsung, "assets/images/png/smartwatches/galaxy_watch_8_classic.jpeg");
-                              getIt.get<NavigationService>().pushPage(
-                                      page: SmartwatchInstructionsPage(
-                                    smartwatchDetails: SmartwatchDetails(
-                                        SmartWatchTypes.samsung,
+                      Container(
+                        decoration: RoundedRectangleBorder()
+                            .toSmoothCornerDecoration(
+                                color: AppColors.whiteColor,
+                                borderRadius: 24.r),
+                        child: Column(
+                          children: [
+                            Utils.buildImgWithAssets(
+                                    icon:
                                         "assets/images/png/smartwatches/galaxy_watch_8_classic.jpeg",
-                                        AppAssets.bluetooth,
-                                        LocaleKeys.samsunghealthapplicationshouldbeinstalledinyourphone.tr(context: context),
-                                        LocaleKeys.unabletodetectapplicationinstalledpleasecomebackonceinstalled.tr(context: context),
-                                        LocaleKeys.samsungwatchshouldbeconnected.tr(context: context)),
-                                  ));
-                            },
-                            backgroundColor: AppColors.primaryRedColor.withAlpha(40),
-                            borderColor: AppColors.primaryRedColor.withAlpha(0),
-                            textColor: AppColors.primaryRedColor,
-                            fontSize: 14.f,
-                            isBold: true,
-                            borderRadius: 12.r,
-                            height: 40.h,
-                          ).paddingSymmetrical(16.w, 12.h),
-                        ],
+                                    fit: BoxFit.contain,
+                                    width: 136.w,
+                                    height: 136.h)
+                                .paddingSymmetrical(24.w, 8.h),
+                            "samsungwatch"
+                                .tr()
+                                .needTranslation
+                                .toText16(isBold: true),
+                            CustomButton(
+                              text: LocaleKeys.selectSmartWatch
+                                  .tr(context: context),
+                              onPressed: () {
+                                context.read<HealthProvider>().setSelectedWatchType(
+                                    SmartWatchTypes.samsung,
+                                    "assets/images/png/smartwatches/galaxy_watch_8_classic.jpeg");
+                                getIt.get<NavigationService>().pushPage(
+                                        page: SmartwatchInstructionsPage(
+                                      smartwatchDetails: SmartwatchDetails(
+                                          SmartWatchTypes.samsung,
+                                          "assets/images/png/smartwatches/galaxy_watch_8_classic.jpeg",
+                                          AppAssets.bluetooth,
+                                          LocaleKeys
+                                              .samsunghealthapplicationshouldbeinstalledinyourphone
+                                              .tr(context: context),
+                                          LocaleKeys
+                                              .unabletodetectapplicationinstalledpleasecomebackonceinstalled
+                                              .tr(context: context),
+                                          LocaleKeys
+                                              .samsungwatchshouldbeconnected
+                                              .tr(context: context)),
+                                    ));
+                              },
+                              backgroundColor:
+                                  AppColors.primaryRedColor.withAlpha(40),
+                              borderColor:
+                                  AppColors.primaryRedColor.withAlpha(0),
+                              textColor: AppColors.primaryRedColor,
+                              fontSize: 14.f,
+                              isBold: true,
+                              borderRadius: 12.r,
+                              height: 40.h,
+                            ).paddingSymmetrical(16.w, 12.h),
+                          ],
+                        ),
                       ),
-                    ),
-                    Container(
-                      decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-                        color: AppColors.whiteColor,
-                        borderRadius: 24.r,
+                      Container(
+                        decoration:
+                            RoundedRectangleBorder().toSmoothCornerDecoration(
+                          color: AppColors.whiteColor,
+                          borderRadius: 24.r,
+                        ),
+                        child: Column(
+                          children: [
+                            Utils.buildImgWithAssets(
+                                    icon:
+                                        "assets/images/png/smartwatches/Huawei_Watch.png",
+                                    width: 136.w,
+                                    height: 136.h)
+                                .paddingSymmetrical(24.w, 8.h),
+                            "huaweiwatch"
+                                .tr()
+                                .needTranslation
+                                .toText16(isBold: true),
+                            CustomButton(
+                              text: LocaleKeys.selectSmartWatch
+                                  .tr(context: context),
+                              onPressed: () {
+                                // context.read<HealthProvider>().setSelectedWatchType(SmartWatchTypes.huawei, "assets/images/png/smartwatches/Huawei_Watch.png");
+                                // getIt.get<NavigationService>().pushPage(page: SmartwatchInstructionsPage(
+                                //   smartwatchDetails: SmartwatchDetails(SmartWatchTypes.huawei,
+                                //       "assets/images/png/smartwatches/Huawei_Watch.png",
+                                //       AppAssets.bluetooth,
+                                //       LocaleKeys.huaweihealthapplicationshouldbeinstalledinyourphone.tr(context: context),
+                                //       LocaleKeys.unabletodetectapplicationinstalledpleasecomebackonceinstalled.tr(context: context),
+                                //       LocaleKeys.huaweiwatchshouldbeconnected.tr(context: context)),
+                                // ));
+                                showUnavailableDialog(context);
+                              },
+                              backgroundColor:
+                                  AppColors.primaryRedColor.withAlpha(40),
+                              borderColor:
+                                  AppColors.primaryRedColor.withAlpha(0),
+                              textColor: AppColors.primaryRedColor,
+                              fontSize: 14.f,
+                              isBold: true,
+                              borderRadius: 12.r,
+                              height: 40.h,
+                            ).paddingSymmetrical(16.w, 12.h),
+                          ],
+                        ),
                       ),
-                      child: Column(
-                        children: [
-                          Utils.buildImgWithAssets(icon: "assets/images/png/smartwatches/Huawei_Watch.png", width: 136.w, height: 136.h).paddingSymmetrical(24.w, 8.h),
-                          "Huawei Watch".needTranslation.toText16(isBold: true),
-                          CustomButton(
-                            text: LocaleKeys.selectSmartWatch.tr(context: context),
-                            onPressed: () {
-                              // context.read<HealthProvider>().setSelectedWatchType(SmartWatchTypes.huawei, "assets/images/png/smartwatches/Huawei_Watch.png");
-                              // getIt.get<NavigationService>().pushPage(page: SmartwatchInstructionsPage(
-                              //   smartwatchDetails: SmartwatchDetails(SmartWatchTypes.huawei,
-                              //       "assets/images/png/smartwatches/Huawei_Watch.png",
-                              //       AppAssets.bluetooth,
-                              //       LocaleKeys.huaweihealthapplicationshouldbeinstalledinyourphone.tr(context: context),
-                              //       LocaleKeys.unabletodetectapplicationinstalledpleasecomebackonceinstalled.tr(context: context),
-                              //       LocaleKeys.huaweiwatchshouldbeconnected.tr(context: context)),
-                              // ));
-                              showUnavailableDialog(context);
-                            },
-                            backgroundColor: AppColors.primaryRedColor.withAlpha(40),
-                            borderColor: AppColors.primaryRedColor.withAlpha(0),
-                            textColor: AppColors.primaryRedColor,
-                            fontSize: 14.f,
-                            isBold: true,
-                            borderRadius: 12.r,
-                            height: 40.h,
-                          ).paddingSymmetrical(16.w, 12.h),
-                        ],
+                      Container(
+                        decoration:
+                            RoundedRectangleBorder().toSmoothCornerDecoration(
+                          color: AppColors.whiteColor,
+                          borderRadius: 24.r,
+                        ),
+                        child: Column(
+                          children: [
+                            Utils.buildImgWithAssets(
+                                    icon:
+                                        "assets/images/png/smartwatches/Whoop_Watch.png",
+                                    width: 136.w,
+                                    height: 136.h)
+                                .paddingSymmetrical(24.w, 8.h),
+                            "whoopwatch"
+                                .tr()
+                                .needTranslation
+                                .toText16(isBold: true),
+                            CustomButton(
+                              text: LocaleKeys.selectSmartWatch
+                                  .tr(context: context),
+                              onPressed: () {
+                                showUnavailableDialog(context);
+                                // context.read<HealthProvider>().setSelectedWatchType(SmartWatchTypes.whoop, "assets/images/png/smartwatches/Whoop_Watch.png");
+                                // getIt.get<NavigationService>().pushPage(page: SmartwatchInstructionsPage(
+                                //   smartwatchDetails: SmartwatchDetails(SmartWatchTypes.whoop,
+                                //       "assets/images/png/smartwatches/Whoop_Watch.png",
+                                //       AppAssets.bluetooth,
+                                //       LocaleKeys.whoophealthapplicationshouldbeinstalledinyourphone.tr(context: context),
+                                //       LocaleKeys.unabletodetectapplicationinstalledpleasecomebackonceinstalled.tr(context: context),
+                                //       LocaleKeys.whoopwatchshouldbeconnected.tr(context: context)),
+                                // ));
+                              },
+                              backgroundColor:
+                                  AppColors.primaryRedColor.withAlpha(40),
+                              borderColor:
+                                  AppColors.primaryRedColor.withAlpha(0),
+                              textColor: AppColors.primaryRedColor,
+                              fontSize: 14.f,
+                              isBold: true,
+                              borderRadius: 12.r,
+                              height: 40.h,
+                            ).paddingSymmetrical(16.w, 12.h),
+                          ],
+                        ),
                       ),
-                    ),
-                    Container(
-                      decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-                        color: AppColors.whiteColor,
-                        borderRadius: 24.r,
-                      ),
-                      child: Column(
-                        children: [
-                          Utils.buildImgWithAssets(icon: "assets/images/png/smartwatches/Whoop_Watch.png", width: 136.w, height: 136.h).paddingSymmetrical(24.w, 8.h),
-                          "Whoop Watch".needTranslation.toText16(isBold: true),
-                          CustomButton(
-                            text: LocaleKeys.selectSmartWatch.tr(context: context),
-                            onPressed: () {
-                              showUnavailableDialog(context);
-                              // context.read<HealthProvider>().setSelectedWatchType(SmartWatchTypes.whoop, "assets/images/png/smartwatches/Whoop_Watch.png");
-                              // getIt.get<NavigationService>().pushPage(page: SmartwatchInstructionsPage(
-                              //   smartwatchDetails: SmartwatchDetails(SmartWatchTypes.whoop,
-                              //       "assets/images/png/smartwatches/Whoop_Watch.png",
-                              //       AppAssets.bluetooth,
-                              //       LocaleKeys.whoophealthapplicationshouldbeinstalledinyourphone.tr(context: context),
-                              //       LocaleKeys.unabletodetectapplicationinstalledpleasecomebackonceinstalled.tr(context: context),
-                              //       LocaleKeys.whoopwatchshouldbeconnected.tr(context: context)),
-                              // ));
-                            },
-                            backgroundColor: AppColors.primaryRedColor.withAlpha(40),
-                            borderColor: AppColors.primaryRedColor.withAlpha(0),
-                            textColor: AppColors.primaryRedColor,
-                            fontSize: 14.f,
-                            isBold: true,
-                            borderRadius: 12.r,
-                            height: 40.h,
-                          ).paddingSymmetrical(16.w, 12.h),
-                        ],
-                      ),
-                    ),
-                  ],
+                    ],
+                  ),
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
         ),
-      ),
-    );
+      );
+    });
   }
 
   void showUnavailableDialog(BuildContext context) {
@@ -229,7 +295,8 @@ class SmartwatchHomePage extends StatelessWidget {
       title: LocaleKeys.notice.tr(context: context),
       context,
       child: Utils.getWarningWidget(
-          loadingText: LocaleKeys.featureComingSoonDescription.tr(context: context),
+          loadingText:
+              LocaleKeys.featureComingSoonDescription.tr(context: context),
           isShowActionButtons: false,
           showOkButton: true,
           onConfirmTap: () async {
diff --git a/lib/presentation/smartwatches/smartwatch_instructions_page.dart b/lib/presentation/smartwatches/smartwatch_instructions_page.dart
index 7c0d0b97..fcef1d15 100644
--- a/lib/presentation/smartwatches/smartwatch_instructions_page.dart
+++ b/lib/presentation/smartwatches/smartwatch_instructions_page.dart
@@ -21,65 +21,76 @@ class SmartwatchInstructionsPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: AppColors.bgScaffoldColor,
-      body: CollapsingListView(
-        title: "How does it work".needTranslation,
-        bottomChild: Container(
-          decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-            color: AppColors.whiteColor,
-            borderRadius: 24.r,
-          ),
-          child: CustomButton(
-            text: LocaleKeys.getStarted.tr(context: context),
-            onPressed: () {
-              context.read<HealthProvider>().initDevice();
-            },
-            backgroundColor: AppColors.primaryRedColor,
-            borderColor: AppColors.primaryRedColor,
-            textColor: AppColors.whiteColor,
-            fontSize: 16.f,
-            isBold: true,
-            borderRadius: 12.r,
-            height: 50.h,
-          ).paddingSymmetrical(24.w, 30.h),
-        ),
-        child: Column(
-          mainAxisSize: MainAxisSize.max,
-          spacing: 18.h,
-          children: [
-            Utils.buildImgWithAssets(
-              icon: smartwatchDetails.watchIcon,
-              fit: BoxFit.contain,
-              height: 280.h,
-              width: 280.w,
+    return Consumer<HealthProvider>(builder: (context, healthProvider, child) {
+      final errorMessage = healthProvider.error;
+      if (errorMessage != null && errorMessage.isNotEmpty) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          Utils.showToast(errorMessage, longDuration: false);
+          healthProvider.clearError();
+        });
+      }
+        return Scaffold(
+          backgroundColor: AppColors.bgScaffoldColor,
+          body: CollapsingListView(
+            title: "smartwatchHowItWorks".tr(context: context),
+            bottomChild: Container(
+              decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+                color: AppColors.whiteColor,
+                borderRadius: 24.r,
+              ),
+              child: CustomButton(
+                text: LocaleKeys.getStarted.tr(context: context),
+                onPressed: () {
+                  context.read<HealthProvider>().initDevice();
+                },
+                backgroundColor: AppColors.primaryRedColor,
+                borderColor: AppColors.primaryRedColor,
+                textColor: AppColors.whiteColor,
+                fontSize: 16.f,
+                isBold: true,
+                borderRadius: 12.r,
+                height: 50.h,
+              ).paddingSymmetrical(24.w, 30.h),
             ),
-            DecoratedBox(
-              decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 12.h),
-              child: Column(
-                children: [
-                  watchContentDetails(
-                    title: smartwatchDetails.detailsTitle,
-                    description: smartwatchDetails.details,
-                    icon: smartwatchDetails.smallIcon,
-                    descriptionTextColor: AppColors.primaryRedColor,
-                  ),
-                  Divider(
-                    color: AppColors.dividerColor,
-                    thickness: 1.h,
-                  ).paddingOnly(top: 16.h, bottom: 16.h),
-                  watchContentDetails(
-                    title: smartwatchDetails.secondTitle,
-                    description: LocaleKeys.updatetheinformation.tr(),
-                    icon: AppAssets.bluetooth,
-                    descriptionTextColor: AppColors.greyTextColor,
-                  ),
-                ],
-              ).paddingSymmetrical(16.w, 16.h),
-            )
-          ],
-        ).paddingSymmetrical(24.w, 16.h),
-      ),
+            child: Column(
+              mainAxisSize: MainAxisSize.max,
+              spacing: 18.h,
+              children: [
+                Utils.buildImgWithAssets(
+                  icon: smartwatchDetails.watchIcon,
+                  fit: BoxFit.contain,
+                  height: 280.h,
+                  width: 280.w,
+                ),
+                DecoratedBox(
+                  decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 12.h),
+                  child: Column(
+                    children: [
+                      watchContentDetails(
+                        title: smartwatchDetails.detailsTitle,
+                    // description: smartwatchDetails.details,
+                    description: "",
+                        icon: smartwatchDetails.smallIcon,
+                        descriptionTextColor: AppColors.primaryRedColor,
+                      ),
+                      Divider(
+                        color: AppColors.dividerColor,
+                        thickness: 1.h,
+                      ).paddingOnly(top: 16.h, bottom: 16.h),
+                      watchContentDetails(
+                        title: smartwatchDetails.secondTitle,
+                        description: LocaleKeys.updatetheinformation.tr(),
+                        icon: AppAssets.bluetooth,
+                        descriptionTextColor: AppColors.greyTextColor,
+                      ),
+                    ],
+                  ).paddingSymmetrical(16.w, 16.h),
+                )
+              ],
+            ).paddingSymmetrical(24.w, 16.h),
+          ),
+        );
+      }
     );
   }
 
diff --git a/lib/presentation/symptoms_checker/organ_selector_screen.dart b/lib/presentation/symptoms_checker/organ_selector_screen.dart
index 438d9728..5b5d8f2e 100644
--- a/lib/presentation/symptoms_checker/organ_selector_screen.dart
+++ b/lib/presentation/symptoms_checker/organ_selector_screen.dart
@@ -480,7 +480,7 @@ class _OrganSelectorPageState extends State<OrganSelectorPage> with SingleTicker
                 backgroundColor: AppColors.secondaryLightRedColor,
                 textColor: AppColors.primaryRedColor,
                 deleteIcon: AppAssets.cancel,
-                deleteIconColor: AppColors.primaryRedColor,
+                deleteIconColor: AppColors.criticalActionColor,
                 deleteIconHasColor: false,
                 onDeleteTap: () {
                   viewModel.removeOrgan(organ.id);
@@ -500,6 +500,7 @@ class _OrganSelectorPageState extends State<OrganSelectorPage> with SingleTicker
         isDisabled: viewModel.selectedOrgans.isEmpty,
         backgroundColor: AppColors.primaryRedColor,
         textColor: AppColors.whiteColor,
+        borderColor: Colors.transparent,
       ),
     );
   }
diff --git a/lib/presentation/symptoms_checker/widgets/selected_organs_section.dart b/lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
index e2b342b6..a4f5f1ee 100644
--- a/lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
+++ b/lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
@@ -121,7 +121,7 @@ class _SelectedOrgansSectionState extends State<SelectedOrgansSection> {
                     backgroundColor: AppColors.secondaryLightRedColor,
                     textColor: AppColors.primaryRedColor,
                     deleteIcon: AppAssets.cross_circle,
-                    deleteIconColor: AppColors.primaryRedColor,
+                    deleteIconColor: AppColors.criticalActionColor,
                     deleteIconHasColor: true,
                     onDeleteTap: () => widget.onRemoveOrgan(organ.id),
                     padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 8.h),
diff --git a/lib/presentation/symptoms_checker/widgets/triage_level_card.dart b/lib/presentation/symptoms_checker/widgets/triage_level_card.dart
index 19ad3935..8633d830 100644
--- a/lib/presentation/symptoms_checker/widgets/triage_level_card.dart
+++ b/lib/presentation/symptoms_checker/widgets/triage_level_card.dart
@@ -94,7 +94,7 @@ class _TriageLevelCardState extends State<TriageLevelCard> with SingleTickerProv
     switch (triageLevel) {
       case 'emergency_ambulance':
       case 'emergency':
-        return AppColors.chipColorEmergency.withValues(alpha: 0.1);
+        return AppColors.primaryRedColor.withValues(alpha: 0.1);
       case 'consultation_24':
       case 'consultation':
         return AppColors.chipColorSeekMedicalAdvice.withValues(alpha: 0.1);
diff --git a/lib/presentation/todo_section/ancillary_order_payment_page.dart b/lib/presentation/todo_section/ancillary_order_payment_page.dart
index 365dff2b..e6665037 100644
--- a/lib/presentation/todo_section/ancillary_order_payment_page.dart
+++ b/lib/presentation/todo_section/ancillary_order_payment_page.dart
@@ -819,6 +819,7 @@ class _AncillaryOrderPaymentPageState extends State<AncillaryOrderPaymentPage> {
         applePayShaRequestPhrase: payfortViewModel.payfortProjectDetailsRespModel!.shaRequest,
         currency: appState.getAuthenticatedUser()!.outSa! == 0 ? "SAR" : "AED",
         onFailed: (failureResult) async {
+          payfortViewModel.addApplePayPayfortResponse(failureResult.response);
           log("failureResult: ${failureResult.message.toString()}");
           LoaderBottomSheet.hideLoader();
           showCommonBottomSheetWithoutHeight(
@@ -830,6 +831,7 @@ class _AncillaryOrderPaymentPageState extends State<AncillaryOrderPaymentPage> {
           );
         },
         onSucceeded: (successResult) async {
+          payfortViewModel.addApplePayPayfortResponse(successResult);
           LoaderBottomSheet.hideLoader();
           log("successResult: ${successResult.responseMessage.toString()}");
           selectedPaymentMethod = successResult.paymentOption ?? "VISA";
diff --git a/lib/presentation/todo_section/widgets/ancillary_orders_list.dart b/lib/presentation/todo_section/widgets/ancillary_orders_list.dart
index cc5bbbb6..da75dd7b 100644
--- a/lib/presentation/todo_section/widgets/ancillary_orders_list.dart
+++ b/lib/presentation/todo_section/widgets/ancillary_orders_list.dart
@@ -257,9 +257,9 @@ class AncillaryOrderCard extends StatelessWidget {
                         onViewDetails!();
                       }
                     },
-                    backgroundColor: Color(0xffFEE9EA),
-                    borderColor: Color(0xffFEE9EA),
-                    textColor: Color(0xffED1C2B),
+                    backgroundColor: AppColors.secondaryLightRedColor,
+                    borderColor: AppColors.secondaryLightRedColor,
+                    textColor: AppColors.primaryRedColor,
                     fontSize: (isFoldable || isTablet) ? 12.f : 14.f,
                     fontWeight: FontWeight.w600,
                     borderRadius: 10.r,
diff --git a/lib/presentation/todo_section/widgets/ancillary_procedures_list.dart b/lib/presentation/todo_section/widgets/ancillary_procedures_list.dart
index 54c92789..b7f0f28a 100644
--- a/lib/presentation/todo_section/widgets/ancillary_procedures_list.dart
+++ b/lib/presentation/todo_section/widgets/ancillary_procedures_list.dart
@@ -252,9 +252,9 @@ class AncillaryOrderCard extends StatelessWidget {
                         onViewDetails!();
                       }
                     },
-                    backgroundColor: Color(0xffFEE9EA),
-                    borderColor: Color(0xffFEE9EA),
-                    textColor: Color(0xffED1C2B),
+                    backgroundColor: AppColors.secondaryLightRedColor,
+                    borderColor: AppColors.secondaryLightRedColor,
+                    textColor: AppColors.primaryRedColor,
                     fontSize: 14.f,
                     isBold: true,
                     borderRadius: 10.r,
diff --git a/lib/presentation/water_monitor/widgets/cup_bottomsheet_widgets.dart b/lib/presentation/water_monitor/widgets/cup_bottomsheet_widgets.dart
index 058f14e8..aef892f9 100644
--- a/lib/presentation/water_monitor/widgets/cup_bottomsheet_widgets.dart
+++ b/lib/presentation/water_monitor/widgets/cup_bottomsheet_widgets.dart
@@ -91,7 +91,7 @@ class SwitchCupBottomSheet extends StatelessWidget {
                 width: 60.w,
                 height: 60.w,
                 decoration: BoxDecoration(
-                  color: isSelected ? AppColors.primaryRedColor.withOpacity(0.08) : Colors.transparent,
+                  color: isSelected ? AppColors.secondaryLightRedColor : Colors.transparent,
                   borderRadius: BorderRadius.circular(12.r),
                   border: Border.all(
                     color: isSelected ? AppColors.primaryRedColor : AppColors.bgScaffoldColor,
@@ -271,9 +271,9 @@ class _CustomizeCupBottomSheetState extends State<CustomizeCupBottomSheet> {
                   SliderTheme(
                     data: SliderTheme.of(context).copyWith(
                       activeTrackColor: AppColors.primaryRedColor,
-                      inactiveTrackColor: AppColors.primaryRedColor.withOpacity(0.2),
+                      inactiveTrackColor: AppColors.secondaryLightRedColor,
                       thumbColor: AppColors.primaryRedColor,
-                      overlayColor: AppColors.primaryRedColor.withOpacity(0.2),
+                      overlayColor: AppColors.secondaryLightRedColor,
                       trackHeight: 4.h,
                       thumbShape: RoundSliderThumbShape(enabledThumbRadius: 10.w),
                     ),
diff --git a/lib/presentation/weather/weather_details_page.dart b/lib/presentation/weather/weather_details_page.dart
index 8762a55a..50dbefa3 100644
--- a/lib/presentation/weather/weather_details_page.dart
+++ b/lib/presentation/weather/weather_details_page.dart
@@ -62,7 +62,7 @@ class _WeatherDetailsPageState extends State<WeatherDetailsPage> {
       case ColorName.ORANGE:
         return AppColors.warningLightColor.withValues(alpha: 0.1);
       case ColorName.RED:
-        return AppColors.errorLightColor.withValues(alpha: 0.1);
+        return AppColors.primaryRedColor.withValues(alpha: 0.1);
     }
   }
 
@@ -120,7 +120,7 @@ class _WeatherDetailsPageState extends State<WeatherDetailsPage> {
     }
     // Red: Very High, At High Risk
     else if (category.contains('very high') || category.contains('at high risk')) {
-      return AppColors.errorLightColor.withValues(alpha: 0.1);
+      return AppColors.primaryRedColor.withValues(alpha: 0.1);
     }
     // Orange: Risk, High (but not "very high" or "at high risk")
     else if (category.contains('risk') || category.contains('high')) {
diff --git a/lib/services/localauth_service.dart b/lib/services/localauth_service.dart
index 2875a7fe..cdce9005 100644
--- a/lib/services/localauth_service.dart
+++ b/lib/services/localauth_service.dart
@@ -17,10 +17,12 @@ class LocalAuthService {
 
       final isAuthenticated = await localAuth.authenticate(
         localizedReason: 'Please authenticate to proceed',
-        options: const AuthenticationOptions(
-          biometricOnly: true,
-          stickyAuth: true,
-        ),
+        persistAcrossBackgrounding: false, // Replaces stickyAuth
+        biometricOnly: true,
+        // options: const AuthenticationOptions(
+        //   biometricOnly: true,
+        //   stickyAuth: true,
+        // ),
       );
 
       return isAuthenticated;
diff --git a/lib/services/logger_service.dart b/lib/services/logger_service.dart
index 617539aa..d113f06d 100644
--- a/lib/services/logger_service.dart
+++ b/lib/services/logger_service.dart
@@ -1,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:logger/logger.dart';
 
 abstract class LoggerService {
@@ -18,6 +20,6 @@ class LoggerServiceImp implements LoggerService {
 
   @override
   void logInfo(String message) {
-    logger.d(message);
+    log(message);
   }
 }
diff --git a/lib/services/remote_config_service.dart b/lib/services/remote_config_service.dart
new file mode 100644
index 00000000..d39a7fbe
--- /dev/null
+++ b/lib/services/remote_config_service.dart
@@ -0,0 +1,88 @@
+import 'dart:convert';
+
+import 'package:firebase_remote_config/firebase_remote_config.dart';
+import 'package:flutter/foundation.dart' show kDebugMode;
+import 'package:flutter/services.dart' show rootBundle;
+import 'package:hmg_patient_app_new/services/logger_service.dart';
+
+/// Firebase Remote Config wrapper. Fully generic — the app never hardcodes
+/// occasion-specific values here; it only knows about the `occasion_config`
+/// remote key and reads whatever JSON is published on the Firebase console.
+abstract class RemoteConfigService {
+  /// Must be called once at startup, before the first frame if possible.
+  Future<void> initialize();
+
+  /// Fetches the latest values from Firebase (respecting the configured
+  /// minimum fetch interval) and activates them.
+  Future<bool> fetchAndActivate();
+
+  /// Raw JSON array string currently held for the `occasion_config` key —
+  /// a list of scheduled occasions (bundled default `[]` until the first
+  /// successful fetch/activate).
+  String get occasionConfigRawJson;
+}
+
+class RemoteConfigServiceImp implements RemoteConfigService {
+  static const String occasionConfigKey = 'occasion_config';
+  static const String _defaultConfigAssetPath = 'assets/json/default_occasion_config.json';
+
+  final LoggerService loggerService;
+  final FirebaseRemoteConfig _remoteConfig;
+
+  RemoteConfigServiceImp({
+    required this.loggerService,
+    FirebaseRemoteConfig? remoteConfig,
+  }) : _remoteConfig = remoteConfig ?? FirebaseRemoteConfig.instance;
+
+  @override
+  Future<void> initialize() async {
+    try {
+      await _remoteConfig.setConfigSettings(
+        RemoteConfigSettings(
+          fetchTimeout: const Duration(seconds: 10),
+          // In debug builds, always fetch fresh values so you can test
+          // Remote Config changes instantly without waiting/throttling.
+          // Release/profile builds keep a 1-hour minimum interval —
+          // balances timely occasion-theme rollout against not hammering
+          // Remote Config across the whole user base.
+          minimumFetchInterval: kDebugMode ? Duration.zero : const Duration(hours: 1),
+        ),
+      );
+
+      // Bundled fallback so behaviour is deterministic (and identical to the
+      // current app look) before the very first successful remote fetch.
+      final defaultJson = await rootBundle.loadString(_defaultConfigAssetPath);
+      await _remoteConfig.setDefaults(<String, dynamic>{occasionConfigKey: defaultJson});
+    } catch (ex) {
+      loggerService.logError('RemoteConfigService.initialize error: $ex');
+    }
+  }
+
+  @override
+  Future<bool> fetchAndActivate() async {
+    try {
+      return await _remoteConfig.fetchAndActivate();
+    } catch (ex) {
+      loggerService.logError('RemoteConfigService.fetchAndActivate error: $ex');
+      return false;
+    }
+  }
+
+  @override
+  String get occasionConfigRawJson {
+    try {
+      final value = _remoteConfig.getString(occasionConfigKey);
+      if (value.isEmpty) return _fallbackDisabledJson;
+      // Validate JSON shape early; if malformed, fall back safely.
+      json.decode(value);
+      return value;
+    } catch (ex) {
+      loggerService.logError('RemoteConfigService.occasionConfigRawJson parse error: $ex');
+      return _fallbackDisabledJson;
+    }
+  }
+
+  /// Empty schedule — [OccasionConfigModel.resolveActive] treats this the
+  /// same as "no occasion currently active".
+  static const String _fallbackDisabledJson = '[]';
+}
diff --git a/lib/services/security_service.dart b/lib/services/security_service.dart
index b72dffeb..2af9c45a 100644
--- a/lib/services/security_service.dart
+++ b/lib/services/security_service.dart
@@ -82,7 +82,7 @@ class SecurityServiceImpl implements SecurityService {
         onObfuscationIssues: () => _handleThreat('Obfuscation Issues', ThreatSeverity.warning),
         onDebug: () => _handleThreat('Debug Mode', ThreatSeverity.critical),
         onDeviceBinding: () => _handleThreat('Device Binding', ThreatSeverity.critical),
-        onDeviceID: () => _handleThreat('Device ID Mismatch', ThreatSeverity.critical),
+        onDeviceID: () => _handleThreat('Device ID Mismatch', ThreatSeverity.warning),
         onHooks: () => _handleThreat('Hooks Detected', ThreatSeverity.critical),
         onPasscode: () => _handleThreat('Passcode Not Set', ThreatSeverity.warning),
         onPrivilegedAccess: () => _handleThreat('Privileged Access (Root/Jailbreak)', ThreatSeverity.critical),
diff --git a/lib/splashPage.dart b/lib/splashPage.dart
index cf407d41..b1d03c80 100644
--- a/lib/splashPage.dart
+++ b/lib/splashPage.dart
@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_callkit_incoming/entities/call_event.dart';
 import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
 import 'package:get_it/get_it.dart';
+import 'package:hmg_patient_app_new/app_closed_page.dart';
 import 'package:hmg_patient_app_new/core/api/api_client.dart';
 import 'package:hmg_patient_app_new/core/api_consts.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
@@ -29,6 +30,7 @@ import 'package:hmg_patient_app_new/services/notification_service.dart';
 import 'package:hmg_patient_app_new/services/zoom_service.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/unsafe_device.dart';
+import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart';
 import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart';
 import 'package:lottie/lottie.dart';
 import 'package:safe_device/safe_device.dart';
@@ -121,24 +123,24 @@ class _SplashScreenState extends State<SplashPage> {
     // Set initial app context tags
     try {
       final appState = getIt.get<AppState>();
-      
+
       // Set device and app metadata
       Clarity.setCustomTag('app_version', ApiConsts.appVersionID.toString());
       Clarity.setCustomTag('device_type', appState.deviceTypeID ?? 'unknown');
       Clarity.setCustomTag('platform', Platform.isIOS ? 'ios' : 'android');
-      
+
       // Set user context if authenticated
       if (appState.isAuthenticated) {
         final user = appState.getAuthenticatedUser();
         if (user != null) {
           // Set user ID for session tracking
           Clarity.setCustomUserId(user.patientId.toString());
-          
+
           // Set custom tags for filtering sessions
           Clarity.setCustomTag('user_type', user.patientType?.toString() ?? 'unknown');
           Clarity.setCustomTag('user_segment', user.outSa == 0 ? 'in_sa' : 'out_sa');
           Clarity.setCustomTag('auth_status', 'authenticated');
-          
+
           // Optional: Set other non-sensitive user properties
           if (user.mobileNumber != null) {
             // Mask phone number for privacy (show only last 4 digits)
@@ -149,10 +151,9 @@ class _SplashScreenState extends State<SplashPage> {
       } else {
         Clarity.setCustomTag('auth_status', 'guest');
       }
-      
+
       // Send initialization event
       Clarity.sendCustomEvent('app_initialized');
-      
     } catch (e) {
       debugPrint('Failed to set Clarity user context: $e');
     }
@@ -165,8 +166,7 @@ class _SplashScreenState extends State<SplashPage> {
     // GetIt.instance<CacheService>().remove(key: CacheConst.isAppOpenedFromCall);
     Utils.removeFromPrefs(CacheConst.isAppOpenedFromCall);
 
-    Navigator.of(GetIt.instance<NavigationService>().navigatorKey.currentContext!)
-        .pushReplacement(FadePage(page: SplashAnimationScreen(routeWidget: LandingNavigation())));
+    Navigator.of(GetIt.instance<NavigationService>().navigatorKey.currentContext!).pushReplacement(FadePage(page: SplashAnimationScreen(routeWidget: LandingNavigation())));
     Navigator.pushReplacementNamed(
       // context,
       GetIt.instance<NavigationService>().navigatorKey.currentContext!,
@@ -386,8 +386,6 @@ class _SplashScreenState extends State<SplashPage> {
   Widget build(BuildContext context) {
     return Scaffold(
         backgroundColor: AppColors.whiteColor,
-        body: Lottie.asset(AppAnimations.loadingAnimation,
-                repeat: true, reverse: false, frameRate: FrameRate(60), width: 80.h, height: 80.h, fit: BoxFit.fill)
-            .center);
+        body: Lottie.asset(AppAnimations.loadingAnimation, repeat: true, reverse: false, frameRate: FrameRate(60), width: 80.h, height: 80.h, fit: BoxFit.fill).center);
   }
 }
diff --git a/lib/theme/colors.dart b/lib/theme/colors.dart
index 1ecbcb61..3b9cbdae 100644
--- a/lib/theme/colors.dart
+++ b/lib/theme/colors.dart
@@ -5,41 +5,115 @@ class AppColors {
   /// When true, every getter below returns the dark palette value.
   static bool isDarkMode = false;
 
+  /// Global occasion-theme flag — toggled by OccasionThemeViewModel based on
+  /// Firebase Remote Config. When false (the default), the app looks exactly
+  /// like it does today — no colors are affected.
+  static bool isOccasionThemeActive = false;
+
+  /// Remotely-configured primary color for the currently active occasion
+  /// (e.g. National Day). Null unless an occasion theme is active.
+  static Color? occasionPrimaryColor;
+
+  /// Lighter/translucent (11% opacity) variant of [occasionPrimaryColor],
+  /// derived automatically by OccasionThemeViewModel. Null unless an
+  /// occasion theme is active.
+  static Color? occasionSecondaryColor;
+
   static const transparent = Colors.transparent;
 
   // ── Scaffold / Background ─────────────────────────────────────────────────
   static Color get scaffoldBgColor => isDarkMode ? dark.scaffoldBgColor : const Color(0xFFF8F8F8);
+
   static Color get bottomSheetBgColor => isDarkMode ? dark.bottomSheetBgColor : const Color(0xFFF8F8FA);
+
   static Color get lightGreyEFColor => isDarkMode ? dark.lightGreyEFColor : const Color(0xffeaeaff);
+
   static Color get greyF7Color => isDarkMode ? dark.greyF7Color : const Color(0xffF7F7F7);
+
   static Color get greyInfoTextColor => isDarkMode ? dark.greyInfoTextColor : const Color(0xff777777);
+
   static Color get lightGrayColor => isDarkMode ? dark.lightGrayColor : const Color(0xff808080);
+
   static Color get greyTextColorLight => isDarkMode ? dark.greyTextColorLight : const Color(0xFFA2A2A2);
+
   static Color get mainPurple => isDarkMode ? dark.mainPurple : const Color(0xFF7954F7);
 
   // ── Core Colors ───────────────────────────────────────────────────────────
   static Color get whiteColor => isDarkMode ? dark.whiteColor : const Color(0xFFffffff);
+
   // static const Color primaryRedColor = Color(0xFFED1C2B);
-  static Color get primaryRedColor => isDarkMode ? dark.primaryRedColor : Color(0xFFED1C2B);
-  static Color get secondaryLightRedColor => isDarkMode ? dark.secondaryLightRedColor : const Color(0xFFFEE9EA);
+  /// Occasion-aware primary brand color. Resolves to the remotely-configured
+  /// occasion color when active (e.g. National Day green), otherwise falls
+  /// back to the original dark/light red — identical to current behavior.
+  ///
+  /// NOTE: Do NOT use this getter for `.withOpacity()/.withValues()` derived
+  /// (translucent) colors — use [primaryRedColorBase] for those instead, so
+  /// occasion theming never affects translucent overlays/backgrounds.
+  static Color get primaryRedColor => (isOccasionThemeActive && occasionPrimaryColor != null) ? occasionPrimaryColor! : primaryRedColorBase;
+
+  /// The original, non-themed brand red (or its dark-mode variant). Always
+  /// stable regardless of any active occasion theme — intended for opacity
+  /// derived usages (e.g. `AppColors.primaryRedColorBase.withOpacity(0.1)`).
+  static Color get primaryRedColorBase => isDarkMode ? dark.primaryRedColor : const Color(0xFFED1C2B);
+
+  /// Semantic color for critical/negative actions (delete/deactivate account,
+  /// cancel appointment, clear/reset, emergency, etc.). Same light/dark
+  /// values as [primaryRedColorBase] — respects dark mode, but is never
+  /// affected by the active occasion/remote-config theme, so destructive
+  /// actions always read as "red" regardless of any occasion branding.
+  static Color get criticalActionColor => primaryRedColorBase;
+
+  /// Occasion-aware light/tint variant of [primaryRedColor] (e.g. chip and
+  /// badge backgrounds). Resolves to the remotely-configured occasion's
+  /// secondary color when active (e.g. National Day's light green),
+  /// otherwise falls back to the original dark/light tint — identical to
+  /// current behavior.
+  ///
+  /// NOTE: Do NOT use this getter for `.withOpacity()/.withValues()` derived
+  /// colors — use [secondaryLightRedColorBase] for those instead, so
+  /// occasion theming never affects translucent overlays/backgrounds.
+  static Color get secondaryLightRedColor => (isOccasionThemeActive && occasionSecondaryColor != null) ? occasionSecondaryColor! : secondaryLightRedColorBase;
+
+  /// The original, non-themed light-red tint (or its dark-mode variant).
+  /// Always stable regardless of any active occasion theme — intended for
+  /// opacity derived usages.
+  static Color get secondaryLightRedColorBase => isDarkMode ? dark.secondaryLightRedColor : const Color(0xFFFEE9EA);
   static const Color successColor = Color(0xFF18C273);
+
   static Color get successLightBgColor => isDarkMode ? dark.successLightBgColor : const Color(0xffDDF6EA);
+
   static Color get greyColor => isDarkMode ? dark.greyColor : const Color(0xFFEFEFF0);
+
   static Color get chipBgColor => isDarkMode ? dark.chipBgColor : const Color(0xFFEFEFF0);
+
   static Color get textColor => isDarkMode ? dark.textColor : const Color(0xFF2E3039);
+
   static Color get iconColor => isDarkMode ? dark.iconColor : const Color(0xFF2E3039);
+
   static Color get borderGrayColor => isDarkMode ? dark.borderGrayColor : const Color(0x332E3039);
+
   static Color get textColorLight => isDarkMode ? dark.textColorLight : const Color(0xFF5E5E5E);
+
   static Color get dividerColor => isDarkMode ? dark.dividerColor : const Color(0x40D2D2D2);
+
   static Color get warningColorYellow => isDarkMode ? dark.warningColorYellow : const Color(0xFFF4A308);
+
   static Color get inputLabelTextColor => isDarkMode ? dark.inputLabelTextColor : const Color(0xff898A8D);
+
   static Color get greyTextColor => isDarkMode ? dark.greyTextColor : const Color(0xFF8F9AA3);
+
   static Color get lightGrayBGColor => isDarkMode ? dark.lightGrayBGColor : const Color(0x142E3039);
+
   static Color get checkBoxBorderColor => isDarkMode ? dark.checkBoxBorderColor : const Color(0xffD2D2D2);
+
   static Color get pharmacyBGColor => isDarkMode ? dark.pharmacyBGColor : const Color(0xFF359846);
+
   static Color get lightGreenColor => isDarkMode ? dark.lightGreenColor : const Color(0xFF0ccedde);
+
   static Color get ratingColorYellow => isDarkMode ? dark.ratingColorYellow : const Color(0xFFFFAF15);
+
   static Color get spacerLineColor => isDarkMode ? dark.spacerLineColor : const Color(0x2E30391A);
+
   static Color get habibPharmacyColor => const Color(0xFF2d9137);
 
   // ── Doctor Rating Colors ──────────────────────────────────────────────────
@@ -52,92 +126,147 @@ class AppColors {
   static const Color ratingBadgeFiveStarColor = Color(0xFF5BBD8E); // Green badge for ≥4.0
   static const Color ratingPercentageTextColor = Color(0xFF4A4A4A); // Dark grey for percentage text
 
-
   // ── Semantic / Status Colors ──────────────────────────────────────────────
   static Color get errorColor => isDarkMode ? dark.errorColor : const Color(0xFFED1C2B);
+
   static Color get alertColor => isDarkMode ? dark.alertColor : const Color(0xFFD48D05);
+
   static Color get infoColor => isDarkMode ? dark.infoColor : const Color(0xFF0B85F7);
+
   static Color get warningColor => isDarkMode ? dark.warningColor : const Color(0xFFFFCC00);
+
   static Color get switchBackgroundColor => isDarkMode ? dark.switchBackgroundColor : const Color(0x2618C273);
+
   static Color get bottomNAVBorder => isDarkMode ? dark.bottomNAVBorder : const Color(0xFFEEEEEE);
+
   static Color get quickLoginColor => isDarkMode ? dark.quickLoginColor : const Color(0xFF666666);
+
   static Color get tooltipTextColor => isDarkMode ? dark.tooltipTextColor : const Color(0xFF414D55);
+
   static Color get graphGridColor => isDarkMode ? dark.graphGridColor : const Color(0x4D18C273);
+
   static Color get highAndLow => isDarkMode ? dark.highAndLow : const Color(0xFFFFAF15);
+
   static Color get labelTextColor => isDarkMode ? dark.labelTextColor : const Color(0xFF838383);
+
   static Color get calenderTextColor => isDarkMode ? dark.calenderTextColor : const Color(0xFFD0D0D0);
+
   static Color get lightGreenButtonColor => isDarkMode ? dark.lightGreenButtonColor : const Color(0x2618C273);
+
   static Color get lightRedButtonColor => isDarkMode ? dark.lightRedButtonColor : const Color(0x1AED1C2B);
 
   // ── Status Colors ─────────────────────────────────────────────────────────
   static Color get statusPendingColor => isDarkMode ? dark.statusPendingColor : const Color(0xffCC9B14);
+
   static Color get statusProcessingColor => isDarkMode ? dark.statusProcessingColor : const Color(0xff2E303A);
+
   static Color get statusCompletedColor => isDarkMode ? dark.statusCompletedColor : const Color(0xff359846);
+
   static Color get statusRejectedColor => isDarkMode ? dark.statusRejectedColor : const Color(0xffD02127);
 
   // ── Info Banner Colors ────────────────────────────────────────────────────
   static Color get infoBannerBgColor => isDarkMode ? dark.infoBannerBgColor : const Color(0xFFFFF4E6);
+
   static Color get infoBannerBorderColor => isDarkMode ? dark.infoBannerBorderColor : const Color(0xFFFFE5B4);
+
   static Color get infoBannerIconColor => isDarkMode ? dark.infoBannerIconColor : const Color(0xFFCC9B14);
+
   static Color get infoBannerTextColor => isDarkMode ? dark.infoBannerTextColor : const Color(0xFF856404);
 
   // ── Symptoms Checker ─────────────────────────────────────────────��────────
   static Color get chipColorSeekMedicalAdvice => isDarkMode ? dark.chipColorSeekMedicalAdvice : const Color(0xFFFFAF15);
+
   static Color get chipTextColorSeekMedicalAdvice => isDarkMode ? dark.chipTextColorSeekMedicalAdvice : const Color(0xFFD48D05);
 
   // ── Services Page Colors ──────────────────────────────────────────────────
   static Color get eReferralCardColor => isDarkMode ? dark.eReferralCardColor : const Color(0xFFFF8012);
+
   static Color get bloodDonationCardColor => isDarkMode ? dark.bloodDonationCardColor : const Color(0xFFFF5662);
+
   static Color get myChildVaccineCardColor => isDarkMode ? dark.myChildVaccineCardColor : const Color(0xFFFF2D78);
+
   static Color get bookAppointment => isDarkMode ? dark.bookAppointment : const Color(0xFF415364);
 
   // ── Health Calculators Colors ─────────────────────────────────────────────
   static Color get bmiCalculatorColor => isDarkMode ? dark.bmiCalculatorColor : const Color(0xFFF43333);
+
   static Color get caloriesCalculatorColor => isDarkMode ? dark.caloriesCalculatorColor : const Color(0xFF0B85F7);
+
   static Color get bmrCalculatorColor => isDarkMode ? dark.bmrCalculatorColor : const Color(0xFF18C273);
+
   static Color get idealBodyWeightColor => isDarkMode ? dark.idealBodyWeightColor : const Color(0xFFFF8012);
+
   static Color get bodyFatCalculatorColor => isDarkMode ? dark.bodyFatCalculatorColor : const Color(0xFFFF5662);
+
   static Color get carbsProteinFatColor => isDarkMode ? dark.carbsProteinFatColor : const Color(0xFF18C273);
+
   static Color get ovulationPeriodColor => isDarkMode ? dark.ovulationPeriodColor : const Color(0xFFFF47A9);
+
   static Color get deliveryDueDateColor => isDarkMode ? dark.deliveryDueDateColor : const Color(0xFFFF2D78);
 
   // ── Water Monitor ─────────────────────────────────────────────────────────
   static Color get blueColor => isDarkMode ? dark.blueColor : const Color(0xFF4EB5FF);
+
   static Color get blueGradientColorOne => isDarkMode ? dark.blueGradientColorOne : const Color(0xFFF1F7FD);
+
   static Color get blueGradientColorTwo => isDarkMode ? dark.blueGradientColorTwo : const Color(0xFFD9EFFF);
 
   // ── Shimmer ───────────────────────────────────────────────────────────────
   static Color get shimmerBaseColor => isDarkMode ? dark.shimmerBaseColor : const Color(0xFFE0E0E0);
+
   static Color get shimmerHighlightColor => isDarkMode ? dark.shimmerHighlightColor : const Color(0xFFF5F5F5);
+
   static Color get covid29Color => isDarkMode ? dark.covid29Color : const Color(0xff2563EB);
+
   static Color get lightGreyTextColor => isDarkMode ? dark.lightGreyTextColor : const Color(0xFF959595);
+
   static Color get labelColorYellow => isDarkMode ? dark.labelColorYellow : const Color(0xFFFBCB6E);
 
-  static const LinearGradient aiLinearGradient =
-  LinearGradient(colors: [Color(0xFF8A38F5), Color(0xFFE20BBB)], begin: Alignment.topLeft, end: Alignment.bottomRight);
+  static const LinearGradient aiLinearGradient = LinearGradient(colors: [Color(0xFF8A38F5), Color(0xFFE20BBB)], begin: Alignment.topLeft, end: Alignment.bottomRight);
 
   // ── Aliases ───────────────────────────────────────────────────────────────
   static Color get bgScaffoldColor => scaffoldBgColor;
+
   static Color get primaryRedBorderColor => primaryRedColor;
+
   static Color get chipPrimaryRedBorderColor => primaryRedColor;
+
   static Color get criticalLowAndHigh => primaryRedColor;
+
   static Color get chipColorEmergency => primaryRedColor;
+
   static Color get errorLightColor => primaryRedColor;
+
   static Color get secondaryLightRedBorderColor => secondaryLightRedColor;
+
   static Color get bgRedLightColor => secondaryLightRedColor;
+
   static Color get chipSecondaryLightRedColor => secondaryLightRedColor;
+
   static Color get blackBgColor => textColor;
+
   static Color get blackColor => textColor;
+
   static Color get borderOnlyColor => textColor;
+
   static Color get chipBorderColorOpacity20 => borderGrayColor;
+
   static Color get bgGreenColor => successColor;
+
   static Color get textGreenColor => successColor;
+
   static Color get successLightColor => successColor;
+
   static Color get thumbColor => successColor;
+
   static Color get chipColorMonitor => successColor;
+
   static Color get greyLightColor => greyColor;
+
   static Color get alertLightColor => alertColor;
+
   static Color get infoLightColor => infoColor;
+
   static Color get warningLightColor => warningColor;
 
   // ── Dark Mode Palette ─────────────────────────────────────────────────────
@@ -152,11 +281,17 @@ class AppColorsDark {
 
   // Scaffold / Background
   Color get scaffoldBgColor => const Color(0xFF191919);
+
   Color get bottomSheetBgColor => const Color(0xFF1C1C1E);
+
   Color get lightGreyEFColor => const Color(0xFF2A2A3A);
+
   Color get greyF7Color => const Color(0xFF1E1E1E);
+
   Color get greyInfoTextColor => const Color(0xFF9E9E9E);
+
   Color get lightGrayColor => const Color(0xFF9E9E9E);
+
   Color get greyTextColorLight => const Color(0xFF757575);
 
   // ⚠️ NEW — was missing from AppColorsDark
@@ -164,114 +299,192 @@ class AppColorsDark {
 
   // Core
   Color get baseColor => const Color(0xFF1E1E1E);
+
   // ⚠️ NEW — maps whiteColor → dark surface color
   Color get whiteColor => const Color(0xFF1E1E1E); // surface replacement for white
   Color get primaryRedColor => const Color(0xFFDE5C5D);
+
   Color get secondaryLightRedColor => const Color(0xFF3A1015);
+
   Color get successColor => const Color(0xFF18C273);
+
   Color get successLightBgColor => const Color(0xFF0D2E1F);
+
   Color get textColor => const Color(0xFFFFFFFF);
+
   Color get iconColor => const Color(0xFFFFFFFF);
+
   Color get borderGrayColor => const Color(0x55ECECEC);
+
   Color get textColorLight => const Color(0xFFB0B0B0);
+
   Color get dividerColor => const Color(0x33FFFFFF);
+
   Color get warningColorYellow => const Color(0xFFF4A308);
+
   Color get inputLabelTextColor => const Color(0xFF9E9E9E);
+
   Color get greyTextColor => const Color(0xFF8F9AA3);
+
   Color get lightGrayBGColor => const Color(0x22FFFFFF);
+
   Color get checkBoxBorderColor => const Color(0xFF555555);
+
   Color get pharmacyBGColor => const Color(0xFF359846);
+
   // ⚠️ NEW — was missing from AppColorsDark
   Color get lightGreenColor => const Color(0xFF0ccedde); // same teal accent — works on dark
   Color get ratingColorYellow => const Color(0xFFFFAF15);
+
   Color get spacerLineColor => const Color(0x22FFFFFF);
 
   // Semantic / Status
   Color get errorColor => const Color(0xFFD63D48);
+
   Color get alertColor => const Color(0xFFD48D05);
+
   Color get infoColor => const Color(0xFF4DA6FF);
+
   Color get warningColor => const Color(0xFFFFCC00);
+
   Color get greyColor => const Color(0xFF2C2C2E);
+
   Color get chipBgColor => const Color(0xFF3E3E3E);
+
   Color get cardDarkBorderColor => const Color(0x0DEAEAEA);
+
   Color get serviceCardButtonColor => const Color(0xFF3E3E3E);
+
   Color get switchBackgroundColor => const Color(0x2618C273);
+
   Color get bottomNAVBorder => const Color(0xFF2C2C2E);
+
   Color get quickLoginColor => const Color(0xFF9E9E9E);
+
   Color get tooltipTextColor => const Color(0xFFCFD8DC);
+
   Color get graphGridColor => const Color(0x4D18C273);
+
   Color get highAndLow => const Color(0xFFFFAF15);
+
   Color get labelTextColor => const Color(0xFF9E9E9E);
+
   Color get calenderTextColor => const Color(0xFF555555);
+
   Color get lightGreenButtonColor => const Color(0x2618C273);
+
   Color get lightRedButtonColor => const Color(0x1AED1C2B);
 
   // Status
   Color get statusPendingColor => const Color(0xFFCC9B14);
+
   Color get statusProcessingColor => const Color(0xFFECECEC);
+
   Color get statusCompletedColor => const Color(0xFF359846);
+
   Color get statusRejectedColor => const Color(0xFFD02127);
 
   // Info Banner
   Color get infoBannerBgColor => const Color(0xFF2A1F0A);
+
   Color get infoBannerBorderColor => const Color(0xFF5A3D0A);
+
   Color get infoBannerIconColor => const Color(0xFFCC9B14);
+
   Color get infoBannerTextColor => const Color(0xFFFFCB6B);
 
   // Symptoms Checker
   Color get chipColorSeekMedicalAdvice => const Color(0xFFFFAF15);
+
   Color get chipTextColorSeekMedicalAdvice => const Color(0xFFD48D05);
 
   // Services Page
   Color get eReferralCardColor => const Color(0xFFFF8012);
+
   Color get bloodDonationCardColor => const Color(0xFFFF5662);
+
   Color get myChildVaccineCardColor => const Color(0xFFFF2D78);
+
   Color get bookAppointment => const Color(0xFF415364);
 
   // Health Calculators
   Color get bmiCalculatorColor => const Color(0xFFF43333);
+
   Color get caloriesCalculatorColor => const Color(0xFF0B85F7);
+
   Color get bmrCalculatorColor => const Color(0xFF18C273);
+
   Color get idealBodyWeightColor => const Color(0xFFFF8012);
+
   Color get bodyFatCalculatorColor => const Color(0xFFFF5662);
+
   Color get carbsProteinFatColor => const Color(0xFF18C273);
+
   Color get ovulationPeriodColor => const Color(0xFFFF47A9);
+
   Color get deliveryDueDateColor => const Color(0xFFFF2D78);
 
   // Water Monitor
   Color get blueColor => const Color(0xFF4EB5FF);
+
   Color get blueGradientColorOne => const Color(0xFF101C2A);
+
   Color get blueGradientColorTwo => const Color(0xFF0D2235);
 
   // Shimmer
   Color get shimmerBaseColor => const Color(0xFF2C2C2C);
+
   Color get shimmerHighlightColor => const Color(0xFF3D3D3D);
+
   Color get covid29Color => const Color(0xFF2563EB);
+
   Color get lightGreyTextColor => const Color(0xFF757575);
+
   Color get labelColorYellow => const Color(0xFFFBCB6E);
 
   // Aliases
   Color get bgScaffoldColor => scaffoldBgColor;
+
   Color get primaryRedBorderColor => primaryRedColor;
+
   Color get chipPrimaryRedBorderColor => primaryRedColor;
+
   Color get criticalLowAndHigh => primaryRedColor;
+
   Color get chipColorEmergency => primaryRedColor;
+
   Color get errorLightColor => primaryRedColor;
+
   Color get secondaryLightRedBorderColor => secondaryLightRedColor;
+
   Color get bgRedLightColor => secondaryLightRedColor;
+
   Color get chipSecondaryLightRedColor => secondaryLightRedColor;
+
   Color get blackBgColor => textColor;
+
   Color get blackColor => textColor;
+
   Color get borderOnlyColor => textColor;
+
   Color get chipBorderColorOpacity20 => borderGrayColor;
+
   Color get bgGreenColor => successColor;
+
   Color get textGreenColor => successColor;
+
   Color get successLightColor => successColor;
+
   Color get thumbColor => successColor;
+
   Color get chipColorMonitor => successColor;
+
   Color get greyLightColor => greyColor;
+
   Color get alertLightColor => alertColor;
+
   Color get infoLightColor => infoColor;
+
   Color get warningLightColor => warningColor;
 }
 
@@ -283,61 +496,99 @@ extension AppColorsContext on BuildContext {
 
   // Scaffold / Background
   Color get scaffoldBgColor => _isDark ? AppColors.dark.scaffoldBgColor : const Color(0xFFF8F8F8);
+
   Color get bottomSheetBgColor => _isDark ? AppColors.dark.bottomSheetBgColor : const Color(0xFFF8F8FA);
+
   Color get greyF7Color => _isDark ? AppColors.dark.greyF7Color : const Color(0xffF7F7F7);
+
   Color get greyInfoTextColor => _isDark ? AppColors.dark.greyInfoTextColor : const Color(0xff777777);
+
   Color get lightGrayColor => _isDark ? AppColors.dark.lightGrayColor : const Color(0xff808080);
 
   // Core
   Color get cardBaseColor => _isDark ? AppColors.dark.baseColor : const Color(0xFFFFFFFF);
+
   Color get primaryRedColor => _isDark ? AppColors.dark.primaryRedColor : AppColors.primaryRedColor;
+
   Color get secondaryLightRedColor => _isDark ? AppColors.dark.serviceCardButtonColor : const Color(0xFFFEE9EA);
+
   Color get secondaryLightRedForegroundColor => _isDark ? const Color(0xFFFFFFFF) : AppColors.primaryRedColor;
+
   Color get successColor => AppColors.successColor;
+
   Color get successLightBgColor => _isDark ? AppColors.dark.successLightBgColor : const Color(0xffDDF6EA);
+
   Color get textColor => _isDark ? AppColors.dark.textColor : const Color(0xFF2E3039);
+
   Color get iconColor => _isDark ? AppColors.dark.iconColor : const Color(0xFF2E3039);
+
   Color get borderGrayColor => _isDark ? AppColors.dark.borderGrayColor : const Color(0x332E3039);
+
   Color get textColorLight => _isDark ? AppColors.dark.textColorLight : const Color(0xFF5E5E5E);
+
   Color get dividerColor => _isDark ? AppColors.dark.dividerColor : const Color(0x40D2D2D2);
+
   Color get inputLabelTextColor => _isDark ? AppColors.dark.inputLabelTextColor : const Color(0xff898A8D);
+
   Color get greyTextColor => AppColors.greyTextColor;
+
   Color get lightGrayBGColor => _isDark ? AppColors.dark.lightGrayBGColor : const Color(0x142E3039);
+
   Color get checkBoxBorderColor => _isDark ? AppColors.dark.checkBoxBorderColor : const Color(0xffD2D2D2);
 
   // Status / Semantic
   Color get errorColor => _isDark ? AppColors.dark.errorColor : const Color(0xFFED1C2B);
+
   Color get alertColor => AppColors.alertColor;
+
   Color get infoColor => _isDark ? AppColors.dark.infoColor : const Color(0xFF0B85F7);
+
   Color get warningColor => AppColors.warningColor;
+
   Color get greyColor => _isDark ? AppColors.dark.greyColor : const Color(0xFFEFEFF0);
+
   Color get chipBgColor => _isDark ? AppColors.dark.chipBgColor : const Color(0xFFEFEFF0);
+
   Color get cardDarkBorderColor => _isDark ? AppColors.dark.cardDarkBorderColor : Colors.transparent;
+
   Color get serviceCardButtonColor => _isDark ? AppColors.dark.serviceCardButtonColor : const Color(0xFF2E3039);
+
   Color get bottomNAVBorder => _isDark ? AppColors.dark.bottomNAVBorder : const Color(0xFFEEEEEE);
+
   Color get labelTextColor => _isDark ? AppColors.dark.labelTextColor : const Color(0xFF838383);
+
   Color get lightGreyTextColor => _isDark ? AppColors.dark.lightGreyTextColor : const Color(0xFF959595);
 
   // Info Banner
   Color get infoBannerBgColor => _isDark ? AppColors.dark.infoBannerBgColor : const Color(0xFFFFF4E6);
+
   Color get infoBannerBorderColor => _isDark ? AppColors.dark.infoBannerBorderColor : const Color(0xFFFFE5B4);
+
   Color get infoBannerIconColor => AppColors.infoBannerIconColor;
+
   Color get infoBannerTextColor => _isDark ? AppColors.dark.infoBannerTextColor : const Color(0xFF856404);
 
   // Water Monitor
   Color get blueColor => AppColors.blueColor;
+
   Color get blueGradientColorOne => _isDark ? AppColors.dark.blueGradientColorOne : const Color(0xFFF1F7FD);
+
   Color get blueGradientColorTwo => _isDark ? AppColors.dark.blueGradientColorTwo : const Color(0xFFD9EFFF);
 
   // Shimmer
   Color get shimmerBaseColor => _isDark ? AppColors.dark.shimmerBaseColor : const Color(0xFFE0E0E0);
+
   Color get shimmerHighlightColor => _isDark ? AppColors.dark.shimmerHighlightColor : const Color(0xFFF5F5F5);
   static const Color tooltipColor = Color(0xFF1AACACAC);
 
   // Aliases
   Color get bgScaffoldColor => scaffoldBgColor;
+
   Color get bgGreenColor => successColor;
+
   Color get bgRedLightColor => secondaryLightRedColor;
+
   Color get blackColor => textColor;
+
   Color get blackBgColor => textColor;
 }
diff --git a/lib/widgets/appbar/collapsing_list_view.dart b/lib/widgets/appbar/collapsing_list_view.dart
index c3ebe4ba..0c677002 100644
--- a/lib/widgets/appbar/collapsing_list_view.dart
+++ b/lib/widgets/appbar/collapsing_list_view.dart
@@ -115,8 +115,7 @@ class CollapsingListView extends StatelessWidget {
                       margin: EdgeInsets.fromLTRB(24.w, 0, 24.w, 0),
                       child: Transform.flip(
                         flipX: appState.isArabic(),
-                        child: Utils.buildSvgWithAssets(
-                            icon: isClose ? AppAssets.close_bottom_nav_trans : AppAssets.arrow_back_new, width: 24.h, height: 24.h),
+                        child: Utils.buildSvgWithAssets(icon: isClose ? AppAssets.close_bottom_nav_trans : AppAssets.arrow_back_new, width: 24.h, height: 24.h),
                       ),
                     ).onPress(() {
                       if (leadingCallback != null) {
@@ -289,8 +288,7 @@ class _ScrollAnimatedTitleState extends State<ScrollAnimatedTitle> {
     return Container(
       // height: (widget.preferredSize.height - _fontSize / 2).h,
       height: 56.h,
-      alignment:
-          isRtl ? (widget.showBack ? Alignment.topRight : Alignment.centerRight) : (widget.showBack ? Alignment.topLeft : Alignment.centerLeft),
+      alignment: isRtl ? (widget.showBack ? Alignment.topRight : Alignment.centerRight) : (widget.showBack ? Alignment.topLeft : Alignment.centerLeft),
       padding: EdgeInsets.fromLTRB(24.w, 0, 24.w, 0),
       child: Row(
         spacing: 4.h,
@@ -306,38 +304,19 @@ class _ScrollAnimatedTitleState extends State<ScrollAnimatedTitle> {
             ),
           ).expanded,
           ...[
-            if (widget.logout != null)
-              actionButton(context, t, title: LocaleKeys.logout.tr(context: context), icon: AppAssets.logout).onPress(widget.logout!),
-            if (widget.report != null)
-              actionButton(context, t, title: LocaleKeys.feedback.tr(context: context), icon: AppAssets.report_icon).onPress(widget.report!),
-            if (widget.history != null)
-              actionButton(context, t, title: LocaleKeys.history.tr(context: context), icon: AppAssets.insurance_history_icon)
-                  .onPress(widget.history!),
-            if (widget.instructions != null)
-              actionButton(context, t, title: LocaleKeys.instructions.tr(context: context), icon: AppAssets.requests).onPress(widget.instructions!),
-            if (widget.requests != null)
-              actionButton(context, t, title: LocaleKeys.requests.tr(context: context), icon: AppAssets.insurance_history_icon)
-                  .onPress(widget.requests!),
-            if (widget.sendEmail != null)
-              actionButton(context, t, title: LocaleKeys.sendEmail.tr(context: context), icon: AppAssets.email).onPress(widget.sendEmail!),
-            if (widget.doctorResponse != null)
-              actionButton(context, t, title: LocaleKeys.doctorResponses.tr(context: context), icon: AppAssets.doctorResponseIcon)
-                  .onPress(widget.doctorResponse!),
+            if (widget.logout != null) actionButton(context, t, title: LocaleKeys.logout.tr(context: context), icon: AppAssets.logout).onPress(widget.logout!),
+            if (widget.report != null) actionButton(context, t, title: LocaleKeys.feedback.tr(context: context), icon: AppAssets.report_icon).onPress(widget.report!),
+            if (widget.history != null) actionButton(context, t, title: LocaleKeys.history.tr(context: context), icon: AppAssets.insurance_history_icon).onPress(widget.history!),
+            if (widget.instructions != null) actionButton(context, t, title: LocaleKeys.instructions.tr(context: context), icon: AppAssets.requests).onPress(widget.instructions!),
+            if (widget.requests != null) actionButton(context, t, title: LocaleKeys.requests.tr(context: context), icon: AppAssets.insurance_history_icon).onPress(widget.requests!),
+            if (widget.sendEmail != null) actionButton(context, t, title: LocaleKeys.sendEmail.tr(context: context), icon: AppAssets.email).onPress(widget.sendEmail!),
+            if (widget.doctorResponse != null) actionButton(context, t, title: LocaleKeys.doctorResponses.tr(context: context), icon: AppAssets.doctorResponseIcon).onPress(widget.doctorResponse!),
             if (widget.search != null) Utils.buildSvgWithAssets(icon: AppAssets.search_icon).onPress(widget.search!),
-            if (widget.aiOverview != null)
-              actionButton(context, t, title: LocaleKeys.aiOverView.tr(context: context), icon: AppAssets.aiOverView, isAiButton: true)
-                  .onPress(widget.aiOverview!),
-            if (widget.downloadReport != null)
-              actionButton(context, t, title: LocaleKeys.downloadReport.tr(context: context), icon: AppAssets.download)
-                  .onPress(widget.downloadReport!),
-            if (widget.viewImage != null)
-              actionButton(context, t, title: LocaleKeys.viewRadiologyImage.tr(context: context), icon: AppAssets.download)
-                  .onPress(widget.viewImage!),
-            if (widget.location != null)
-              actionButton(context, t, title: LocaleKeys.sortByLocation.tr(context: context), icon: AppAssets.location).onPress(widget.location!),
-            if (widget.downloadInvoice != null)
-              actionButton(context, t, title: LocaleKeys.downloadInvoice.tr(context: context), icon: AppAssets.download)
-                  .onPress(widget.downloadInvoice!),
+            if (widget.aiOverview != null) actionButton(context, t, title: LocaleKeys.aiOverView.tr(context: context), icon: AppAssets.aiOverView, isAiButton: true).onPress(widget.aiOverview!),
+            if (widget.downloadReport != null) actionButton(context, t, title: LocaleKeys.downloadReport.tr(context: context), icon: AppAssets.download).onPress(widget.downloadReport!),
+            if (widget.viewImage != null) actionButton(context, t, title: LocaleKeys.viewRadiologyImage.tr(context: context), icon: AppAssets.download).onPress(widget.viewImage!),
+            if (widget.location != null) actionButton(context, t, title: LocaleKeys.sortByLocation.tr(context: context), icon: AppAssets.location).onPress(widget.location!),
+            if (widget.downloadInvoice != null) actionButton(context, t, title: LocaleKeys.downloadInvoice.tr(context: context), icon: AppAssets.download).onPress(widget.downloadInvoice!),
             if (widget.trailing != null) widget.trailing!,
           ]
         ],
@@ -353,8 +332,7 @@ class _ScrollAnimatedTitleState extends State<ScrollAnimatedTitle> {
               child: Container(
                 height: isFoldable ? 50.h : 40.h,
                 padding: EdgeInsets.all(8.w),
-                decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-                    color: AppColors.whiteColor, borderRadius: 8.r, side: BorderSide(width: 1, color: AppColors.borderGrayColor)),
+                decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 8.r, side: BorderSide(width: 1, color: AppColors.borderGrayColor)),
                 child: ShaderMask(
                   blendMode: BlendMode.srcIn,
                   shaderCallback: (bounds) => AppColors.aiLinearGradient.createShader(bounds),
diff --git a/lib/widgets/bottom_navigation/bottom_navigation.dart b/lib/widgets/bottom_navigation/bottom_navigation.dart
index e999842f..a5b8b239 100644
--- a/lib/widgets/bottom_navigation/bottom_navigation.dart
+++ b/lib/widgets/bottom_navigation/bottom_navigation.dart
@@ -28,7 +28,13 @@ class BottomNavigation extends StatelessWidget {
         icon: AppAssets.bookAppoBottom,
         fillIcon: AppAssets.bookAppoBottom,
         label: LocaleKeys.appointments.tr(context: context),
-        iconSize: 32, isSpecial: true),
+        iconSize: 32,
+        isSpecial: true,
+        // Explicit dynamic color — the SVG asset itself is a fixed red, so
+        // without this override the Appointments icon would never react to
+        // dark mode or the active occasion theme (e.g. National Day green).
+        color: AppColors.primaryRedColor,
+      ),
       appState.isAuthenticated
           // ? BottomNavItem(icon: AppAssets.toDoBottom, label: LocaleKeys.todoList.tr(context: context))
           ? BottomNavItem(icon: AppAssets.symptomCheckerBottomIcon, fillIcon: AppAssets.symptomCheckerBottomFillIcon, label: LocaleKeys.symptoms.tr(context: context))
@@ -75,7 +81,8 @@ class BottomNavigation extends StatelessWidget {
               icon: isSelected ? item.fillIcon : item.icon,
               height: item.iconSize.h,
               width: item.iconSize.w,
-              applyThemeColor: !item.isSpecial
+              applyThemeColor: !item.isSpecial,
+              iconColor: item.color,
               // iconColor:  isSelected ? Colors.black87 : Colors.black87,
             ),
             // const SizedBox(height: 10),
diff --git a/lib/widgets/buttons/custom_button.dart b/lib/widgets/buttons/custom_button.dart
index 82b62507..8b8e599a 100644
--- a/lib/widgets/buttons/custom_button.dart
+++ b/lib/widgets/buttons/custom_button.dart
@@ -10,8 +10,8 @@ class CustomButton extends StatefulWidget {
   final String text;
   final String? icon;
   final VoidCallback? onPressed;
-  final Color backgroundColor;
-  final Color borderColor;
+  final Color? backgroundColor;
+  final Color? borderColor;
   final Color textColor;
   final double? borderRadius;
   final double borderWidth;
@@ -33,8 +33,8 @@ class CustomButton extends StatefulWidget {
     super.key,
     required this.text,
     required this.onPressed,
-    this.backgroundColor = const Color(0xFFED1C2B),
-    this.borderColor = const Color(0xFFED1C2B),
+    this.backgroundColor,
+    this.borderColor,
     this.textColor = Colors.white,
     this.borderRadius,
     this.borderWidth = 2,
@@ -93,6 +93,8 @@ class _CustomButtonState extends State<CustomButton> with SingleTickerProviderSt
     final iconS = widget.iconSize ?? (24.h);
     final fontS = widget.fontSize ?? (16.f);
     final isButtonDisabled = widget.isDisabled || widget.onPressed == null;
+    final resolvedBackgroundColor = widget.backgroundColor ?? AppColors.primaryRedColor;
+    final resolvedBorderColor = widget.borderColor ?? AppColors.primaryRedColor;
 
     return Semantics(
       button: true,
@@ -134,10 +136,10 @@ class _CustomButtonState extends State<CustomButton> with SingleTickerProviderSt
                 width: widget.width,
                 padding: widget.padding,
                 decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-                    color: isButtonDisabled ? AppColors.inputLabelTextColor.withValues(alpha: 0.3) : widget.backgroundColor,
+                    color: isButtonDisabled ? AppColors.inputLabelTextColor.withValues(alpha: 0.3) : resolvedBackgroundColor,
                     borderRadius: radius,
                 customBorder: BorderRadius.circular(radius),
-                    side: widget.borderSide ?? BorderSide(width: widget.borderWidth.h, color: isButtonDisabled ? Colors.transparent : widget.borderColor)),
+                    side: widget.borderSide ?? BorderSide(width: widget.borderWidth.h, color: isButtonDisabled ? Colors.transparent : resolvedBorderColor)),
                 child: Row(
               crossAxisAlignment: CrossAxisAlignment.center,
               mainAxisAlignment: MainAxisAlignment.center,
diff --git a/lib/widgets/date_range_selector/date_range_calender.dart b/lib/widgets/date_range_selector/date_range_calender.dart
index a544f010..28098824 100644
--- a/lib/widgets/date_range_selector/date_range_calender.dart
+++ b/lib/widgets/date_range_selector/date_range_calender.dart
@@ -163,7 +163,7 @@ class _DateRangeSelectorState extends State<DateRangeSelector> {
                     ),
                     startRangeSelectionColor: AppColors.primaryRedColor,
                     endRangeSelectionColor: AppColors.primaryRedColor,
-                    rangeSelectionColor: AppColors.primaryRedColor.withOpacity(0.1),
+                    rangeSelectionColor: AppColors.secondaryLightRedColor,
                     rangeTextStyle: TextStyle(
                       fontFamily: "Poppins",
                     ),
@@ -963,7 +963,7 @@ class _DateRangeSelectorState extends State<DateRangeSelector> {
       children: [
         AppCustomChipWidget(
           labelText: LocaleKeys.thisWeek.tr(context: context),
-          backgroundColor: model.currentlySelectedRange == Range.WEEKLY ? AppColors.primaryRedColor.withOpacity(0.1) : AppColors.whiteColor,
+          backgroundColor: model.currentlySelectedRange == Range.WEEKLY ? AppColors.secondaryLightRedColor : AppColors.whiteColor,
           shape: RoundedRectangleBorder(
               side: BorderSide(
                 color: model.currentlySelectedRange == Range.WEEKLY ? AppColors.primaryRedBorderColor : AppColors.chipBorderColorOpacity20,
@@ -977,7 +977,7 @@ class _DateRangeSelectorState extends State<DateRangeSelector> {
         }),
         AppCustomChipWidget(
           labelText: LocaleKeys.lastMonth.tr(context: context),
-          backgroundColor: model.currentlySelectedRange == Range.LAST_MONTH ? AppColors.primaryRedColor.withOpacity(0.1) : AppColors.whiteColor,
+          backgroundColor: model.currentlySelectedRange == Range.LAST_MONTH ? AppColors.secondaryLightRedColor : AppColors.whiteColor,
           shape: RoundedRectangleBorder(
               side: BorderSide(
                 color: model.currentlySelectedRange == Range.LAST_MONTH ? AppColors.primaryRedBorderColor : AppColors.chipBorderColorOpacity20,
@@ -991,7 +991,7 @@ class _DateRangeSelectorState extends State<DateRangeSelector> {
         }),
         AppCustomChipWidget(
           labelText: LocaleKeys.lastSixMonths.tr(context: context),
-          backgroundColor: model.currentlySelectedRange == Range.LAST_6MONTH ? AppColors.primaryRedColor.withOpacity(0.1) : AppColors.whiteColor,
+          backgroundColor: model.currentlySelectedRange == Range.LAST_6MONTH ? AppColors.secondaryLightRedColor : AppColors.whiteColor,
           shape: RoundedRectangleBorder(
               side: BorderSide(
                 color: model.currentlySelectedRange == Range.LAST_6MONTH ? AppColors.primaryRedBorderColor : AppColors.chipBorderColorOpacity20,
@@ -1012,7 +1012,7 @@ class _DateRangeSelectorState extends State<DateRangeSelector> {
             ],
           ),
           labelText: "${LocaleKeys.year.tr(context: context)} ${model.getCurrentYear}",
-          backgroundColor: model.currentlySelectedRange == Range.THIS_YEAR ? AppColors.primaryRedColor.withOpacity(0.1) : AppColors.whiteColor,
+          backgroundColor: model.currentlySelectedRange == Range.THIS_YEAR ? AppColors.secondaryLightRedColor : AppColors.whiteColor,
           shape: RoundedRectangleBorder(
               side: BorderSide(
                 color: model.currentlySelectedRange == Range.THIS_YEAR ? AppColors.primaryRedBorderColor : AppColors.chipBorderColorOpacity20,
diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart
index fe08fbbe..1d3b6fa4 100644
--- a/lib/widgets/in_app_browser/InAppBrowser.dart
+++ b/lib/widgets/in_app_browser/InAppBrowser.dart
@@ -307,12 +307,15 @@ class MyInAppBrowser extends InAppBrowser {
     form = form.replaceFirst('CUSTNAME_VALUE', patientName);
     form = form.replaceFirst('CUSTID_VALUE', patientID.toString());
 
+    form = form.replaceFirst('APPOINTMENT_DATE_VALUE', appoDate);
+    form = form.replaceFirst('APPOINTMENT_NO_VALUE', appoNo.toString());
+    form = form.replaceFirst('DOCTOR_ID_VALUE', doctorID.toString());
+    form = form.replaceFirst('CLINIC_ID_VALUE', clinicID.toString());
+
     if (isLiveCareAppo) {
       form = form.replaceFirst('IS_SCHEDULE_VALUE', "true");
-      form = form.replaceFirst('APPOINTMENT_DATE_VALUE', appoDate);
-      form = form.replaceFirst('APPOINTMENT_NO_VALUE', appoNo.toString());
-      form = form.replaceFirst('DOCTOR_ID_VALUE', doctorID.toString());
-      form = form.replaceFirst('CLINIC_ID_VALUE', clinicID.toString());
+    } else {
+      form = form.replaceFirst('IS_SCHEDULE_VALUE', "false");
     }
 
     var bytes = utf8.encode(form);
@@ -363,6 +366,10 @@ class MyInAppBrowser extends InAppBrowser {
         '<input type="hidden" name="ProjID" value="PROJECT_ID_VALUE">' +
         '<input type="hidden" name="Order_Desc" value="ORDER_DESCRIPTION_VALUE">' +
         '<input type="hidden" name="OrderID" value="ORDER_ID_VALUE">' +
+        '<input type="hidden" name="AppointmentDate" value="APPOINTMENT_DATE_VALUE">' +
+        '<input type="hidden" name="AppointmentNo" value="APPOINTMENT_NO_VALUE">' +
+        '<input type="hidden" name="DoctorID" value="DOCTOR_ID_VALUE">' +
+        '<input type="hidden" name="ClinicID" value="CLINIC_ID_VALUE">' +
         '<input type="hidden" name="PaymentOption" value="PAYMENT_OPTION_VALUE">' +
         '<input type="hidden" name="Email" value="EMAIL_VALUE">' +
         '<input type="hidden" name="ServID" value="SERV_ID"  >' +
diff --git a/lib/widgets/language_switcher.dart b/lib/widgets/language_switcher.dart
index 15237363..7a556c84 100644
--- a/lib/widgets/language_switcher.dart
+++ b/lib/widgets/language_switcher.dart
@@ -56,21 +56,22 @@ class _LanguageSelectorState extends State<LanguageSelector> {
               child: Row(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-
                   Text(
                     // currentLangData['name']?.toUpperCase() ?? 'EN',
                     widget.currentLanguage == 'ar' ? "ENGLISH" : "العربية",
                     style: context.dynamicTextStyle(
                         fontWeight: FontWeight.w600,
-                      fontSize: 14.f,
-                      color: AppColors.primaryRedColor,
-                      letterSpacing: 0.1,
-                      isLanguageSwitcher: true,
+                        fontSize: 14.f,
+                        color: AppColors.primaryRedColor,
+                        letterSpacing: 0.1,
+                        isLanguageSwitcher: true,
                         fontFamily: widget.currentLanguage == 'ar' ? "Poppins" : "CairoArabic"),
                   ),
                   SizedBox(width: 6.h),
-                  Utils.buildSvgWithAssets(icon: AppAssets.language),
-
+                  Utils.buildSvgWithAssets(
+                    icon: AppAssets.language,
+                    iconColor: AppColors.primaryRedColor,
+                  ),
                 ],
               ),
             ),
diff --git a/lib/widgets/map/HMSMap.dart b/lib/widgets/map/HMSMap.dart
index 50da5f3a..e2059a52 100644
--- a/lib/widgets/map/HMSMap.dart
+++ b/lib/widgets/map/HMSMap.dart
@@ -220,7 +220,7 @@ class _MapTypeItem extends StatelessWidget {
         padding: EdgeInsets.symmetric(horizontal: 10.w, vertical: 8.h),
         decoration: BoxDecoration(
           color: isSelected
-              ? AppColors.primaryRedColor.withOpacity(0.1)
+              ? AppColors.secondaryLightRedColor
               : Colors.transparent,
           borderRadius: BorderRadius.circular(8.r),
         ),
diff --git a/lib/widgets/map/gms_map.dart b/lib/widgets/map/gms_map.dart
index 33e0befb..07bf2674 100644
--- a/lib/widgets/map/gms_map.dart
+++ b/lib/widgets/map/gms_map.dart
@@ -372,7 +372,7 @@ class _MapTypeItem extends StatelessWidget {
         padding: EdgeInsets.symmetric(horizontal: 10.w, vertical: 8.h),
         decoration: BoxDecoration(
           color: isSelected
-              ? AppColors.primaryRedColor.withOpacity(0.1)
+              ? AppColors.secondaryLightRedColor
               : Colors.transparent,
           borderRadius: BorderRadius.circular(8.r),
         ),
diff --git a/pubspec.lock b/pubspec.lock
index 81dfad3e..f8789dac 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: ff0a84a2734d9e1089f8aedd5c0af0061b82fb94e95260d943404e0ef2134b11
+      sha256: f6966125633a34f82d9be2ee895b755cff3554087b1d00a9eb884e5947f4bca9
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.59"
+    version: "1.3.77"
   adaptive_number:
     dependency: transitive
     description:
@@ -133,10 +133,10 @@ packages:
     dependency: "direct main"
     description:
       name: clarity_flutter
-      sha256: b3a114fec6e873caf03cd59a32953f8cb4b1693bd3b4f749ef3030fea027ebce
+      sha256: "4d46afd76c31d3876f23384d44d6f5728a556daff6cec8b2c98d251dac14899e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.10.0"
   clock:
     dependency: transitive
     description:
@@ -165,18 +165,18 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec
+      sha256: "762c99f890ca8bf87f7337236f99edd42793843bc6c3631da294a76653a54bd0"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.5"
+    version: "7.3.1"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
       name: connectivity_plus_platform_interface
-      sha256: "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204"
+      sha256: "3c09627c536d22fd24691a905cdd8b14520de69da52c7a97499c8be5284a32ed"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.1.0"
   convert:
     dependency: transitive
     description:
@@ -402,90 +402,114 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_analytics
-      sha256: "4f85b161772e1d54a66893ef131c0a44bd9e552efa78b33d5f4f60d2caa5c8a3"
+      sha256: b82d2cabf4905a465ac95937037cbab4f2ca80f559cb04abd3da3f2abb9960bb
       url: "https://pub.dev"
     source: hosted
-    version: "11.6.0"
+    version: "12.6.0"
   firebase_analytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_analytics_platform_interface
-      sha256: a44b6d1155ed5cae7641e3de7163111cfd9f6f6c954ca916dc6a3bdfa86bf845
+      sha256: "5c3ab4b681c837afd71f0abf77c7485f51c7b645d4ae77b96f9ed54779ff4126"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.3"
+    version: "6.0.7"
   firebase_analytics_web:
     dependency: transitive
     description:
       name: firebase_analytics_web
-      sha256: c7d1ed1f86ae64215757518af5576ff88341c8ce5741988c05cc3b2e07b0b273
+      sha256: "09eb4d0ce4c9a16efbc277ac709a90eb197d5512592215a73c6a302ab1ab6c3a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.10+16"
+    version: "0.6.1+13"
   firebase_core:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: "7be63a3f841fc9663342f7f3a011a42aef6a61066943c90b1c434d79d5c995c5"
+      sha256: "5fbbaa2aeb08a52feee559f92a62f5a6b04c9bdff81c8f608636771cf0d7b680"
       url: "https://pub.dev"
     source: hosted
-    version: "3.15.2"
+    version: "4.15.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
-      sha256: cccb4f572325dc14904c02fcc7db6323ad62ba02536833dddb5c02cac7341c64
+      sha256: "9bfbc85faca09346471ac56fbcee00757ebcfd85887c6f602764eff0001902d8"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.2"
+    version: "8.1.1"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: "0ed0dc292e8f9ac50992e2394e9d336a0275b6ae400d64163fdf0a8a8b556c37"
+      sha256: "8ed84f5001dbd7a0390e2818d46bc858ceebb970edededdfc8d6552c76fc2f6e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.24.1"
+    version: "3.12.0"
   firebase_crashlytics:
     dependency: "direct main"
     description:
       name: firebase_crashlytics
-      sha256: "662ae6443da91bca1fb0be8aeeac026fa2975e8b7ddfca36e4d90ebafa35dde1"
+      sha256: f37fe0df162f08bd549114b784037c73a093c64d22625632f97dbbddf18669b9
       url: "https://pub.dev"
     source: hosted
-    version: "4.3.10"
+    version: "5.4.0"
   firebase_crashlytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_crashlytics_platform_interface
-      sha256: "7222a8a40077c79f6b8b3f3439241c9f2b34e9ddfde8381ffc512f7b2e61f7eb"
+      sha256: "8270dcdb1800db3e5f888ce30a2d5e8f92c379c461f022297c83b2c794aa1792"
       url: "https://pub.dev"
     source: hosted
-    version: "3.8.10"
+    version: "3.9.0"
   firebase_messaging:
     dependency: "direct main"
     description:
       name: firebase_messaging
-      sha256: "60be38574f8b5658e2f22b7e311ff2064bea835c248424a383783464e8e02fcc"
+      sha256: "47a8142a0b897783103b01018ad69f123b819b0120483847bde30d1b2fa89b36"
       url: "https://pub.dev"
     source: hosted
-    version: "15.2.10"
+    version: "16.7.0"
   firebase_messaging_platform_interface:
     dependency: transitive
     description:
       name: firebase_messaging_platform_interface
-      sha256: "685e1771b3d1f9c8502771ccc9f91485b376ffe16d553533f335b9183ea99754"
+      sha256: f9707e185b8ce1155d58e7e29348245072d99981f899fa8d3214abb2652c4ccb
       url: "https://pub.dev"
     source: hosted
-    version: "4.6.10"
+    version: "4.10.0"
   firebase_messaging_web:
     dependency: transitive
     description:
       name: firebase_messaging_web
-      sha256: "0d1be17bc89ed3ff5001789c92df678b2e963a51b6fa2bdb467532cc9dbed390"
+      sha256: "311b16c75fc645c7a70c9ade38908abb12310dfce449fc3d3cee1771f196351e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.5"
+  firebase_remote_config:
+    dependency: "direct main"
+    description:
+      name: firebase_remote_config
+      sha256: fa518445638fa3903e359ac544bd3243e72ada025728c8dbfa4b28ae939e8b38
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.10"
+    version: "6.7.0"
+  firebase_remote_config_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_remote_config_platform_interface
+      sha256: dc5a9713031f2ca744cb266d96a58609e929db19f3d91a1dd6bb8f8a0d77acad
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.7"
+  firebase_remote_config_web:
+    dependency: transitive
+    description:
+      name: firebase_remote_config_web
+      sha256: "500abf695c370c76a486ad7480a6df7caf55d2d35ccc5c66b9fc9c1c47f2bc14"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.10.14"
   fixnum:
     dependency: transitive
     description:
@@ -510,10 +534,9 @@ packages:
   flutter_amazonpaymentservices:
     dependency: "direct main"
     description:
-      name: flutter_amazonpaymentservices
-      sha256: "23f45fd3b1e12a0933da3704d66cebd19c4c41e28a50d4fd458d3e3e6311f332"
-      url: "https://pub.dev"
-    source: hosted
+      path: "package/flutter_amazonpaymentservices"
+      relative: true
+    source: path
     version: "0.0.13"
   flutter_cache_manager:
     dependency: transitive
@@ -809,6 +832,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "8.2.14"
+  freerasp:
+    dependency: "direct main"
+    description:
+      name: freerasp
+      sha256: a3d019fa2c1a8f4bb15504d86997f583d1066fe0832172fd68ea6cd521e6fdcc
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.2.2"
   fwfh_cached_network_image:
     dependency: transitive
     description:
@@ -1073,6 +1104,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.12.0+301"
+  huawei_push:
+    dependency: "direct main"
+    description:
+      name: huawei_push
+      sha256: acc149482c03d0efe3ae50236b1a0aac9c0808cba07ad4eb41f06475b04c06f6
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.15.0+300"
   image:
     dependency: transitive
     description:
@@ -1261,26 +1300,26 @@ packages:
     dependency: "direct main"
     description:
       name: local_auth
-      sha256: "434d854cf478f17f12ab29a76a02b3067f86a63a6d6c4eb8fbfdcfe4879c1b7b"
+      sha256: ecf24edf2283c509ecd217e3595f6f71034b68888d28ad1dae6bfa0857b816ac
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "3.0.2"
   local_auth_android:
     dependency: transitive
     description:
       name: local_auth_android
-      sha256: a0bdfcc0607050a26ef5b31d6b4b254581c3d3ce3c1816ab4d4f4a9173e84467
+      sha256: "76c389998fe95cff4352644776ab5775f24ddd58f179dbf3df1b9c268cbbadc4"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.56"
+    version: "2.2.0"
   local_auth_darwin:
     dependency: transitive
     description:
       name: local_auth_darwin
-      sha256: "699873970067a40ef2f2c09b4c72eb1cfef64224ef041b3df9fdc5c4c1f91f49"
+      sha256: b1b2d938cc3511512e552d92e782e055b8dc29c83e21c59e6ecfc6bd79ab0744
       url: "https://pub.dev"
     source: hosted
-    version: "1.6.1"
+    version: "2.0.4"
   local_auth_platform_interface:
     dependency: transitive
     description:
@@ -1293,10 +1332,10 @@ packages:
     dependency: transitive
     description:
       name: local_auth_windows
-      sha256: bc4e66a29b0fdf751aafbec923b5bed7ad6ed3614875d8151afe2578520b2ab5
+      sha256: d72b8a441e5e6a679902f87c51529fcce65f442d77598484cf35454c3d733eda
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.11"
+    version: "2.0.2"
   location:
     dependency: "direct main"
     description:
@@ -1393,6 +1432,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
+  myfatoorah_flutter:
+    dependency: "direct main"
+    description:
+      name: myfatoorah_flutter
+      sha256: c9fa65c6329f3c076e48421726b855a444d9790b480d50822452f14f0e56d95f
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.3.2"
   ndef:
     dependency: transitive
     description:
@@ -1657,6 +1704,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.28.0"
+  safe_device:
+    dependency: "direct main"
+    description:
+      name: safe_device
+      sha256: ad1b32a564484c710f6d52b5a526838c8a7d999c8ab2e14890ff55c06a018248
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
   sanitize_html:
     dependency: transitive
     description:
@@ -1741,10 +1796,10 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
+      sha256: "1e85e0dccf5b4a016077fea7dfbb4a7cb39c759ac1596fcf60c06deadb7da91f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4"
+    version: "2.5.6"
   shared_preferences_android:
     dependency: transitive
     description:
@@ -2247,5 +2302,5 @@ packages:
     source: hosted
     version: "1.2.0"
 sdks:
-  dart: ">=3.10.0-0 <4.0.0"
-  flutter: ">=3.35.0"
+  dart: ">=3.12.0 <4.0.0"
+  flutter: ">=3.44.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 82ae76ac..c6bc2c93 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.48+49
-#version: 0.0.16+1
+#version: 4.6.046+1
+version: 4.6.1004+40501004
 
 environment:
   sdk: ">=3.6.0 <4.0.0"
@@ -17,17 +17,17 @@ dependencies:
   cached_network_image: ^3.4.1
   http: ^1.5.0
   flutter_svg: ^2.2.0
-  shared_preferences: ^2.5.3
-  connectivity_plus: ^6.1.5
+  shared_preferences: ^2.5.5
+  connectivity_plus: ^7.3.1
   auto_size_text: ^3.0.0
   shimmer: ^3.0.0
   sizer: ^3.1.3
   easy_localization: ^3.0.8
   fluttertoast: ^8.2.12
   flutter_rating_bar: ^4.0.1
-  firebase_messaging: ^15.2.10
+  firebase_messaging: ^16.7.0
   #  firebase_messaging: any
-  firebase_core: any
+  firebase_core: ^4.15.0
   #  firebase_core: ^3.13.1
   permission_handler: ^12.0.1
   flutter_local_notifications: ^19.4.1
@@ -45,7 +45,7 @@ dependencies:
   flutter_ios_voip_kit_karmm: ^0.8.0
   image_picker: ^1.2.0
   file_picker: 10.3.8
-  local_auth: ^2.3.0
+  local_auth: ^3.0.2
   share_plus: ^11.1.0
   device_calendar_plus:
     path: ./package/device_calendar_plus
@@ -63,14 +63,14 @@ dependencies:
   geolocator: ^14.0.2
   dropdown_search: ^6.0.2
   google_maps_flutter: ^2.13.1
-#  flutter_zoom_videosdk: 2.1.10
-  flutter_zoom_videosdk: ^2.5.10
+  flutter_zoom_videosdk: 2.1.10
   dart_jsonwebtoken: ^3.2.0
   dartz: ^0.10.1
   equatable: ^2.0.7
   google_api_availability: ^5.0.1
-  firebase_analytics: ^11.5.1
-  firebase_crashlytics: ^4.3.8
+  firebase_analytics: ^12.6.0
+  firebase_crashlytics: ^5.4.0
+  firebase_remote_config: ^6.7.0
   jiffy: ^6.4.3
 #  hijri_gregorian_calendar:
 #    path: /Users/aamir/StudioProjects/hijri_gregorian_calendar
@@ -101,18 +101,22 @@ dependencies:
   intl: ^0.20.2
   flutter_widget_from_html: ^0.17.1
   huawei_map: ^6.12.0+301
+  huawei_push: ^6.15.0+300
   flutter_image_compress: ^2.3.0
   scrollable_positioned_list: ^0.3.8
   in_app_review: ^2.0.11
 
   flutter_paytabs_bridge: ^2.7.14
-  clarity_flutter: 1.9.0
-  flutter_amazonpaymentservices: ^0.0.13
+  clarity_flutter: ^1.10.0
+#  flutter_amazonpaymentservices: ^0.0.13
+  flutter_amazonpaymentservices:
+    path: ./package/flutter_amazonpaymentservices
   screen_brightness: ^1.0.1
   flutter_screenshot_blocker: ^1.0.4
   cloudflare_turnstile: ^3.7.2
   freerasp: ^8.2.1
   safe_device: ^1.4.1
+  myfatoorah_flutter: ^3.3.2
 
 dev_dependencies:
   flutter_test: