Radiology ExamId updates

tamara fix
updates
200 changed files with 16957 additions and 11585 deletions
--- a/Certs/Apple
+++ b/Certs/Apple
--- a/UAT/ApplePayMerchantIdentityCertProd.certSigningRequest
+++ b/UAT/ApplePayMerchantIdentityCertProd.certSigningRequest
@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICajCCAVICAQAwJTEjMCEGCSqGSIb3DQEJARYUSGFyb29uNjEzOEBnbWFpbC5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4E8y9zluekbsXX6+i
+HLa0GrZE+r8rJsmcNyhiONDkpCTQuuidRb4PH+DWPpxwtndKpgzPemCXavaAPY8I
+vSf5/aLTzClLvuX4OqNsb9Y8v8jlt7uYud6hPYK+VKZmIyynqeHldur0+RQScVY7
+Z4MbgxWYAXd0K49o1Vj8KcYP1G37XIaUwOf+Ib3az4abnrsou7w9PSHnKREPU1A8
+syBR56/Zcm3I9e+4nLyk2kjhkp6zR8KKW3s0teqHkW+V2nqd6eU+ZwOOmP3FVuwl
+X+kfVabTc42Nb7toDaIvxEI+LlrNCUTCptE5uvY+vId0bwjcL88Ti9zshPETgLd8
+F7mHAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEAMTsBtXA79BL7aJoe87iHwCaR
+lyOoeG5vUVJhQxhkb7pXD6TT00H3DEn43MCD+Nu9KNq3ZAARTsbnoB1MzYQ+Qs0w
+uIx3K+sKKqzo3tKY78cjpKYW68qSY8QHPH8z0PJ/a18Mz1VGjhV9sanRc57fkf8Y
+SfzG+jKB+y9AeC4R5PAVkv/EScZKVyb8+hFNZRMBOfnME7QRWm51MlnzfgavB/Sr
+SSb9KrKzA65UKM9fv0JhNftiFVwsMDA42RuwSE7rVqzoejb47sFNnEBprt4Jel+5
+FJt/C//NKspMlW2cdRbPek7adaBuZCvEO+b0TDnvMQXnJTO5K0LCzGb5MRuGUg==
+-----END CERTIFICATE REQUEST-----
--- a/UAT/ApplePayPaymentProcessingCertProd.certSigningRequest
+++ b/UAT/ApplePayPaymentProcessingCertProd.certSigningRequest
@ -0,0 +1,8 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIH6MIGfAgEAMD0xIzAhBgkqhkiG9w0BCQEWFEhhcm9vbjYxMzhAZ21haWwuY29t
+MQkwBwYDVQQDDAAxCzAJBgNVBAYTAkFFMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
+QgAEiHGgNfm6LyD0k41YUNxGibQT5t2T9+QTVb6v5YrfCYslJIurcpeia8pzl/HJ
+p1f4qxCR04cEYE3tcunyzkJd26AAMAwGCCqGSM49BAMCBQADSAAwRQIhAJWZqbmD
+e9jyqPHW578V6xsf5Axgf64GBBFMpZ8+ZukDAiAYu0BbgeiU4RwCrezA71iH95yZ
+ge9MoPuNHejpDKGeQQ==
+-----END CERTIFICATE REQUEST-----
--- a/UAT/Password.rtf
+++ b/UAT/Password.rtf
@ -0,0 +1,8 @@
+{\rtf1\ansi\ansicpg1252\cocoartf2758
+\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+{\*\expandedcolortbl;;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww11520\viewh8400\viewkind0
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
+
+\f0\fs24 \cf0 HMG@54321}
--- a/UAT/apple-developer-merchantid-domain-association.txt
+++ b/UAT/apple-developer-merchantid-domain-association.txt
@ -0,0 +1,74 @@
+MIIQaQYJKoZIhvcNAQcCoIIQWjCCEFYCAQExCzAJBgUrDgMCGgUAMHgGCSqGSIb3DQEHAaBrBGl7
+InRlYW1JZCI6IjNBMzU5RTg2WkYiLCJkb21haW4iOiJ1YXQuaG1nd2Vic2VydmljZXMuY29tIiwi
+ZGF0ZUNyZWF0ZWQiOiIyMDI1LTA0LTA5LDA4OjUzOjAzIiwidmVyc2lvbiI6MX2ggg0_MIIENDCC
+AxygAwIBAgIIPVn4N-rR2J8wDQYJKoZIhvcNAQELBQAwczEtMCsGA1UEAwwkQXBwbGUgaVBob25l
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwHhcNMjQxMjE2MTkyMTAxWhcNMjkx
+MjExMTgxMzU5WjBZMTUwMwYDVQQDDCxBcHBsZSBpUGhvbmUgT1MgUHJvdmlzaW9uaW5nIFByb2Zp
+bGUgU2lnbmluZzETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDQkzGr-FMe360eL2T3yU3Xlr5fSz15ZFxD7inDQNL6LxygtrwR
+c-_wIrDf3vn5zlXj9UIBtSNlQRI793xGfYkTRZVE7JaVYmaXkAMA2eCuxdmxnCAtluCF7W9r01LT
+gzzUASMl6eXG1BHYeaoIwt0VWPXvipNLDUvuDbaHk3UREFXLDHgH2zdwRjuX-sTreCng9Ox442Ha
+QFeAB7uInKXHSW3IJtOVH00hoo1oc4Me5llahZZVVLCVLiXcdw1hh4GNiaQDezwAdyyJalnTZETZ
+dKVbirFSYV9uBDDU8-IQNAyVjEvhe9YrhYPyJzmNcAgj4hSI_5P0LW1MJuKLN4YtAgMBAAGjgeUw
+geIwDAYDVR0TAQH_BAIwADAfBgNVHSMEGDAWgBRv8ZUYYlzgyPHF7WwYyeDTZFKYIDBABggrBgEF
+BQcBAQQ0MDIwMAYIKwYBBQUHMAGGJGh0dHA6Ly9vY3NwLmFwcGxlLmNvbS9vY3NwMDMtYWlwY2Ew
+NzAvBgNVHR8EKDAmMCSgIqAghh5odHRwOi8vY3JsLmFwcGxlLmNvbS9haXBjYS5jcmwwHQYDVR0O
+BBYEFLy1xem9_MvQntyUsB74IZRc_wkuMA4GA1UdDwEB_wQEAwIHgDAPBgkqhkiG92NkBjoEAgUA
+MA0GCSqGSIb3DQEBCwUAA4IBAQAyNMLpd6pf4MbKovN3WeeKZ7jxUfP7sPaXv7ERo-GhPLsjkukS
+k6JxHbzxmnFvpDxvNpK24EeCopPj57iPu98lRGICz8289_uNiglweGXCGU0ly3JiIeSpaPkQmi56
+Dyi-pgMG0VVhH698-JTUcQ7i0yVUi86t1WgHW70te8diRXm5qYdM-Bg7gK4QS3HYeCvmCq-a59lN
+zOpbt6OXVWvsDaB4x8Cwz8vcEEwwkhNxlNav4OzJ6cmbziUy7hENIRcki_GVLiJiRkV_4NvXFlTB
+uT7T2oq5Zfa0tCN_eF3ZcnZkY6cIVcfZt5TbI7_zk6fUBERDDcriVrIrlCikPXKHMIIERDCCAyyg
+AwIBAgIIXGPK5Eo3U8kwDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCVVMxEzARBgNVBAoTCkFw
+cGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYwFAYDVQQD
+Ew1BcHBsZSBSb290IENBMB4XDTE3MDUxMDIxMjczMFoXDTMwMTIzMTAwMDAwMFowczEtMCsGA1UE
+AwwkQXBwbGUgaVBob25lIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYDVQQLDBdDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJRWoBDz6DBIbH_L_cXvAege4XMHNjJi7ePXokzZM-
+TzlHunW-88DS8Vmiqx_-CoY82S2aB_IOa7kpkRpfIgqL8XJYBa5MS0TFeaeAPLCI4IwMJ4RdGeWH
+GTbL48V2t7D0QXJR9AVcg0uibaZRuPEm33terWUMxrKYUYy7fRtMwU7ICMfS7WQLtN0bjU9AfRuP
+SJaSW_PQmH7ZvKQZDplhu0FdAcxbd3p9JNDc01P_w9zFlCy2Wk2OGCM5vdnGUj7R8vQliqEqh_3Y
+DEYpUf_tF2yJJWuHv4ppFJ93n8MVt2iziEW9hOYGAkFkD60qKLgVyeCsp4q6cgQ0sniM-LKFAgMB
+AAGjgewwgekwDwYDVR0TAQH_BAUwAwEB_zAfBgNVHSMEGDAWgBQr0GlHlHYJ_vRrjS5ApvdHTX8I
+XjBEBggrBgEFBQcBAQQ4MDYwNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwLmFwcGxlLmNvbS9vY3Nw
+MDMtYXBwbGVyb290Y2EwLgYDVR0fBCcwJTAjoCGgH4YdaHR0cDovL2NybC5hcHBsZS5jb20vcm9v
+dC5jcmwwHQYDVR0OBBYEFG_xlRhiXODI8cXtbBjJ4NNkUpggMA4GA1UdDwEB_wQEAwIBBjAQBgoq
+hkiG92NkBgISBAIFADANBgkqhkiG9w0BAQsFAAOCAQEAOs-smI2-kiAhCa2V87FcIfo2LVcgRHRz
+ZJIIs5as922X-ls0OCfPEkbTPBHwB8mZkLHR6BEJpeOla2xjCD-eJfrVmZxM5uXOjrJNaOyLq6Oi
+T4oRFT7cFCscxkS2b2fFW0-VKS2HXD_cgx53T-3aVKct5xOBwWPEVAsbSwpqKCII1DeSfH9nKF-v
+PT-3rFkdODRkWu4zShlCRCnEyhhr4cFTLS30TcIV9jMyGHjxJm-KTeuUTKPo_w-zA4tl2usu2GVQ
+n9yfit8xqIRU3FJSQdKyEx0xRkeIXz7uw_KMIwSV66yKPoJsBp8u44tDmmJbNA30mc8s7rpyhhkj
+pfyOtTCCBLswggOjoAMCAQICAQIwDQYJKoZIhvcNAQEFBQAwYjELMAkGA1UEBhMCVVMxEzARBgNV
+BAoTCkFwcGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYw
+FAYDVQQDEw1BcHBsZSBSb290IENBMB4XDTA2MDQyNTIxNDAzNloXDTM1MDIwOTIxNDAzNlowYjEL
+MAkGA1UEBhMCVVMxEzARBgNVBAoTCkFwcGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5MRYwFAYDVQQDEw1BcHBsZSBSb290IENBMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA5JGpCR-R2x5HUOsF7V55hC3rNqJXTFXsixmJ3vlLbPUHqyIwAugYPvhQ
+CdN_QaiY-dHKZpwkaxHQo7vkGyrDH5WeegykR4tb1BY3M8vED03OFGnRyRly9V0O1X9fm_IlA7pV
+j01dDfFkNSMVSxVZHbOU9_acns9QusFYUGePCLQg98usLCBvcLY_ATCMt0PPD5098ytJKBrI_s61
+uQ7ZXhzWyz21Oq30Dw4AkguxIRYudNU8DdtiFqujcZJHU1XBry9Bs_j743DN5qNMRX4fTGtQlkGJ
+xHRiCxCDQYczioGxMFjsWgQyjGizjx3eZXP_Z15lvEnYdp8zFGWhd5TJLQIDAQABo4IBejCCAXYw
+DgYDVR0PAQH_BAQDAgEGMA8GA1UdEwEB_wQFMAMBAf8wHQYDVR0OBBYEFCvQaUeUdgn-9GuNLkCm
+90dNfwheMB8GA1UdIwQYMBaAFCvQaUeUdgn-9GuNLkCm90dNfwheMIIBEQYDVR0gBIIBCDCCAQQw
+ggEABgkqhkiG92NkBQEwgfIwKgYIKwYBBQUHAgEWHmh0dHBzOi8vd3d3LmFwcGxlLmNvbS9hcHBs
+ZWNhLzCBwwYIKwYBBQUHAgIwgbYagbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5IGFu
+eSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
+ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRlIHBvbGljeSBhbmQgY2Vy
+dGlmaWNhdGlvbiBwcmFjdGljZSBzdGF0ZW1lbnRzLjANBgkqhkiG9w0BAQUFAAOCAQEAXDaZTC14
+t-2Mm9zzd5vydtJ3ME_BH4WDhRuZPUc38qmbQI4s1LGQEti-9HOb7tJkD8t5TzTYoj75eP9ryAfs
+fTmDi1Mg0zjEsb-aTwpr_yv8WacFCXwXQFYRHnTTt4sjO0ej1W8k4uvRt3DfD0XhJ8rxbXjt57UX
+F6jcfiI1yiXV2Q_Wa9SiJCMR96Gsj3OBYMYbWwkvkrL4REjwYDieFfU9JmcgijNq9w2Cz97roy_5
+U2pbZMBjM3f3OgcsVuvaDyEO2rpzGU-12TZ_wYdV2aeZuTJC-9jVcZ5-oVK3G72TQiQSKscPHbZN
+nF5jyEuAF1CqitXa5PzQCQc3sHV1ITGCAoUwggKBAgEBMH8wczEtMCsGA1UEAwwkQXBwbGUgaVBo
+b25lIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMCCD1Z-Dfq0difMAkGBSsOAwIa
+BQCggdwwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMjUwNDA5MDg1
+MzAzWjAjBgkqhkiG9w0BCQQxFgQUAFaGI1aIk0pvFl6XU5VvRpeio9QwKQYJKoZIhvcNAQk0MRww
+GjAJBgUrDgMCGgUAoQ0GCSqGSIb3DQEBAQUAMFIGCSqGSIb3DQEJDzFFMEMwCgYIKoZIhvcNAwcw
+DgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0G
+CSqGSIb3DQEBAQUABIIBAHdhBvowTL1e7Q-KFo3GAoa_c3I5iQH79ks6sZ9U4zu3xhpjrReRlA5d
+ORAcMvUnUT0sjDj2ISsLKzUnDXNlcPE8fqfkMI_7LYlWvnNalVtrJmL6CUheBuTKMQ_Z_lZLLI4o
+J46YUzCU9M4vpcgO6EpOQTNrqLx2sOs-V_my1p-Hig7UqdHNviX4gL4xjg7yUXNoevZ9ixPLXI4C
+aPmg5q2NCECPxS7g36hJ_gHtRC6awR8qvK3-mSZPPfMzh0sHih76h2RWcv13UHSNygn3SF0MLhsS
+5m9tf6r1sJOCAr2_ri-65d2GN1vhGXfoXQ0KFy9N2Cao3IsRs5unBb6pk5c
--- a/UAT/apple_pay.cer
+++ b/UAT/apple_pay.cer
--- a/UAT/merchant_id.cer
+++ b/UAT/merchant_id.cer
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -222,8 +222,9 @@ dependencies {
    implementation 'com.google.android.material:material:1.9.0'
    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.22'
    androidTestImplementation "androidx.test:core:1.4.0"
-    implementation 'com.airbnb.android:lottie:5.2.0'
-    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.22'
+//    implementation 'com.airbnb.android:lottie:5.2.0'
+//    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.22'
+    implementation 'com.whatsapp.otp:whatsapp-otp-android-sdk:0.1.0'

    implementation 'com.whatsapp.otp:whatsapp-otp-android-sdk:0.1.0'

--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -1,51 +1,82 @@
+<?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.ejada.hmg">
-    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
+    <!--
+         io.flutter.app.FlutterApplication is an android.app.Application that
         calls FlutterMain.startInitialization(this); in its onCreate method.
         In most cases you can leave this as-is, but you if you want to provide
         additional functionality it is fine to subclass or reimplement
-         FlutterApplication and put your custom class here. -->
-    <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" tools:node="remove"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove"/>
-<!--    <uses-permission android:name="android.permission.BLUETOOTH" tools:node="remove"/>-->
-<!--    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" tools:node="remove"/>-->
-<!--    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" tools:node="remove"/>-->
-<!--    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" tools:node="remove"/>-->
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" tools:node="remove"/>
-    <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
-<!--    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" tools:node="remove"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" tools:node="remove"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" tools:node="remove"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" tools:node="remove"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" tools:node="remove"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" tools:node="remove"/>
+         FlutterApplication and put your custom class here.
+    -->
+    <uses-permission
+        android:name="android.permission.ACTIVITY_RECOGNITION"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.READ_PHONE_STATE"
+        tools:node="remove" /> <!-- <uses-permission android:name="android.permission.BLUETOOTH" tools:node="remove"/> -->
+    <!-- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" tools:node="remove"/> -->
+    <!-- <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" tools:node="remove"/> -->
+    <!-- <uses-permission android:name="android.permission.BLUETOOTH_SCAN" tools:node="remove"/> -->
+    <uses-permission
+        android:name="android.permission.BROADCAST_STICKY"
+        tools:node="remove" />
+    <uses-permission
+        android:name="com.google.android.gms.permission.AD_ID"
+        tools:node="remove" /> <!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> -->
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"
+        tools:node="remove" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" tools:node="remove" />
-
-<!--    <uses-permission android:name="android.permission.INTERNET" />-->
-<!--    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
+    <uses-permission
+        android:name="android.permission.ACCESS_BACKGROUND_LOCATION"
+        tools:node="remove" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
+    <!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> -->
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
    <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS" />

-    <uses-feature android:name="android.hardware.sensor.stepcounter" android:required="false" tools:node="replace"/>
-    <uses-feature android:name="android.hardware.sensor.stepdetector" android:required="false" tools:node="replace"/>
+    <uses-feature
+        android:name="android.hardware.sensor.stepcounter"
+        android:required="false"
+        tools:node="replace" />
+    <uses-feature
+        android:name="android.hardware.sensor.stepdetector"
+        android:required="false"
+        tools:node="replace" />

-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-feature android:name="android.hardware.camera.autofocus"/>
-    <uses-feature android:name="android.hardware.camera" android:required="true"/>
+
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="true" />
+
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@ -53,106 +84,164 @@
    <uses-permission android:name="android.permission.READ_CALENDAR" />
    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-feature android:name="android.hardware.location.network" android:required="false" />
-    <uses-feature android:name="android.hardware.location.gps" android:required="false"  />
-    <uses-permission android:name="com.huawei.appmarket.service.commondata.permission.GET_COMMON_DATA"/>
-<!--    <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS" />-->
-

+    <uses-feature
+        android:name="android.hardware.location.network"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.location.gps"
+        android:required="false" />

-    <!--    Wifi Permissions-->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-<!--    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>-->
-    <!--  Detect Reboot Permission  -->
-<!--    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>-->
+    <uses-permission android:name="com.huawei.appmarket.service.commondata.permission.GET_COMMON_DATA" /> <!-- <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS" /> -->
+    <!-- Wifi Permissions -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <!-- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> -->
+    <!-- Detect Reboot Permission -->
+    <!-- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> -->
    <queries>
        <intent>
            <action android:name="android.speech.RecognitionService" />
        </intent>
+
+        <package android:name="com.whatsapp" />
+        <package android:name="com.whatsapp.w4b" />
    </queries>
+
    <application
        android:name=".Application"
-        android:icon="@mipmap/ic_launcher_local"
-        android:usesCleartextTraffic="true"
-        android:showOnLockScreen="true"
-        android:screenOrientation="sensorPortrait"
        android:allowBackup="false"
        android:extractNativeLibs="true"
-        tools:replace="android:extractNativeLibs,android:label"
-        android:label="Dr. Alhabib">
+        android:icon="@mipmap/ic_launcher_local"
+        android:label="Dr. Alhabib"
+        android:screenOrientation="sensorPortrait"
+        android:showOnLockScreen="true"
+        android:usesCleartextTraffic="true"
+        tools:replace="android:extractNativeLibs,android:label">
+        <activity
+            android:name="com.cloud.diplomaticquarterapp.whatsapp.WhatsAppCodeActivity"
+            android:exported="true"
+            android:enabled="true"
+            android:launchMode="standard"
+            >
+            <intent-filter>
+                <action android:name="com.whatsapp.otp.OTP_RETRIEVED" />
+            </intent-filter>
+        </activity>
+
+        <meta-data
+            android:name="push_kit_auto_init_enabled"
+            android:value="true" />

-        <meta-data android:name="push_kit_auto_init_enabled" android:value="true" />
        <activity
            android:name=".MainActivity"
            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:enabled="true"
+            android:exported="true"
            android:hardwareAccelerated="true"
            android:launchMode="singleTop"
            android:showOnLockScreen="true"
            android:theme="@style/LaunchTheme"
-            android:exported="true"
-            tools:node="merge"
-            android:windowSoftInputMode="adjustResize">
-            <!-- Specifies an Android theme to apply to this Activity as soon as
+            android:windowSoftInputMode="adjustResize"
+            tools:node="merge">
+            <meta-data
+                android:name="flutter_deeplinking_enabled"
+                android:value="true" />
+
+            <!--
+                 Specifies an Android theme to apply to this Activity as soon as
                 the Android process has started. This theme is visible to the user
                 while the Flutter UI initializes. After that, this theme continues
-                 to determine the Window background behind the Flutter UI. -->
+                 to determine the Window background behind the Flutter UI.
+            -->
            <meta-data
                android:name="io.flutter.embedding.android.NormalTheme"
                android:resource="@style/NormalTheme" />
-            <!-- Displays an Android View that continues showing the launch screen
+            <!--
+                 Displays an Android View that continues showing the launch screen
                 Drawable until Flutter paints its first frame, then this splash
                 screen fades out. A splash screen is useful to avoid any visual
                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
+                 Flutter's first frame.
+            -->
            <meta-data
                android:name="io.flutter.embedding.android.SplashScreenDrawable"
                android:resource="@drawable/launch_background" />

+
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
+
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
+<!--            <intent-filter android:autoVerify="true">-->
+<!--                <action android:name="android.intent.action.VIEW" />-->
+
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--                <category android:name="android.intent.category.BROWSABLE" />-->
+
+<!--                <data-->
+<!--                    android:host="hmg.com"-->
+<!--                    android:scheme="http" />-->
+<!--                <data-->
+<!--                    android:host="www.hmg.com"-->
+<!--                    android:scheme="http" />-->
+<!--                <data android:scheme="https" />-->
+<!--            </intent-filter>-->
            <intent-filter>
                <action android:name="FLUTTER_NOTIFICATION_CLICK" />
+
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
-        </activity>

-<!--        <receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver" android:exported="true">-->
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.BOOT_COMPLETED"/>-->
-<!--                <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>-->
-<!--            </intent-filter>-->
-<!--        </receiver>-->
+        </activity> <!-- <receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver" android:exported="true"> -->
+        <!-- <intent-filter> -->
+        <!-- <action android:name="android.intent.action.BOOT_COMPLETED"/> -->
+        <!-- <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/> -->
+        <!-- </intent-filter> -->
+        <!-- </receiver> -->
+        <!-- Geofencing -->
+        <service
+            android:name=".geofence.intent_receivers.GeofenceTransitionsJobIntentService"
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE" />

-        <!--  Geofencing  -->
-        <service android:name=".geofence.intent_receivers.GeofenceTransitionsJobIntentService" android:exported="true" android:permission="android.permission.BIND_JOB_SERVICE" />
-        <receiver android:name=".geofence.intent_receivers.GeofenceBroadcastReceiver" android:enabled="true" android:exported="false" />
-        <receiver android:name=".geofence.intent_receivers.GeofencingRebootBroadcastReceiver" android:enabled="true" android:exported="false">
+        <receiver
+            android:name=".geofence.intent_receivers.GeofenceBroadcastReceiver"
+            android:enabled="true"
+            android:exported="false" />
+        <receiver
+            android:name=".geofence.intent_receivers.GeofencingRebootBroadcastReceiver"
+            android:enabled="true"
+            android:exported="false">
            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
-                <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
            </intent-filter>
        </receiver>
-        <receiver android:name=".geofence.intent_receivers.LocationProviderChangeReceiver" android:exported="false">
+        <receiver
+            android:name=".geofence.intent_receivers.LocationProviderChangeReceiver"
+            android:exported="false">
            <intent-filter>
-                <action android:name="android.location.PROVIDERS_CHANGED"/>
+                <action android:name="android.location.PROVIDERS_CHANGED" />
            </intent-filter>
        </receiver>
-        <service android:name=".geofence.intent_receivers.ReregisterGeofenceJobService" android:exported="true" android:permission="android.permission.BIND_JOB_SERVICE" />
-        <!--  Geofencing  -->

+        <service
+            android:name=".geofence.intent_receivers.ReregisterGeofenceJobService"
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE" /> <!-- Geofencing -->
        <!--
        Huawei Push Notifications
        Set push kit auto enable to true (for obtaining the token on initialize)
        -->
-<!--        <meta-data-->
-<!--            android:name="push_kit_auto_init_enabled"-->
-<!--            android:value="true" />-->
+        <!-- <meta-data -->
+        <!-- android:name="push_kit_auto_init_enabled" -->
+        <!-- android:value="true" /> -->
        <!-- These receivers are for sending scheduled local notifications -->
-        <receiver android:name="com.huawei.hms.flutter.push.receiver.local.HmsLocalNotificationBootEventReceiver" android:exported="false">
+        <receiver
+            android:name="com.huawei.hms.flutter.push.receiver.local.HmsLocalNotificationBootEventReceiver"
+            android:exported="false">
            <intent-filter>
                <action android:name="android.intent.action.BOOT_COMPLETED" />
            </intent-filter>
@ -168,26 +257,17 @@
            <intent-filter>
                <action android:name="com.huawei.hms.flutter.push.receiver.BACKGROUND_REMOTE_MESSAGE" />
            </intent-filter>
-        </receiver>
-        <!--   Huawei Push Notifications    -->
-
-        <meta-data android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyCyDbWUM9d_sBUGIE8PcuShzPaqO08NSC8"/>
-
-
-        <!-- Don't delete the meta-data below.
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        </receiver> <!-- Huawei Push Notifications -->
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="AIzaSyCyDbWUM9d_sBUGIE8PcuShzPaqO08NSC8" />
+        <!--
+ Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java
+        -->
        <meta-data
            android:name="flutterEmbedding"
            android:value="2" />
-
    </application>

-<!--    <uses-permission android:name="android.permission.INTERNET" />-->
-<!--    <uses-permission android:name="android.permission.USE_FINGERPRINT" />-->
-<!--    <uses-permission android:name="android.permission.READ_CALENDAR" />-->
-<!--    <uses-permission android:name="android.permission.WRITE_CALENDAR" />-->
-
-
-
-</manifest>
+</manifest>
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt
@ -1,4 +1,5 @@
 package com.ejada.hmg
+import android.app.PendingIntent
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
@ -7,10 +8,14 @@ import android.view.WindowManager
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi
 import com.cloud.diplomaticquarterapp.PenguinInPlatformBridge
+import com.cloud.diplomaticquarterapp.whatsapp.AppSignatureRetriever
 import com.ejada.hmg.utils.*
 import io.flutter.embedding.android.FlutterFragmentActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugins.GeneratedPluginRegistrant
+import com.cloud.diplomaticquarterapp.whatsapp.WhatsApp
+import com.cloud.diplomaticquarterapp.whatsapp.WhatsAppOtpPlatformBridge
+

 class MainActivity: FlutterFragmentActivity() {
    @RequiresApi(Build.VERSION_CODES.O)
@ -22,8 +27,9 @@ class MainActivity: FlutterFragmentActivity() {
        PlatformBridge(flutterEngine, this).create()
        OpenTokPlatformBridge(flutterEngine, this).create()
        PenguinInPlatformBridge(flutterEngine, this).create()
-
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        WhatsAppOtpPlatformBridge(flutterEngine, this).invoke()
+        AppSignatureRetriever().logSignatures(this)
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {x
 //            val mChannel = NotificationChannel("video_call_noti", "video call", NotificationManager.IMPORTANCE_HIGH)
 //            val soundUri = Uri.parse("android.resource://" + getApplicationContext()
 //                    .getPackageName() + "/" + R.raw.alert)
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/PenguinInPlatformBridge.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/PenguinInPlatformBridge.kt
@ -1,4 +1,5 @@
 package com.cloud.diplomaticquarterapp
+
 import com.ejada.hmg.MainActivity
 import android.os.Build
 import android.util.Log
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/whatsapp/AppSignatureRetriever.java
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/whatsapp/AppSignatureRetriever.java
@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.cloud.diplomaticquarterapp.whatsapp;
+
+import static java.sql.DriverManager.println;
+
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.pm.PackageManager;
+import android.content.pm.Signature;
+import android.util.Base64;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+public class AppSignatureRetriever {
+
+  private static final String HASH_TYPE = "SHA-256";
+  public static final int NUM_HASHED_BYTES = 9;
+  public static final int NUM_BASE64_CHAR = 11;
+
+
+  public void logSignatures(Context context) {
+    Collection<String> appSignatures = getAppSignatures(context);
+    appSignatures.forEach(signature -> println("Signature: " + signature));
+  }
+
+  /**
+   * Get all the app signatures for the current package.
+   *
+   * @return signatures for current app
+   */
+  public Collection<String> getAppSignatures(Context context) {
+    try {
+      // Get all package signatures for the current package
+      String packageName = context.getPackageName();
+      println("Package name: " + packageName);
+      PackageManager packageManager = context.getPackageManager();
+      Signature[] signatures = packageManager.getPackageInfo(packageName,
+          PackageManager.GET_SIGNATURES).signatures;
+
+      // For each signature create a compatible hash
+      Collection<String> appCodes = Arrays.stream(signatures)
+          .map(signature -> hash(packageName, signature.toCharsString()))
+          .collect(Collectors.toList());
+      return appCodes;
+    } catch (PackageManager.NameNotFoundException e) {
+      println("Unable to find package to obtain hash.");
+      throw new RuntimeException("Unable to find package to obtain hash.", e);
+    }
+
+  }
+
+  private String hash(String packageName, String signature) {
+    String appInfo = packageName + " " + signature;
+    try {
+      MessageDigest messageDigest = MessageDigest.getInstance(HASH_TYPE);
+      messageDigest.update(appInfo.getBytes(StandardCharsets.UTF_8));
+      byte[] hashSignature = messageDigest.digest();
+
+      // truncated into NUM_HASHED_BYTES
+      hashSignature = Arrays.copyOfRange(hashSignature, 0, NUM_HASHED_BYTES);
+      // encode into Base64
+      String base64Hash = Base64.encodeToString(hashSignature, Base64.NO_PADDING | Base64.NO_WRAP);
+      base64Hash = base64Hash.substring(0, NUM_BASE64_CHAR);
+
+     println(String.format("pkg: %s -- hash: %s", packageName, base64Hash));
+      return base64Hash;
+    } catch (NoSuchAlgorithmException e) {
+      throw new RuntimeException("Unable to generate hash for application", e);
+    }
+  }
+}
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/whatsapp/WhatsApp.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/whatsapp/WhatsApp.kt
@ -14,7 +14,11 @@ object WhatsApp {
            intent,
            // call your function to validate
            {code -> validateOTP(code) },
-            {_,_->})
+            {error,exception->
+                println("the error is ${error.name}")
+                println("the exception stacktrace is ${exception.message}")
+                println("the exception is cause ${exception.cause}")
+            })


    fun performHandShake(context : WeakReference<Context>)  = whatsAppOtpHandler.sendOtpIntentToWhatsApp(context.get()!!)
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/whatsapp/WhatsAppCodeActivity.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/whatsapp/WhatsAppCodeActivity.kt
@ -0,0 +1,17 @@
+package com.cloud.diplomaticquarterapp.whatsapp
+import android.app.PendingIntent
+import android.content.Intent
+import android.os.Bundle
+import com.cloud.diplomaticquarterapp.whatsapp.WhatsApp
+import com.cloud.diplomaticquarterapp.whatsapp.WhatsAppOtpPlatformBridge
+import io.flutter.embedding.android.FlutterFragmentActivity
+
+class WhatsAppCodeActivity : FlutterFragmentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        WhatsApp.handleOTP(intent){code ->
+            WhatsAppOtpPlatformBridge.result?.success(code);
+            finish()
+        }
+    }
+}
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/whatsapp/WhatsAppOtpPlatformBridge.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/whatsapp/WhatsAppOtpPlatformBridge.kt
@ -0,0 +1,48 @@
+package com.cloud.diplomaticquarterapp.whatsapp
+
+import com.ejada.hmg.MainActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import java.lang.ref.WeakReference
+
+class WhatsAppOtpPlatformBridge(
+    private var flutterEngine: FlutterEngine,
+    private var mainActivity: MainActivity
+) {
+
+
+    private lateinit var channel: MethodChannel
+
+    companion object {
+        private const val CHANNEL = "whats_app_otp"
+        var result: MethodChannel.Result? = null
+    }
+
+    fun invoke() {
+        channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
+        channel.setMethodCallHandler { call: MethodCall, result: MethodChannel.Result ->
+            when (call.method) {
+                "isWhatsAppInstalled" -> {
+                    val isAppInstalled =
+                        WhatsApp.isWhatsAppInstalled(WeakReference(mainActivity))
+                    result.success(isAppInstalled)
+                }
+
+                "performHandShake" -> {
+                    WhatsApp.performHandShake(WeakReference(mainActivity))
+                }
+
+
+                "startListening" -> {
+                    WhatsAppOtpPlatformBridge.result = result
+                }
+
+                else -> {
+                    result.notImplemented()
+                }
+
+            }
+        }
+    }
+}
--- a/android/app/src/main/res/layout/activity_whats_app_code.xml
+++ b/android/app/src/main/res/layout/activity_whats_app_code.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.cloud.diplomaticquarterapp.whatsapp.WhatsAppCodeActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@ -1,23 +1,23 @@
 <resources>
-  <string name="app_name">HMG Patient App</string>
+    <string name="app_name">HMG Patient App</string>

-  <string name="geofence_unknown_error">
+    <string name="geofence_unknown_error">
    Unknown error: the Geofence service is not available now.
  </string>
-  <string name="geofence_not_available">
+    <string name="geofence_not_available">
    Geofence service is not available now. Go to Settings>Location>Mode and choose High accuracy.
  </string>
-  <string name="geofence_too_many_geofences">
+    <string name="geofence_too_many_geofences">
    Your app has registered too many geofences.
  </string>
-  <string name="geofence_too_many_pending_intents">
+    <string name="geofence_too_many_pending_intents">
    You have provided too many PendingIntents to the addGeofences() call.
  </string>
-  <string name="GEOFENCE_INSUFFICIENT_LOCATION_PERMISSION">
+    <string name="GEOFENCE_INSUFFICIENT_LOCATION_PERMISSION">
    App do not have permission to access location service.
  </string>
-  <string name="GEOFENCE_REQUEST_TOO_FREQUENT">
+    <string name="GEOFENCE_REQUEST_TOO_FREQUENT">
    Geofence requests happened too frequently.
  </string>
-  <string name="mapbox_access_token" translatable="false">sk.eyJ1IjoicndhaWQiLCJhIjoiY2x6NWo0bTMzMWZodzJrcGZpemYzc3Z4dSJ9.uSSZuwNSGCcCdPAiORECmg</string>
+    <string name="mapbox_access_token" translatable="false">sk.eyJ1IjoicndhaWQiLCJhIjoiY2x6NWo0bTMzMWZodzJrcGZpemYzc3Z4dSJ9.uSSZuwNSGCcCdPAiORECmg</string>
 </resources>
--- a/android/build.gradle
+++ b/android/build.gradle
@ -37,6 +37,7 @@ buildscript {

    dependencies {
        classpath 'com.android.tools.build:gradle:7.1.3'
+//        classpath 'com.android.tools.build:gradle:8.2.1'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath 'com.google.gms:google-services:4.3.8'
 //        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
--- a/android/settings.gradle
+++ b/android/settings.gradle
@ -1,6 +1,6 @@
 include ':app'
 include ':vital-sign-engine'
-project(':vital-sign-engine').projectDir = new File('../packages/vital_sign_camera/android/libs')
+project(':vital-sign-engine').projectDir = new File('/Users/mohamedmekawy/Documents/Work/DiplomaticQuarter_3.16/packages/vital_sign_camera/android/libs')

 def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()

--- a/assets/fonts/sar-Regular.otf
+++ b/assets/fonts/sar-Regular.otf
--- a/assets/fonts/saudi_riyal.eot
+++ b/assets/fonts/saudi_riyal.eot
--- a/assets/fonts/saudi_riyal.ttf
+++ b/assets/fonts/saudi_riyal.ttf
--- a/assets/fonts/saudi_riyal.woff
+++ b/assets/fonts/saudi_riyal.woff
--- a/assets/fonts/saudi_riyal.woff2
+++ b/assets/fonts/saudi_riyal.woff2
--- a/assets/images/checkmark.png
+++ b/assets/images/checkmark.png
--- a/assets/images/crossmark.png
+++ b/assets/images/crossmark.png
--- a/assets/images/new/Indoor_nav_appo.svg
+++ b/assets/images/new/Indoor_nav_appo.svg
@ -0,0 +1,9 @@
+<svg id="route" xmlns="http://www.w3.org/2000/svg" width="27.521" height="27.521" viewBox="0 0 27.521 27.521">
+  <path id="Path_5246" data-name="Path 5246" d="M365.087,11.9a.806.806,0,0,0,1.457,0l2.916-6.138a4.034,4.034,0,1,0-7.288,0Zm.728-8.678a.806.806,0,1,1-.806.806A.806.806,0,0,1,365.815,3.225Z" transform="translate(-342.332)" fill="#28323a"/>
+  <ellipse id="Ellipse_225" data-name="Ellipse 225" cx="1.5" cy="1" rx="1.5" ry="1" transform="translate(14 21.522)" fill="#28323a"/>
+  <path id="Path_5247" data-name="Path 5247" d="M175.628,205.644a2.016,2.016,0,0,1,0-4.031h8.315L183.177,200h-7.549a3.628,3.628,0,0,0,0,7.257h4.537a3.235,3.235,0,0,1,0-1.613Z" transform="translate(-162.754 -189.249)" fill="#28323a"/>
+  <circle id="Ellipse_226" data-name="Ellipse 226" cx="1.5" cy="1.5" r="1.5" transform="translate(19 15.522)" fill="#28323a"/>
+  <path id="Path_5248" data-name="Path 5248" d="M350.39,305h-.183a3.236,3.236,0,0,1,0,1.613h.183a2.069,2.069,0,0,1,0,4.139H345.1a3.236,3.236,0,0,1,0,1.613h5.289a3.682,3.682,0,0,0,0-7.364Z" transform="translate(-326.551 -288.605)" fill="#28323a"/>
+  <path id="Path_5249" data-name="Path 5249" d="M167.02,412l.706,1.613h2.621a3.235,3.235,0,0,1,0-1.613Z" transform="translate(-158.042 -389.854)" fill="#28323a"/>
+  <path id="Path_5250" data-name="Path 5250" d="M5.311,322.415a.806.806,0,0,0-1.477,0l-3.763,8.6a.806.806,0,0,0,1.139,1.023l3.363-1.922,3.363,1.922a.806.806,0,0,0,1.139-1.023Z" transform="translate(0 -304.627)" fill="#28323a"/>
+</svg>
--- a/assets/images/new/NFC_Hold.svg
+++ b/assets/images/new/NFC_Hold.svg
@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M27.2568 32L25.1631 30.6091C27.9468 26.2666 29.4463 21.2154 29.4998 15.9999C29.4463 10.7844 27.9468 5.73315 25.1631 1.39067L27.2568 0C30.304 4.75302 31.9441 10.2814 31.9998 15.9875L32 16.0001L31.9998 16.0128C31.9441 21.7186 30.304 27.247 27.2568 32ZM25.0625 16.0165L25.0627 15.9999L25.0625 15.983C25.0051 11.5525 23.6995 7.27342 21.2869 3.60788L19.2097 5.02439C21.3494 8.27467 22.5085 12.0694 22.5625 15.9999C22.5085 19.9301 21.3494 23.7248 19.2097 26.9751L21.2869 28.3916C23.6995 24.7263 25.0051 20.447 25.0625 16.0165ZM16.7007 22.9666C17.719 20.7477 18.2334 18.3302 18.188 15.9748C18.1284 12.8761 17.1565 9.86638 15.3779 7.27168L13.3276 8.72795C14.822 10.9081 15.6384 13.4313 15.6885 16.0247C15.7163 17.4783 15.4875 18.9644 15.0205 20.3943L1.56543 9.86414L0.925293 11.3547C0.887451 11.4427 0 13.5424 0 16.4452C0 19.4569 1.69165 22.1483 1.76367 22.2614L3.86157 20.8772C3.8479 20.8558 2.5 18.6766 2.5 16.4452C2.5 15.5068 2.61401 14.6693 2.75073 14.0018L16.0413 24.4033L16.7007 22.9666Z" fill="#2E303A"/>
+</svg>
--- a/assets/images/new/Saudi_Riyal_Symbol.svg
+++ b/assets/images/new/Saudi_Riyal_Symbol.svg
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1124.14 1256.39">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #231f20;
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M699.62,1113.02h0c-20.06,44.48-33.32,92.75-38.4,143.37l424.51-90.24c20.06-44.47,33.31-92.75,38.4-143.37l-424.51,90.24Z"/>
+  <path class="cls-1" d="M1085.73,895.8c20.06-44.47,33.32-92.75,38.4-143.37l-330.68,70.33v-135.2l292.27-62.11c20.06-44.47,33.32-92.75,38.4-143.37l-330.68,70.27V66.13c-50.67,28.45-95.67,66.32-132.25,110.99v403.35l-132.25,28.11V0c-50.67,28.44-95.67,66.32-132.25,110.99v525.69l-295.91,62.88c-20.06,44.47-33.33,92.75-38.42,143.37l334.33-71.05v170.26l-358.3,76.14c-20.06,44.47-33.32,92.75-38.4,143.37l375.04-79.7c30.53-6.35,56.77-24.4,73.83-49.24l68.78-101.97v-.02c7.14-10.55,11.3-23.27,11.3-36.97v-149.98l132.25-28.11v270.4l424.53-90.28Z"/>
+</svg>
--- a/assets/images/new/download_1.svg
+++ b/assets/images/new/download_1.svg
@ -0,0 +1,5 @@
+<svg id="Download" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+    <path
+        class="color000000 svgShape"
+        d="M1344 1344q0-26-19-45t-45-19-45 19-19 45 19 45 45 19 45-19 19-45zm256 0q0-26-19-45t-45-19-45 19-19 45 19 45 45 19 45-19 19-45zm128-224v320q0 40-28 68t-68 28H160q-40 0-68-28t-28-68v-320q0-40 28-68t68-28h465l135 136q58 56 136 56t136-56l136-136h464q40 0 68 28t28 68zm-325-569q17 41-14 70l-448 448q-18 19-45 19t-45-19L403 621q-31-29-14-70 17-39 59-39h256V64q0-26 19-45t45-19h256q26 0 45 19t19 45v448h256q42 0 59 39z" fill="#ffffff"></path>
+</svg>
--- a/assets/images/new/facial-recognition.svg
+++ b/assets/images/new/facial-recognition.svg
@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Capa_1" version="1.1" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg">
-    <!-- Generator: Adobe Illustrator 29.2.1, SVG Export Plug-In . SVG Version: 2.1.0 Build 116)  -->
-    <defs>
-        <style>
-            .st0 {
-            fill: #d12127;
-            }
-        </style>
-    </defs>
-    <path class="st0"
-        d="M8.5,119.5c2.3,0,4.4-.9,6-2.5s2.5-3.8,2.5-6V25.6c0-4.7,3.8-8.5,8.5-8.5h85.3c4.7,0,8.5-3.8,8.5-8.5s-3.8-8.5-8.5-8.5H25.6C11.5,0,0,11.5,0,25.6v85.3c0,2.3.9,4.4,2.5,6,1.6,1.6,3.8,2.5,6,2.5Z" />
-    <path class="st0"
-        d="M486.4,0h-85.3c-4.7,0-8.5,3.8-8.5,8.5s3.8,8.5,8.5,8.5h85.3c4.7,0,8.5,3.8,8.5,8.5v85.3c0,4.7,3.8,8.5,8.5,8.5s8.5-3.8,8.5-8.5V25.6c0-14.1-11.5-25.6-25.6-25.6Z" />
-    <path class="st0"
-        d="M503.5,392.5c-2.3,0-4.4.9-6,2.5-1.6,1.6-2.5,3.8-2.5,6v85.3c0,4.7-3.8,8.5-8.5,8.5h-85.3c-4.7,0-8.5,3.8-8.5,8.5s3.8,8.5,8.5,8.5h85.3c14.1,0,25.6-11.5,25.6-25.6v-85.3c0-2.3-.9-4.4-2.5-6-1.6-1.6-3.8-2.5-6-2.5Z" />
-    <path class="st0"
-        d="M110.9,494.9H25.6c-4.7,0-8.5-3.8-8.5-8.5v-85.3c0-4.7-3.8-8.5-8.5-8.5s-8.5,3.8-8.5,8.5v85.3c0,14.1,11.5,25.6,25.6,25.6h85.3c4.7,0,8.5-3.8,8.5-8.5s-3.8-8.5-8.5-8.5Z" />
-    <path
-        d="M503.5,162.1h-86.4c-.5-16.5-4-32.7-10.1-48-17.5-35.6-69.2-88.5-139.6-88.5h-22.7c-70.5,0-122.1,52.9-139.6,88.5-6.1,15.3-9.6,31.6-10.1,48H8.5c-4.7,0-8.5,3.8-8.5,8.5s3.8,8.5,8.5,8.5h85.5c-.2,6.3-.2,12.4-.2,18.4-1.6-.5-3.1-.9-4.8-1.1-8.2-1-16.4,1.8-22.1,7.7-6.7,8.6-9.1,19.8-6.5,30.4,2.2,11.5,5.4,22.7,9.6,33.6l1.4,4.2c1,2.9,1.9,6,2.7,9.1,1.9,8.6,5.2,16.7,9.9,24.1,3.7,5.7,9.8,9.4,16.6,10.1.4,0,.8,0,1.3,0s.8,0,1.2-.1c.6,7.8.9,14.8.9,19.9,0,29.2,27.5,64.9,43.7,81.4,9.4,9.1,19.2,17.7,29.5,25.7,9.8,7.7,19.2,15.8,28.2,24.5,10.1,11.2,24.1,18,39.1,19.3h22.7c15-1.2,29-8.1,39.1-19.3,9-8.6,18.4-16.8,28.2-24.5,10.3-8.1,20.2-16.6,29.6-25.8,16.2-16.5,43.7-52.2,43.7-81.3s.4-12.1.9-19.9c.4,0,.8.1,1.2.1s.9,0,1.3,0c6.8-.7,12.8-4.4,16.6-10.1,4.7-7.4,8-15.5,9.9-24.1.9-3.1,1.7-6.2,2.7-9.1l1.5-4.2c4.1-10.9,7.4-22.1,9.6-33.6,2.6-10.6.3-21.8-6.5-30.4-5.7-5.9-13.9-8.7-22.1-7.7-1.6.2-3.2.6-4.7,1.1,0-5.9,0-12.1-.2-18.4h85.5c4.7,0,8.5-3.8,8.5-8.5s-3.8-8.5-8.5-8.5ZM98.1,295.6c-3.4-5.8-5.9-12.1-7.3-18.7-1-3.5-1.9-6.9-3.1-10.1l-1.5-4.2c-3.8-10-6.8-20.3-8.9-30.9-1.5-5.2-.9-10.7,1.7-15.4,2.1-2.2,5.1-3.2,8.1-2.9,2.7.4,5.2,1.6,7.1,3.4.6,15.3,1.5,26.3,1.7,27.7,0,.4,3.4,28.1,5.8,54.1-1.6-.5-2.9-1.6-3.7-3ZM111.6,210.9c-.1-.2-.3-.3-.4-.5-.3-9.8-.3-20.6,0-31.3h16.8v27.8l-16.4,4.1s0-.1,0-.1ZM136.5,375.3c-8.5-11.7-13.8-25.4-15.3-39.7,0-7.9-.8-19.7-1.9-32.3,0-.5,0-1-.1-1.5-1.8-20.5-4.3-42.5-5.6-52.9l22.8,27.4v99.1ZM117.8,227.1l19.2-4.8,60.4,7.5,5.8,34.7h-54.2l-31.2-37.4ZM145.1,206.1v-26.9h28.8l16.2,32.5-45-5.6ZM193,179.2h42.5l-28.3,28.5-14.2-28.5ZM153.6,291.9l48.2,42.1-18.3,24.4h-29.9v-66.5ZM165.3,409.9c-1.8-1.7-3.6-3.4-5.3-5-2-2.1-4.2-4.4-6.4-7v-22.5h29.9l16.2,21.6-34.4,12.9ZM217.8,455.1c-9.4-9.1-19.3-17.7-29.6-25.8-2.7-2.2-5.5-4.5-8.2-6.7l29.5-11,31.8,57.2c-9-2.1-17.2-6.9-23.5-13.7ZM247.5,444.9l-19.6-35.3h19.6v35.3ZM247.5,392.5h-29.9l-19.2-25.6,19.2-25.6h29.9v51.2ZM247.5,324.3h-30.9l-48.8-42.7h43.3l36.3,14.5v28.1h0ZM247.5,277.7l-26.5-10.6-7-42.1,33.5-33.7v86.4h0ZM112.1,162.1c.4-13.9,3.2-27.6,8.3-40.5,15-30.5,62.1-79,124.3-79h22.7c62.2,0,109.3,48.4,124.3,79,5,12.9,7.8,26.6,8.3,40.5H112.1ZM366.9,179.2v26.9l-45,5.6,16.2-32.5h28.8ZM264.5,324.3v-28.1l36.3-14.5h43.3l-48.8,42.7h-30.9ZM313.6,366.9l-19.2,25.6h-29.9v-51.2h29.9l19.2,25.6ZM264.5,277.7v-86.4l33.5,33.7-7,42.1-26.5,10.6ZM276.5,179.2h42.5l-14.2,28.5-28.3-28.5ZM264.5,444.9v-35.3h19.6l-19.6,35.3ZM323.8,429.4h0c-10.3,8.1-20.2,16.7-29.6,25.8-6.3,6.8-14.5,11.6-23.5,13.7l31.8-57.2,29.5,11c-2.7,2.2-5.5,4.5-8.2,6.7ZM358.4,398c-2.2,2.5-4.4,4.9-6.4,6.9-1.6,1.7-3.4,3.4-5.3,5l-34.4-12.9,16.2-21.6h29.9v22.5ZM358.4,358.4h-29.9l-18.3-24.4,48.2-42.1v66.5h0ZM362.9,264.5h-54.2l5.8-34.7,60.4-7.5,19.2,4.8-31.2,37.4ZM392.8,301.7c0,.5-.1,1-.1,1.5-1.1,12.6-1.9,24.4-1.9,32.3-1.5,14.4-6.8,28.1-15.3,39.7v-99.1l22.8-27.4c-1.3,10.6-3.8,32.5-5.6,52.9ZM400.8,210.5c-.1.2-.3.3-.4.5,0,0,0,.1,0,.1l-16.4-4.1v-27.8h16.8c.3,10.7.3,21.4,0,31.3ZM424.8,213.4h0c3-.4,6,.7,8.1,2.8,2.6,4.7,3.2,10.3,1.7,15.5-2.1,10.5-5,20.8-8.9,30.8l-1.5,4.2c-1.1,3.3-2.1,6.7-3,10.1-1.4,6.6-3.8,12.9-7.3,18.7-.8,1.4-2.2,2.5-3.8,3,2.4-26.1,5.8-53.8,5.9-54.4.1-1.3,1.1-12.2,1.6-27.4,2-1.8,4.4-3,7.1-3.4Z" />
-</svg>
--- a/assets/images/new/hourglass.svg
+++ b/assets/images/new/hourglass.svg
@ -0,0 +1,3 @@
+<svg width="22" height="29" viewBox="0 0 22 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.5498 11.4402C17.4647 9.69433 20.0542 7.33316 20.2903 1.69231H22V0H0V1.69231H1.70974C1.94576 7.33316 4.53533 9.69433 6.45023 11.4402C7.73475 12.6113 8.46154 13.3281 8.46154 14.441C8.46154 15.5539 7.73475 16.2707 6.45023 17.4419C4.53533 19.1877 1.94576 21.5489 1.70974 27.1897H0V28.8821H22V27.1897H20.2903C20.0542 21.5489 17.4647 19.1877 15.5498 17.4419C14.2653 16.2707 13.5385 15.5539 13.5385 14.441C13.5385 13.3281 14.2653 12.6113 15.5498 11.4402ZM10.1538 20.7837C9.8925 20.8376 9.63431 20.9161 9.38232 21.0203L4.19952 23.165C5.0459 21.0129 6.40911 19.7695 7.5904 18.6925C8.9087 17.4906 10.1538 16.3553 10.1538 14.441V20.7837ZM14.4096 18.6925C15.5909 19.7695 16.954 21.0129 17.8005 23.1649L12.6177 21.0203C12.3657 20.916 12.1075 20.8376 11.8462 20.7836V14.441C11.8462 16.3553 13.0913 17.4906 14.4096 18.6925ZM4.16979 5.64103C3.76065 4.57493 3.47809 3.2877 3.40413 1.69231H18.5958C18.5219 3.2877 18.2394 4.57493 17.8302 5.64103H4.16979Z" fill="#2E303A"/>
+</svg>
--- a/assets/images/new/indoor_nav_home.svg
+++ b/assets/images/new/indoor_nav_home.svg
@ -1,23 +1,11 @@
-<svg height="31" viewBox="0 0 31 31" width="31" xmlns="http://www.w3.org/2000/svg">
-    <g id="route" transform="translate(0 0)">
-        <path d="M365.505,13.407a.908.908,0,0,0,1.641,0l3.284-6.914a4.544,4.544,0,1,0-8.209,0Zm.82-9.774a.908.908,0,1,1-.908.908A.908.908,0,0,1,366.326,3.633Z" data-name="Path 5246"
-            fill="#da4a54"
-            id="Path_5246" transform="translate(-339.874)" />
-        <circle cx="1.5" cy="1.5" data-name="Ellipse 225" fill="#2e303a" id="Ellipse_225"
-            r="1.5" transform="translate(16 24)" />
-        <path d="M176.087,206.357a2.27,2.27,0,0,1,0-4.541h9.366L184.59,200h-8.5a4.087,4.087,0,0,0,0,8.174h5.11a3.644,3.644,0,0,1,0-1.816Z" data-name="Path 5247"
-            fill="#2e303a"
-            id="Path_5247" transform="translate(-161.586 -187.891)" />
-        <circle cx="2" cy="2" data-name="Ellipse 226" fill="#2e303a" id="Ellipse_226"
-            r="2" transform="translate(21 17)" />
-        <path d="M351.059,305h-.206a3.644,3.644,0,0,1,0,1.816h.206a2.331,2.331,0,0,1,0,4.662H345.1a3.645,3.645,0,0,1,0,1.816h5.958a4.147,4.147,0,0,0,0-8.295Z" data-name="Path 5248"
-            fill="#2e303a"
-            id="Path_5248" transform="translate(-324.206 -286.533)" />
-        <path d="M167.02,412l.795,1.816h2.952a3.644,3.644,0,0,1,0-1.816Z" data-name="Path 5249"
-            fill="#2e303a"
-            id="Path_5249" transform="translate(-156.907 -387.055)" />
-        <path d="M5.982,322.476a.908.908,0,0,0-1.664,0L.08,332.164a.908.908,0,0,0,1.283,1.153l3.788-2.164,3.788,2.164a.908.908,0,0,0,1.283-1.153Z" data-name="Path 5250"
-            fill="#2e303a"
-            id="Path_5250" transform="translate(0 -302.44)" />
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="31" height="31" viewBox="0 0 31 31">
+  <g id="route" transform="translate(0 0)">
+    <path id="Path_5246" data-name="Path 5246" d="M365.505,13.407a.908.908,0,0,0,1.641,0l3.284-6.914a4.544,4.544,0,1,0-8.209,0Zm.82-9.774a.908.908,0,1,1-.908.908A.908.908,0,0,1,366.326,3.633Z" transform="translate(-339.874)" fill="#da4a54"/>
+    <circle id="Ellipse_225" data-name="Ellipse 225" cx="1.5" cy="1.5" r="1.5" transform="translate(16 24)" fill="#2e303a"/>
+    <path id="Path_5247" data-name="Path 5247" d="M176.087,206.357a2.27,2.27,0,0,1,0-4.541h9.366L184.59,200h-8.5a4.087,4.087,0,0,0,0,8.174h5.11a3.644,3.644,0,0,1,0-1.816Z" transform="translate(-161.586 -187.891)" fill="#2e303a"/>
+    <circle id="Ellipse_226" data-name="Ellipse 226" cx="2" cy="2" r="2" transform="translate(21 17)" fill="#2e303a"/>
+    <path id="Path_5248" data-name="Path 5248" d="M351.059,305h-.206a3.644,3.644,0,0,1,0,1.816h.206a2.331,2.331,0,0,1,0,4.662H345.1a3.645,3.645,0,0,1,0,1.816h5.958a4.147,4.147,0,0,0,0-8.295Z" transform="translate(-324.206 -286.533)" fill="#2e303a"/>
+    <path id="Path_5249" data-name="Path 5249" d="M167.02,412l.795,1.816h2.952a3.644,3.644,0,0,1,0-1.816Z" transform="translate(-156.907 -387.055)" fill="#2e303a"/>
+    <path id="Path_5250" data-name="Path 5250" d="M5.982,322.476a.908.908,0,0,0-1.664,0L.08,332.164a.908.908,0,0,0,1.283,1.153l3.788-2.164,3.788,2.164a.908.908,0,0,0,1.283-1.153Z" transform="translate(0 -302.44)" fill="#2e303a"/>
+  </g>
 </svg>
--- a/assets/images/new/tap.svg
+++ b/assets/images/new/tap.svg
@ -0,0 +1,3 @@
+<svg width="23" height="29" viewBox="0 0 23 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19.2821 9.01172C18.9238 9.01172 18.5814 9.08629 18.2671 9.22183C17.9481 7.9542 16.8772 7.01953 15.6088 7.01953C14.9039 7.01953 14.2599 7.3082 13.7722 7.78227C13.2844 7.3082 12.6405 7.01953 11.9356 7.01953C11.6137 7.01953 11.3046 7.0797 11.0173 7.1902V3.96484C11.0173 2.31711 9.78138 0.976562 8.2623 0.976562C6.74323 0.976562 5.50736 2.31711 5.50736 3.96484V12.7547C5.06406 12.2739 4.70028 11.8793 4.70028 11.8793C3.68187 10.7746 2.03312 10.7115 0.9489 11.7334C-0.14065 12.7546 -0.316355 14.5345 0.548882 15.7856C0.558678 15.7998 0.568841 15.8136 0.57937 15.8272L4.66385 21.1185C5.1074 21.6931 5.74741 22.0491 6.31205 22.3632C6.72296 22.5918 7.34399 22.9373 7.34399 23.1565V26.0117C7.34399 27.6595 8.57986 29 10.0989 29H17.4455C18.9645 29 20.2004 27.6595 20.2004 26.0117V23.9531C20.2004 23.5591 20.5492 23.0843 20.9185 22.5818C21.4428 21.8683 22.037 21.0596 22.037 19.9688V12C22.037 10.3523 20.8012 9.01172 19.2821 9.01172ZM19.4823 21.3401C18.958 22.0536 18.3638 22.8623 18.3638 23.9531V26.0117C18.3638 26.561 17.9518 27.0078 17.4455 27.0078H10.0989C9.59258 27.0078 9.18062 26.561 9.18062 26.0117V23.1564C9.18062 21.72 8.00707 21.0672 7.1501 20.5904C6.72064 20.3515 6.2766 20.1046 6.072 19.8395L2.006 14.572C1.73131 14.1561 1.79259 13.5755 2.15165 13.2389C2.51304 12.8982 3.06213 12.9197 3.4016 13.2879C3.4016 13.2879 5.62662 15.7015 5.77685 15.8641C6.35294 16.4878 7.34393 16.0456 7.34393 15.1591V3.96484C7.34393 3.4156 7.75588 2.96875 8.26224 2.96875C8.7686 2.96875 9.18056 3.4156 9.18056 3.96484V12C9.18056 12.5501 9.59172 12.9961 10.0989 12.9961C10.606 12.9961 11.0172 12.5501 11.0172 12V10.0078C11.0172 9.45857 11.4291 9.01172 11.9355 9.01172C12.4419 9.01172 12.8538 9.45857 12.8538 10.0078V12C12.8538 12.5501 13.265 12.9961 13.7721 12.9961C14.2793 12.9961 14.6905 12.5501 14.6905 12V10.0078C14.6905 9.45857 15.1024 9.01172 15.6088 9.01172C16.1151 9.01172 16.5271 9.45857 16.5271 10.0078V12C16.5271 12.5501 16.9382 12.9961 17.4454 12.9961C17.9526 12.9961 18.3637 12.5501 18.3637 12C18.3637 11.4508 18.7757 11.0039 19.282 11.0039C19.7884 11.0039 20.2003 11.4508 20.2003 12V19.9688H20.2004C20.2004 20.3628 19.8516 20.8375 19.4823 21.3401Z" fill="#2E303A"/>
+</svg>
--- a/assets/images/new/waitingAppo.svg
+++ b/assets/images/new/waitingAppo.svg
@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="31" height="31" viewBox="0 0 31 31">
+  <g id="Group_8325" data-name="Group 8325" transform="translate(-75 -236)">
+    <circle id="Ellipse_223" data-name="Ellipse 223" cx="15.5" cy="15.5" r="15.5" transform="translate(75 236)" fill="#359846"/>
+    <path id="hour-glass" d="M8.73,10.811a1.46,1.46,0,0,0,0-2.122L8.647,8.61C7.085,7.119,5.878,5.968,5.515,3.556A1.413,1.413,0,0,1,6.992,2h7.091A1.413,1.413,0,0,1,15.56,3.556C15.2,5.968,13.99,7.119,12.429,8.61l-.083.079a1.46,1.46,0,0,0,0,2.122l.083.079c1.562,1.491,2.768,2.642,3.132,5.054A1.413,1.413,0,0,1,14.083,17.5H6.992a1.413,1.413,0,0,1-1.477-1.556c.364-2.412,1.57-3.563,3.132-5.054Zm.529,1.316-.006,0c-1.19,1.064-2.076,1.856-2.191,3.816a.363.363,0,0,0,.13.3.382.382,0,0,0,.247.09h6.194a.382.382,0,0,0,.282-.122.361.361,0,0,0,.1-.268c-.115-1.959-1-2.752-2.191-3.816-.315-.281-.651-.582-1-.928a.4.4,0,0,0-.569,0c-.347.344-.681.643-.993.923Z" transform="translate(80.35 241.75)" fill="#fff" fill-rule="evenodd"/>
+  </g>
+</svg>
--- a/assets/images/svg/HMC.svg
+++ b/assets/images/svg/HMC.svg
@ -0,0 +1,8 @@
+<svg data-name="Group 8404" height="26" id="Group_8404" viewBox="0 0 26 26"
+    width="26" xmlns="http://www.w3.org/2000/svg">
+    <rect data-name="Rectangle 17531" fill="#69a6e2" height="26" id="Rectangle_17531" rx="4"
+        width="26" />
+    <path d="M2.914,17.807s.731-.005,1.246-.005l3.9.019c.466,0,.854-.488.876-1.193l0-3.213c0-.685.311-1.221.793-1.252l1.2-.009c.483.029.814.572.814,1.253l0,3.231c.021.7.346,1.165.814,1.165l5.254.014.01-3.971c0-.683-.333-1.214-.82-1.245l-2.11-.01c-.467,0-.834-.486-.854-1.191l-.008-1.074c.023-.7.392-1.189.86-1.189l2.122.006c.482-.031.8-.592.8-1.274l.005-4.957a2.126,2.126,0,0,1-.693.69,2.164,2.164,0,0,1-.933.312l-3.569,0c-.465,0-.854.5-.876,1.2V8.295c-.022.7-.387,1.2-.854,1.2l-1.08-.008c-.468,0-.842-.482-.864-1.183l0-3.218c-.021-.705-.392-1.178-.859-1.178l-5.179,0V7.87c0,.684.324,1.231.808,1.263l2.122-.009c.48.031.82.595.82,1.275l-.007.916c0,.683-.328,1.23-.81,1.261l-2.126-.005c-.484.034-.808.572-.808,1.256Z" data-name="Path 5276"
+        fill="#fff"
+        id="Path_5276" transform="translate(2.327 2.327)" />
+</svg>
--- a/assets/images/svg/HMG.svg
+++ b/assets/images/svg/HMG.svg
@ -0,0 +1,8 @@
+<svg data-name="Group 8404" height="26" id="Group_8404" viewBox="0 0 26 26"
+    width="26" xmlns="http://www.w3.org/2000/svg">
+    <rect data-name="Rectangle 17531" fill="#cc2229" height="26" id="Rectangle_17531" rx="4"
+        width="26" />
+    <path d="M2.914,17.807s.731-.005,1.246-.005l3.9.019c.466,0,.854-.488.876-1.193l0-3.213c0-.685.311-1.221.793-1.252l1.2-.009c.483.029.814.572.814,1.253l0,3.231c.021.7.346,1.165.814,1.165l5.254.014.01-3.971c0-.683-.333-1.214-.82-1.245l-2.11-.01c-.467,0-.834-.486-.854-1.191l-.008-1.074c.023-.7.392-1.189.86-1.189l2.122.006c.482-.031.8-.592.8-1.274l.005-4.957a2.126,2.126,0,0,1-.693.69,2.164,2.164,0,0,1-.933.312l-3.569,0c-.465,0-.854.5-.876,1.2V8.295c-.022.7-.387,1.2-.854,1.2l-1.08-.008c-.468,0-.842-.482-.864-1.183l0-3.218c-.021-.705-.392-1.178-.859-1.178l-5.179,0V7.87c0,.684.324,1.231.808,1.263l2.122-.009c.48.031.82.595.82,1.275l-.007.916c0,.683-.328,1.23-.81,1.261l-2.126-.005c-.484.034-.808.572-.808,1.256Z" data-name="Path 5276"
+        fill="#fff"
+        id="Path_5276" transform="translate(2.327 2.327)" />
+</svg>
--- a/assets/images/svg/bloodpressure.svg
+++ b/assets/images/svg/bloodpressure.svg
--- a/assets/images/svg/bmi.svg
+++ b/assets/images/svg/bmi.svg
@ -1 +0,0 @@
-<svg id="Icon" viewBox="0 0 60 60" xmlns="http://www.w3.org/2000/svg"><circle cx="30" cy="30" fill="#e3ebf0" r="29"/><path d="m19.41 19.41c-2.32 2.3-3.89 5.37-4.3 8.79-.13 1.02-.96 1.8-1.99 1.8h-6.03c-1.16 0-2.1-.99-2-2.15.52-6.03 3.19-11.47 7.24-15.52l1.67-.33 5 4z" fill="#54afa4"/><path d="m30 5 1 2v6l-1 2c-4.13 0-7.88 1.68-10.59 4.41l-7.08-7.08c4.53-4.53 10.78-7.33 17.67-7.33z" fill="#68cec5"/><path d="m47.67 12.33.322 1.671-4.992 4.999-2.4.41h-.01c-2.71-2.73-6.45-4.41-10.59-4.41v-10c6.89 0 13.14 2.8 17.67 7.33z" fill="#f9d84b"/><path d="m54.91 27.85c.1 1.16-.84 2.15-2 2.15h-6.03c-1.03 0-1.86-.78-1.99-1.8-.41-3.41-1.97-6.48-4.29-8.79l7.07-7.08c4.05 4.05 6.72 9.49 7.24 15.52z" fill="#f9536b"/><path d="m44.851 16.308c-2.578 3.935-7.307 10.699-12.38 15.772-1.42 1.42-3.831 1.242-4.99-.543-.846-1.284-.585-2.985.501-4.071 5.073-5.052 11.795-9.75 15.71-12.317.762-.511 1.66.397 1.159 1.159z" fill="#4d5c7a"/><g fill="#262626"><path d="m52.907 31c.842 0 1.652-.356 2.223-.979.563-.613.846-1.437.774-2.26-.52-6.072-3.192-11.804-7.527-16.139-4.916-4.916-11.442-7.623-18.377-7.623-13.385 0-24.764 10.437-25.904 23.76-.071.824.212 1.648.774 2.262.571.622 1.381.979 2.223.979h6.031c1.514 0 2.793-1.152 2.977-2.68.843-7.023 6.818-12.32 13.899-12.32 2.708 0 5.28.763 7.52 2.206-3.316 2.42-7.096 5.418-10.244 8.554-1.446 1.445-1.711 3.686-.633 5.321.705 1.088 1.837 1.788 3.105 1.922.149.016.299.023.447.023 1.115 0 2.183-.439 2.982-1.239 3.162-3.161 6.182-6.966 8.615-10.302 1.131 1.762 1.858 3.753 2.107 5.835.182 1.527 1.461 2.68 2.976 2.68h6.031zm-23.907-24.951v7.998c-3.642.227-6.984 1.666-9.583 3.957l-5.631-5.631c4.07-3.741 9.413-6.078 15.213-6.324zm-14.886 22.034c-.063.532-.48.918-.99.918h-6.031c-.283 0-.557-.12-.749-.33-.188-.205-.279-.468-.256-.739.466-5.437 2.784-10.349 6.287-14.142l5.637 5.637c-2.083 2.357-3.498 5.333-3.898 8.656zm16.886-14.041v-8.018c5.694.233 11.038 2.45 15.239 6.323l-1.715 1.715c-.465-.098-.958-.032-1.38.251-1.065.698-2.409 1.603-3.9 2.656-2.437-1.744-5.254-2.746-8.243-2.928zm.764 17.332c-.479.478-1.13.709-1.807.641-.675-.071-1.256-.434-1.641-1.026-.562-.854-.405-2.036.372-2.812 4.791-4.772 11.129-9.254 14.887-11.751-2.5 3.767-7.006 10.143-11.812 14.948zm14.123-3.29c-.317-2.644-1.303-5.16-2.852-7.329 1.05-1.489 1.953-2.831 2.651-3.896.279-.425.344-.916.249-1.379l1.704-1.704c3.593 3.905 5.822 8.885 6.273 14.157.023.271-.067.532-.256.737-.192.21-.466.33-.749.33h-6.031c-.51 0-.927-.385-.989-.917z"/><path d="m30 0c-6.367 0-12.448 1.969-17.587 5.693-.447.324-.547.949-.223 1.396s.948.548 1.396.223c4.795-3.476 10.471-5.312 16.413-5.312 15.439 0 28 12.561 28 28s-12.561 28-28 28-27.999-12.561-27.999-28c0-7.737 3.086-14.938 8.689-20.276.4-.381.416-1.014.034-1.413-.381-.402-1.015-.415-1.413-.034-6.003 5.718-9.31 13.433-9.31 21.723 0 16.542 13.458 30 30 30s30-13.458 30-30-13.458-30-30-30z"/><path d="m33 50c.553 0 1-.447 1-1v-10c0-.464-.319-.866-.771-.974-.45-.106-.917.111-1.124.526l-2.105 4.211-2.105-4.211c-.207-.415-.677-.632-1.124-.526-.451.107-.771.51-.771.974v10c0 .553.447 1 1 1s1-.447 1-1v-5.764l1.105 2.211c.34.678 1.449.678 1.789 0l1.105-2.211v5.764c0 .553.447 1 1 1z"/><path d="m44 40c.553 0 1-.447 1-1s-.447-1-1-1h-6c-.553 0-1 .447-1 1s.447 1 1 1h2v8h-2c-.553 0-1 .447-1 1s.447 1 1 1h6c.553 0 1-.447 1-1s-.447-1-1-1h-2v-8z"/><path d="m23 41.5c0-1.93-1.57-3.5-3.5-3.5h-3.5c-.553 0-1 .447-1 1v10c0 .553.447 1 1 1h3.5c1.93 0 3.5-1.57 3.5-3.5 0-.98-.407-1.864-1.058-2.5.651-.636 1.058-1.52 1.058-2.5zm-2 5c0 .827-.673 1.5-1.5 1.5h-2.5v-3h2.5c.827 0 1.5.673 1.5 1.5zm-4-3.5v-3h2.5c.827 0 1.5.673 1.5 1.5s-.673 1.5-1.5 1.5z"/></g></svg>
--- a/assets/images/svg/breathing.svg
+++ b/assets/images/svg/breathing.svg
--- a/assets/images/svg/facialSkin.svg
+++ b/assets/images/svg/facialSkin.svg
--- a/assets/images/svg/heartrate.svg
+++ b/assets/images/svg/heartrate.svg
@ -1 +0,0 @@
-<svg id="Layer_3" enable-background="new 0 0 64 64" height="512" viewBox="0 0 64 64" width="512" xmlns="http://www.w3.org/2000/svg"><g><path d="m62 22.04c0 2.92-.42 5.82-1.24 8.59-.82 2.78-2.04 5.43-3.63 7.89-4.02 6.22-9.57 11.29-16.12 14.74l-9.01 4.74-9.01-4.74c-6.55-3.45-12.1-8.52-16.12-14.74-.73-1.14-1.39-2.31-1.96-3.52h11.16l.93-1 6 13 5-18 4 6h9.55c.7 1.19 1.97 2 3.45 2 2.21 0 4-1.79 4-4s-1.79-4-4-4c-1.48 0-2.75.81-3.45 2h-7.55l-7-12-5 17-5-10-3.07 5h-10.57c-.05-.12-.08-.25-.12-.37-.82-2.77-1.24-5.67-1.24-8.59 0-2.66.62-5.28 1.81-7.65 1.29-2.57 3.24-4.67 5.59-6.12 2.36-1.46 5.1-2.27 7.98-2.27 3.18 0 6.2 1 8.7 2.74 2.49 1.75 4.46 4.25 5.55 7.25l.37 1.01.37-1.01c1.09-3 3.06-5.5 5.55-7.25 2.5-1.74 5.52-2.74 8.7-2.74 2.88 0 5.62.81 7.98 2.27 2.35 1.45 4.3 3.55 5.59 6.12 1.19 2.37 1.81 4.99 1.81 7.65z" fill="#ea3647"/><path d="m54.6 8.27c-2.36-1.46-5.1-2.27-7.98-2.27-3.18 0-6.2 1-8.7 2.74-2.49 1.75-4.46 4.25-5.55 7.25l-.37 1.01-.37-1.01c-1.09-3-3.06-5.5-5.55-7.25-2.5-1.74-5.52-2.74-8.7-2.74-.041 0-.081.004-.122.004-1.452 3.72-2.258 7.762-2.258 11.996 0 3.177.452 6.249 1.29 9.156l.71-1.156 5 10 5-17 7 12h7.55c.7-1.19 1.97-2 3.45-2 2.21 0 4 1.79 4 4s-1.79 4-4 4c-1.48 0-2.75-.81-3.45-2h-9.55l-4-6-3.404 12.255c5.315 5.347 12.449 8.885 20.397 9.603 4.822-3.246 8.962-7.425 12.137-12.338 1.59-2.46 2.81-5.11 3.63-7.89.82-2.77 1.24-5.67 1.24-8.59 0-2.66-.62-5.28-1.81-7.65-1.29-2.57-3.24-4.67-5.59-6.12z" fill="#fd505b"/><path d="m44.941 11.534c.574-2.063 6.032-2.742 10.097 1.296s3.39 9.503 1.284 10.087-4.416-2.006-6.887-4.505c-2.47-2.5-5.068-4.815-4.494-6.878z" fill="#ff9aa5"/><path d="m55.126 7.419c-2.558-1.582-5.499-2.419-8.506-2.419-3.321 0-6.527 1.01-9.275 2.922-2.323 1.633-4.15 3.811-5.345 6.354-1.195-2.545-3.022-4.723-5.349-6.356-2.744-1.91-5.95-2.92-9.271-2.92-3.007 0-5.948.837-8.505 2.419-2.544 1.569-4.604 3.825-5.959 6.522-1.254 2.497-1.916 5.298-1.916 8.099 0 3.018.431 6.003 1.292 8.906l.029.097c.034.116.07.234.118.347.157.37.52.61.921.61h10.57c.348 0 .67-.181.853-.477l2.128-3.467 4.195 8.391c.185.368.565.592.983.549.409-.036.755-.319.87-.714l4.346-14.774 5.831 9.996c.179.308.509.496.864.496h7.55c.354 0 .683-.188.862-.493.555-.944 1.523-1.507 2.588-1.507 1.654 0 3 1.346 3 3s-1.346 3-3 3c-1.065 0-2.033-.563-2.588-1.507-.18-.305-.508-.493-.862-.493h-9.015l-3.703-5.555c-.217-.325-.601-.499-.99-.433-.386.062-.7.343-.806.72l-4.271 15.374-4.857-10.525c-.14-.303-.421-.516-.751-.568-.321-.054-.663.062-.89.307l-.632.68h-10.725c-.343 0-.661.175-.845.465-.184.289-.206.651-.06.962.563 1.196 1.244 2.419 2.024 3.636 4.098 6.341 9.801 11.557 16.494 15.082l9.01 4.74c.147.077.307.115.467.115s.32-.038.466-.115l9.01-4.74c6.693-3.525 12.396-8.741 16.494-15.082 1.644-2.543 2.905-5.285 3.749-8.148.85-2.872 1.281-5.857 1.281-8.875 0-2.801-.662-5.602-1.916-8.099-1.355-2.697-3.415-4.953-5.958-6.522zm4.675 22.929c-.79 2.68-1.972 5.247-3.511 7.629-3.911 6.054-9.356 11.032-15.746 14.398l-8.544 4.495-8.544-4.495c-6.39-3.366-11.835-8.345-15.744-14.396-.423-.66-.816-1.322-1.173-1.979h9.531c.236 0 .464-.084.644-.234l5.378 11.653c.176.38.556.608.989.578.418-.034.771-.325.883-.729l4.415-15.896 2.789 4.184c.186.277.498.444.832.444h9.017c.947 1.263 2.397 2 3.983 2 2.757 0 5-2.243 5-5s-2.243-5-5-5c-1.586 0-3.036.737-3.983 2h-6.442l-6.71-11.504c-.201-.345-.582-.54-.985-.489-.396.049-.726.328-.838.711l-4.283 14.562-3.863-7.727c-.162-.325-.488-.536-.851-.552-.364-.031-.706.166-.896.476l-2.779 4.523h-9.271c-.73-2.58-1.099-5.256-1.099-7.96 0-2.491.589-4.981 1.703-7.202 1.188-2.365 2.994-4.343 5.224-5.718 2.241-1.387 4.818-2.12 7.453-2.12 2.911 0 5.722.886 8.125 2.559 2.394 1.682 4.187 4.023 5.187 6.775l.37 1.01c.143.394.518.656.938.656s.795-.262.938-.656l.371-1.012c.999-2.75 2.792-5.092 5.182-6.771 2.407-1.675 5.218-2.561 8.129-2.561 2.635 0 5.212.733 7.454 2.12 2.229 1.375 4.035 3.353 5.223 5.718 1.114 2.221 1.703 4.711 1.703 7.202 0 2.825-.403 5.619-1.199 8.308z"/></g></svg>
--- a/assets/images/svg/location.svg
+++ b/assets/images/svg/location.svg
@ -0,0 +1,10 @@
+<svg height="11" viewBox="0 0 8.442 11" width="8.442" xmlns="http://www.w3.org/2000/svg">
+    <g data-name="Group 8411" id="Group_8411" transform="translate(-3.75 -1.25)">
+        <path d="M3.75,5.515A4.281,4.281,0,0,1,7.971,1.25a4.281,4.281,0,0,1,4.221,4.265c0,2.386-1.969,4-3.623,5.036l-.006,0-.006,0a1.175,1.175,0,0,1-1.173,0l-.007,0-.007,0C5.724,9.51,3.75,7.91,3.75,5.515Zm2.43-.044A1.791,1.791,0,1,1,7.971,7.262,1.791,1.791,0,0,1,6.18,5.471Z" data-name="Path 5277"
+            fill="#2d343d"
+            fill-rule="evenodd" id="Path_5277" />
+        <path d="M6.021,19.214A.512.512,0,0,0,5,19.262a1.032,1.032,0,0,0,.436.8,2.707,2.707,0,0,0,.813.409,7.651,7.651,0,0,0,2.332.326,7.651,7.651,0,0,0,2.332-.326,2.708,2.708,0,0,0,.813-.409,1.032,1.032,0,0,0,.436-.8.512.512,0,0,0-1.021-.047.408.408,0,0,1-.048.044,1.727,1.727,0,0,1-.5.242,6.648,6.648,0,0,1-2.009.273A6.648,6.648,0,0,1,6.573,19.5a1.727,1.727,0,0,1-.5-.242A.407.407,0,0,1,6.021,19.214Z" data-name="Path 5278"
+            fill="#2d343d"
+            id="Path_5278" transform="translate(-0.61 -8.547)" />
+    </g>
+</svg>
--- a/assets/images/svg/oxygen.svg
+++ b/assets/images/svg/oxygen.svg
--- a/assets/images/svg/stress.svg
+++ b/assets/images/svg/stress.svg
@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve" width="512" height="512">
-<g>
-	<g>
-		<path style="fill:#D77F4A;" d="M448.268,193.522c0-6.286-2.632-11.957-6.855-15.972c-2.615-2.486-3.009-6.596-0.766-9.422&#10;&#9;&#9;&#9;c2.985-3.76,4.768-8.516,4.768-13.69c0-7.532-3.779-14.18-9.545-18.154c-2.55-1.758-3.507-5.012-2.611-7.976&#10;&#9;&#9;&#9;c0.61-2.017,0.939-4.156,0.939-6.372c0-12.171-9.867-22.038-22.038-22.038c-0.271,0-0.071-6.017-0.74-9.253&#10;&#9;&#9;&#9;c-1.918-9.281-9.745-16.43-19.169-17.43c-1.211-0.128-2.405-0.159-3.575-0.098c-4.869,0.254-8.772-3.822-8.748-8.698&#10;&#9;&#9;&#9;c0-0.048,0-0.096,0-0.144c0-15.711-12.736-28.447-28.447-28.447c-0.174,0-5.572-18.923-21.496-16.566&#10;&#9;&#9;&#9;c-2.241,0.332-4.449,0.35-6.501,0.998c-4.71,1.488-9.938,0.436-13.691-2.776c-3.767-3.224-8.658-5.172-14.005-5.172&#10;&#9;&#9;&#9;c-4.18,0-8.08,1.19-11.383,3.249c-3.962,2.47-8.786,3.357-13.275,2.075c-1.881-0.537-3.868-0.825-5.922-0.825&#10;&#9;&#9;&#9;c-2.476,0-4.854,0.418-7.068,1.187c-4.807,1.67-10.112,0.693-14.313-2.179c-3.457-2.363-7.638-3.745-12.142-3.745&#10;&#9;&#9;&#9;c-4.802,0-9.235,1.571-12.817,4.225c-4.543,3.367-10.438,4.225-15.632,1.989c-2.968-1.278-6.239-1.986-9.676-1.986&#10;&#9;&#9;&#9;c-8.8,0-16.516,4.636-20.841,11.599c-2.887,4.648-7.74,7.748-13.208,7.944c-0.279,0.01-0.558,0.024-0.839,0.042&#10;&#9;&#9;&#9;c-14.402,0.942-26.008,12.822-26.575,27.244c-0.019,0.481-0.026,0.959-0.021,1.434c0.049,4.851-4.092,8.753-8.939,8.542&#10;&#9;&#9;&#9;c-1.105-0.048-2.231-0.015-3.372,0.105c-9.425,0.994-17.256,8.14-19.18,17.42c-0.672,3.24-0.472,9.263-0.743,9.263&#10;&#9;&#9;&#9;c-12.171,0-22.038,9.867-22.038,22.038c0,2.216,0.328,4.355,0.938,6.372c0.897,2.965-0.061,6.219-2.611,7.976&#10;&#9;&#9;&#9;c-5.765,3.974-9.545,10.622-9.545,18.154c0,5.174,1.783,9.93,4.768,13.69c2.243,2.826,1.849,6.936-0.766,9.422&#10;&#9;&#9;&#9;c-4.222,4.014-6.855,9.685-6.855,15.972c0,8.699,5.041,16.216,12.36,19.798c3.401,1.664,4.745,5.766,3.32,9.274&#10;&#9;&#9;&#9;c-1.279,3.149-1.851,6.66-1.517,10.338c0.922,10.154,8.945,18.467,19.054,19.791c2.827,0.37,5.555,0.183,8.114-0.439&#10;&#9;&#9;&#9;c-0.017,0.35-0.027,0.702-0.027,1.057c0,12.171,9.867,22.038,22.038,22.038c5.29,0,10.144-1.866,13.943-4.973&#10;&#9;&#9;&#9;c3.148,8.325,11.189,14.246,20.616,14.246c12.171,0,176.557,0,188.729,0c9.427,0,17.468-5.921,20.616-14.246&#10;&#9;&#9;&#9;c3.798,3.107,8.652,4.973,13.942,4.973c12.171,0,22.038-9.867,22.038-22.038c0-0.354-0.01-0.706-0.027-1.057&#10;&#9;&#9;&#9;c2.57,0.625,5.311,0.811,8.15,0.434c10.11-1.341,18.119-9.671,19.022-19.829c0.325-3.661-0.246-7.155-1.519-10.29&#10;&#9;&#9;&#9;c-1.425-3.51-0.084-7.614,3.318-9.279C443.227,209.738,448.268,202.22,448.268,193.522z"/>
-		<path style="fill:#FFD15B;" d="M411.446,372.3c-64.616,2.692-95.255-14.6-95.255-14.6l-60.121-11.895l0.003-0.428l-1.084,0.214&#10;&#9;&#9;&#9;l-1.084-0.214l0.003,0.428l-60.121,11.895c0,0-30.64,17.293-95.255,14.6L68.204,499.925h186.784H442.13L411.446,372.3z"/>
-		<path style="fill:#FFCEBF;" d="M291.728,291.481L291.728,291.481l-73.48,0v0c0,24.283-8.675,47.767-24.462,66.218l1.927,2.216&#10;&#9;&#9;&#9;c4.985,5.734,11.021,10.48,17.819,13.873c25.887,12.92,56.359,13.044,82.306,0.439c7.961-3.867,14.902-9.554,20.352-16.528v0&#10;&#9;&#9;&#9;C300.403,339.248,291.728,315.764,291.728,291.481z"/>
-		<path style="fill:#D77F4A;" d="M137.497,142.363c3.02,23.928,10.565,42.042,10.565,42.042l215.877,0&#10;&#9;&#9;&#9;c0,0,9.996-14.52,19.282-37.554"/>
-		<ellipse style="fill:#FFCEBF;" cx="256" cy="197.248" rx="108.427" ry="135.37"/>
-		<path style="fill:#FFBBAA;" d="M313.264,82.287c19.269,24.435,31.163,57.962,31.163,94.961c0,74.763-48.545,135.37-108.427,135.37&#10;&#9;&#9;&#9;c-21.024,0-40.646-7.478-57.264-20.409c19.667,24.94,47.017,40.409,77.264,40.409c59.883,0,108.427-60.607,108.427-135.37&#10;&#9;&#9;&#9;C364.427,148.733,343.981,106.187,313.264,82.287z"/>
-		<path style="fill:#D77F4A;" d="M256,56.149c-56.413,0-107.939,58.157-107.939,128.256l0,0c0,0,31.222-60.851,53.686-44.804&#10;&#9;&#9;&#9;c21.226,15.161,38.065,15.919,54.252,15.919c16.187,0,33.026-0.758,54.252-15.919c22.465-16.046,53.686,44.804,53.686,44.804l0,0&#10;&#9;&#9;&#9;C364.427,114.305,312.413,56.149,256,56.149z"/>
-		<path style="fill:#FFE177;" d="M169.835,248.2l-27.1-10.507l-27.1-10.507c0,0-81.573,129.986-99.523,176.281&#10;&#9;&#9;&#9;s-7.257,79.017,26.618,92.151c33.874,13.134,63.831-3.827,81.781-50.122S169.835,248.2,169.835,248.2z"/>
-		<path style="fill:#FFCEBF;" d="M124.683,230.694l-1.69-33.678c-0.815-16.248,5.815-31.983,18.013-42.748l46.186-40.76&#10;&#9;&#9;&#9;c2.712-2.394,6.358-3.438,9.926-2.843l0,0c5.794,0.966,10.04,5.979,10.04,11.852v4.179c0,3.777-1.262,7.446-3.585,10.424&#10;&#9;&#9;&#9;l-21.125,29.884c-11.073,15.664-17.019,34.376-17.019,53.559v25.929L124.683,230.694z"/>
-		<path style="fill:#FFE177;" d="M342.165,248.2l27.1-10.507l27.1-10.507c0,0,81.573,129.986,99.523,176.281&#10;&#9;&#9;&#9;s7.257,79.017-26.618,92.151c-33.874,13.134-63.831-3.827-81.781-50.122C369.539,399.201,342.165,248.2,342.165,248.2z"/>
-		<path style="fill:#FFD15B;" d="M495.887,403.467c-17.95-46.295-99.523-176.281-99.523-176.281l-24.167,9.37&#10;&#9;&#9;&#9;c18.974,30.625,78.653,128.128,93.69,166.911c17.95,46.295,7.257,79.017-26.617,92.151c-2.073,0.804-4.131,1.491-6.173,2.07&#10;&#9;&#9;&#9;c11.214,3.55,23.415,2.877,36.173-2.07C503.144,482.484,513.837,449.762,495.887,403.467z"/>
-		<path style="fill:#FFCEBF;" d="M387.317,230.694l1.69-33.678c0.815-16.248-5.815-31.983-18.013-42.748l-46.186-40.76&#10;&#9;&#9;&#9;c-2.712-2.394-6.358-3.438-9.926-2.843l0,0c-5.794,0.966-10.04,5.979-10.04,11.852v4.179c0,3.777,1.262,7.446,3.585,10.424&#10;&#9;&#9;&#9;l21.125,29.884c11.073,15.664,17.019,34.376,17.019,53.559v25.929L387.317,230.694z"/>
-	</g>
-	<g>
-		<path style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" d="&#10;&#9;&#9;&#9;M415.086,252.718c10.11-1.341,18.119-9.671,19.022-19.829c0.325-3.661-0.246-7.155-1.519-10.29&#10;&#9;&#9;&#9;c-1.425-3.51-0.084-7.614,3.318-9.279c7.319-3.582,12.36-11.1,12.36-19.798c0-6.286-2.632-11.957-6.855-15.972&#10;&#9;&#9;&#9;c-2.615-2.486-3.009-6.596-0.766-9.422c2.985-3.76,4.768-8.516,4.768-13.69c0-7.532-3.779-14.18-9.545-18.154&#10;&#9;&#9;&#9;c-2.55-1.758-3.507-5.012-2.611-7.976c0.61-2.017,0.939-4.156,0.939-6.372c0-12.171-9.867-22.038-22.038-22.038&#10;&#9;&#9;&#9;c-0.271,0-0.071-6.017-0.74-9.253c-1.918-9.281-9.745-16.43-19.169-17.43c-1.211-0.128-2.405-0.159-3.575-0.098&#10;&#9;&#9;&#9;c-4.869,0.254-8.772-3.822-8.748-8.698c0-0.048,0-0.096,0-0.144c0-15.711-12.736-28.447-28.447-28.447&#10;&#9;&#9;&#9;c-0.174,0-5.572-18.923-21.496-16.566c-2.241,0.332-4.449,0.35-6.501,0.998c-4.71,1.488-9.938,0.436-13.691-2.776&#10;&#9;&#9;&#9;c-3.767-3.224-8.658-5.172-14.005-5.172c-4.18,0-8.08,1.19-11.383,3.249c-3.962,2.47-8.786,3.357-13.275,2.075&#10;&#9;&#9;&#9;c-1.881-0.537-3.868-0.825-5.922-0.825c-2.476,0-4.854,0.418-7.068,1.187c-4.807,1.67-10.112,0.693-14.313-2.179&#10;&#9;&#9;&#9;c-3.457-2.363-7.638-3.745-12.142-3.745c-4.802,0-9.235,1.571-12.817,4.225c-4.543,3.367-10.438,4.225-15.632,1.989&#10;&#9;&#9;&#9;c-2.968-1.278-6.239-1.986-9.676-1.986c-8.8,0-16.516,4.636-20.841,11.599c-2.887,4.648-7.74,7.748-13.208,7.944&#10;&#9;&#9;&#9;c-0.279,0.01-0.558,0.024-0.839,0.042c-14.402,0.942-26.008,12.822-26.575,27.244c-0.019,0.481-0.026,0.959-0.021,1.434&#10;&#9;&#9;&#9;c0.049,4.851-4.092,8.753-8.939,8.542c-1.105-0.048-2.231-0.015-3.372,0.105c-9.425,0.994-17.256,8.14-19.18,17.42&#10;&#9;&#9;&#9;c-0.672,3.24-0.472,9.263-0.743,9.263c-12.171,0-22.038,9.867-22.038,22.038c0,2.216,0.328,4.355,0.938,6.372&#10;&#9;&#9;&#9;c0.897,2.965-0.061,6.219-2.611,7.976c-5.765,3.974-9.545,10.622-9.545,18.154c0,5.174,1.783,9.93,4.768,13.69&#10;&#9;&#9;&#9;c2.243,2.826,1.849,6.936-0.766,9.422c-4.222,4.014-6.855,9.685-6.855,15.972c0,8.699,5.041,16.216,12.36,19.798&#10;&#9;&#9;&#9;c3.401,1.664,4.745,5.766,3.32,9.274c-1.279,3.149-1.851,6.66-1.517,10.338c0.922,10.154,8.945,18.467,19.054,19.791"/>
-		<path style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" d="&#10;&#9;&#9;&#9;M201.748,139.601c21.226,15.161,38.065,15.919,54.252,15.919c16.187,0,33.026-0.758,54.252-15.919"/>
-		
-			<line style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" x1="35.204" y1="223.363" x2="35.204" y2="227.85"/>
-		
-			<line style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" x1="35.204" y1="261.166" x2="35.204" y2="256.678"/>
-		
-			<line style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" x1="53.103" y1="242.264" x2="48.615" y2="242.264"/>
-		
-			<line style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" x1="17.306" y1="242.264" x2="21.794" y2="242.264"/>
-		<path style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" d="&#10;&#9;&#9;&#9;M363.942,370.537c-32.235-4.08-47.751-12.838-47.751-12.838"/>
-		
-			<line style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" x1="374.066" y1="499.925" x2="442.13" y2="499.925"/>
-		
-			<polyline style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" points="&#10;&#9;&#9;&#9;68.204,499.925 254.988,499.925 340.066,499.925 &#9;&#9;"/>
-		<path style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" d="&#10;&#9;&#9;&#9;M193.786,357.699c0,0-15.865,8.954-48.838,12.973"/>
-		<path style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" d="&#10;&#9;&#9;&#9;M212.237,325.956c-4.145,11.522-10.365,22.293-18.45,31.743l1.927,2.216c4.985,5.734,11.021,10.48,17.819,13.873&#10;&#9;&#9;&#9;c25.887,12.92,56.359,13.044,82.306,0.439c7.961-3.867,14.902-9.554,20.352-16.528v0c-8.202-9.586-14.484-20.53-18.627-32.239"/>
-		<path style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" d="&#10;&#9;&#9;&#9;M345.91,272.934c-19.485,36.009-52.483,59.683-89.91,59.683c-37.853,0-71.176-24.217-90.571-60.919"/>
-		<path style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" d="&#10;&#9;&#9;&#9;M61.79,316.421c-19.28,33.219-38.119,67.552-45.678,87.046c-17.95,46.295-7.257,79.017,26.618,92.151&#10;&#9;&#9;&#9;c33.874,13.134,63.831-3.827,81.781-50.122S169.835,248.2,169.835,248.2l-27.1-10.507l-27.1-10.507&#10;&#9;&#9;&#9;c0,0-16.714,26.634-36.675,60.083"/>
-		<path style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" d="&#10;&#9;&#9;&#9;M32.38,16.905l7.925,23.552c1.414,4.203,6.751,5.46,9.892,2.329l8.161-8.135c3.103-3.093,8.368-1.911,9.851,2.212l8.999,25.015"/>
-		
-			<line style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" x1="473.796" y1="233.363" x2="473.796" y2="237.85"/>
-		
-			<line style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" x1="473.796" y1="271.166" x2="473.796" y2="266.678"/>
-		
-			<line style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" x1="455.897" y1="252.264" x2="460.385" y2="252.264"/>
-		
-			<line style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" x1="491.694" y1="252.264" x2="487.206" y2="252.264"/>
-		<path style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" d="&#10;&#9;&#9;&#9;M483.621,16.905l-7.925,23.552c-1.414,4.203-6.751,5.46-9.892,2.329l-8.161-8.135c-3.103-3.093-8.368-1.911-9.851,2.212&#10;&#9;&#9;&#9;l-8.999,25.015"/>
-		<path style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" d="&#10;&#9;&#9;&#9;M124.683,230.694l-1.69-33.678c-0.815-16.248,5.815-31.983,18.013-42.748l46.186-40.76c2.712-2.394,6.358-3.438,9.926-2.843l0,0&#10;&#9;&#9;&#9;c5.794,0.966,10.04,5.979,10.04,11.852v4.179c0,3.777-1.262,7.446-3.585,10.424l-21.125,29.884&#10;&#9;&#9;&#9;c-11.073,15.664-17.019,34.376-17.019,53.559v25.929L124.683,230.694z"/>
-		<path style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" d="&#10;&#9;&#9;&#9;M450.21,316.421c19.28,33.219,38.119,67.552,45.678,87.046c17.95,46.295,7.257,79.017-26.618,92.151&#10;&#9;&#9;&#9;c-33.874,13.134-63.831-3.827-81.781-50.122c-17.95-46.295-45.324-197.296-45.324-197.296l27.1-10.507l27.1-10.507&#10;&#9;&#9;&#9;c0,0,16.714,26.634,36.675,60.083"/>
-		<path style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;" d="&#10;&#9;&#9;&#9;M387.317,230.694l1.69-33.678c0.815-16.248-5.815-31.983-18.013-42.748l-46.186-40.76c-2.712-2.394-6.358-3.438-9.926-2.843l0,0&#10;&#9;&#9;&#9;c-5.794,0.966-10.04,5.979-10.04,11.852v4.179c0,3.777,1.262,7.446,3.585,10.424l21.125,29.884&#10;&#9;&#9;&#9;c11.073,15.664,17.019,34.376,17.019,53.559v25.929L387.317,230.694z"/>
-	</g>
-</g>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</svg>
--- a/assets/images/svg/wellness.svg
+++ b/assets/images/svg/wellness.svg
@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   version="1.1"
-   id="svg696"
-   xml:space="preserve"
-   width="682.66669"
-   height="682.66669"
-   viewBox="0 0 682.66669 682.66669"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-     id="defs700"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath710"><path
-         d="M 0,512 H 512 V 0 H 0 Z"
-         id="path708" /></clipPath></defs><g
-     id="g702"
-     transform="matrix(1.3333333,0,0,-1.3333333,0,682.66667)"><g
-       id="g704"><g
-         id="g706"
-         clip-path="url(#clipPath710)"><g
-           id="g712"
-           transform="translate(9.0435,355.2871)"><path
-             d="m 0,0 c 0.338,7.053 1.429,13.958 3.178,20.649 0.142,0.541 0.287,1.08 0.437,1.618 3.918,14.057 10.739,27.135 19.571,38.611 21.46,27.886 54.8,46.31 87.238,46.31 37.457,0 69.076,-22.555 83.697,-35.027 4.971,-4.241 12.285,-4.164 17.183,0.161 14.161,12.505 44.933,34.866 83.904,34.866 52.616,0 107.611,-48.482 110.423,-107.188 0.878,-18.368 -1.675,-34.297 -6.411,-48.745 -3.814,-11.637 -9.041,-22.316 -15.057,-32.515 -19.996,-33.905 -115.745,-106.958 -157.552,-142.348 -13.836,-11.712 -34.105,-11.709 -47.936,0.009 C 136.981,-188.276 41.584,-115.437 21.468,-81.26 12.443,-65.927 5.214,-49.612 1.863,-30.601 0.196,-21.138 -0.527,-11.02 0,0"
-             style="fill:#ff7d97;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path714" /></g><g
-           id="g716"
-           transform="translate(262.0469,153.4565)"><path
-             d="m 0,0 c -9.998,-8.147 -19.031,-15.546 -26.392,-21.777 -13.837,-11.713 -34.105,-11.709 -47.937,0.009 -41.693,35.323 -137.09,108.162 -157.206,142.338 -9.025,15.333 -16.255,31.649 -19.605,50.66 -0.343,1.947 -0.647,3.922 -0.907,5.927"
-             style="fill:none;stroke:#000000;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-             id="path718" /></g><g
-           id="g720"
-           transform="translate(34.6689,419.2329)"><path
-             d="m 0,0 c 21.497,26.161 53.565,43.242 84.798,43.242 37.458,0 69.076,-22.555 83.697,-35.027 4.971,-4.241 12.286,-4.164 17.184,0.161 14.161,12.505 44.932,34.866 83.903,34.866 52.616,0 107.611,-48.482 110.424,-107.188 0.878,-18.367 -1.676,-34.297 -6.411,-48.745 -1.877,-5.726 -4.096,-11.221 -6.583,-16.54"
-             style="fill:none;stroke:#000000;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-             id="path722" /></g><g
-           id="g724"
-           transform="translate(12.3311,376.3408)"><path
-             d="M 0,0 V 0"
-             style="fill:none;stroke:#000000;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-             id="path726" /></g><g
-           id="g728"
-           transform="translate(502,169.7637)"><path
-             d="m 0,0 c 0,-66.406 -53.399,-120.239 -119.271,-120.239 -65.872,0 -119.271,53.833 -119.271,120.239 0,66.406 53.399,120.239 119.271,120.239 C -53.399,120.239 0,66.406 0,0"
-             style="fill:#faf7f5;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path730" /></g><g
-           id="g732"
-           transform="translate(502,169.7637)"><path
-             d="m 0,0 c 0,-66.406 -53.399,-120.239 -119.271,-120.239 -65.872,0 -119.271,53.833 -119.271,120.239 0,66.406 53.399,120.239 119.271,120.239 C -53.399,120.239 0,66.406 0,0 Z"
-             style="fill:none;stroke:#000000;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-             id="path734" /></g><g
-           id="g736"
-           transform="translate(430.6279,194.124)"><path
-             d="m 0,0 h -23.744 v 23.952 c 0,6.765 -5.44,12.248 -12.15,12.248 h -24.01 c -6.71,0 -12.15,-5.483 -12.15,-12.248 V 0 h -23.744 c -6.71,0 -12.149,-5.483 -12.149,-12.248 v -24.225 c 0,-6.764 5.439,-12.247 12.149,-12.247 h 23.744 v -23.953 c 0,-6.764 5.44,-12.247 12.15,-12.247 h 24.01 c 6.71,0 12.15,5.483 12.15,12.247 V -48.72 H 0 c 6.71,0 12.149,5.483 12.149,12.247 v 24.225 C 12.149,-5.483 6.71,0 0,0"
-             style="fill:#ff9eb1;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path738" /></g><g
-           id="g740"
-           transform="translate(430.6279,194.124)"><path
-             d="m 0,0 h -23.744 v 23.952 c 0,6.765 -5.44,12.248 -12.15,12.248 h -24.01 c -6.71,0 -12.15,-5.483 -12.15,-12.248 V 0 h -23.744 c -6.71,0 -12.149,-5.483 -12.149,-12.248 v -24.225 c 0,-6.764 5.439,-12.247 12.149,-12.247 h 23.744 v -23.953 c 0,-6.764 5.44,-12.247 12.15,-12.247 h 24.01 c 6.71,0 12.15,5.483 12.15,12.247 V -48.72 H 0 c 6.71,0 12.149,5.483 12.149,12.247 v 24.225 C 12.149,-5.483 6.71,0 0,0 Z"
-             style="fill:none;stroke:#000000;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-             id="path742" /></g></g></g></g></svg>
--- a/ios/Podfile
+++ b/ios/Podfile
@ -3,7 +3,7 @@ platform :ios, '14.0'

 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
-# use_frameworks! :linkage => :static
+use_frameworks! :linkage => :static
 project 'Runner', {
  'Debug' => :debug,
  'Profile' => :release,
@ -28,13 +28,13 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
 flutter_ios_podfile_setup

 target 'Runner' do
-#   use_frameworks!
-  use_frameworks! :linkage => :static
+  use_frameworks!
  use_modular_headers!
  
  pod 'OpenTok', '~> 2.22.0'
  pod 'VTO2Lib'
-  pod 'MapboxMaps', '10.18.2'
+  pod 'MapboxMaps', '10.19.0'
+  pod 'MapboxNavigation', '2.19.0'
  pod 'FLAnimatedImage'

  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -8,18 +8,18 @@

 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		17AB294D2D8707DE001C125B /* Penguin.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17AB29452D86D210001C125B /* Penguin.xcframework */; };
+		17AB294E2D8707DE001C125B /* Penguin.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 17AB29452D86D210001C125B /* Penguin.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		17AB29502D8707DF001C125B /* PenguinINRenderer.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17AB29442D86D210001C125B /* PenguinINRenderer.xcframework */; };
+		17AB29512D8707DF001C125B /* PenguinINRenderer.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 17AB29442D86D210001C125B /* PenguinINRenderer.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		17AB29522D8707E2001C125B /* PenNavUI.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17AB29432D86D210001C125B /* PenNavUI.xcframework */; };
+		17AB29532D8707E2001C125B /* PenNavUI.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 17AB29432D86D210001C125B /* PenNavUI.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		29631B9E2C96C7F600DF5916 /* PenguinNavigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29631B9D2C96C7F600DF5916 /* PenguinNavigator.swift */; };
 		301C79AE27200D9F0016307B /* OpenTokRemoteVideoFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 301C79AD27200D9F0016307B /* OpenTokRemoteVideoFactory.swift */; };
 		301C79B027200DED0016307B /* OpenTokLocalVideoFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 301C79AF27200DED0016307B /* OpenTokLocalVideoFactory.swift */; };
 		306FE6C8271D790C002D6EFC /* OpenTokPlatformBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 306FE6C7271D790C002D6EFC /* OpenTokPlatformBridge.swift */; };
 		306FE6CB271D8B73002D6EFC /* OpenTok.swift in Sources */ = {isa = PBXBuildFile; fileRef = 306FE6CA271D8B73002D6EFC /* OpenTok.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		47C935002C91766800981BA7 /* Penguin.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47C934FC2C91766400981BA7 /* Penguin.xcframework */; };
-		47C935012C91766800981BA7 /* Penguin.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 47C934FC2C91766400981BA7 /* Penguin.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		47C935022C91766900981BA7 /* PenguinINRenderer.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47C934FA2C91766400981BA7 /* PenguinINRenderer.xcframework */; };
-		47C935032C91766900981BA7 /* PenguinINRenderer.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 47C934FA2C91766400981BA7 /* PenguinINRenderer.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		47C935042C91766A00981BA7 /* PenNavUI.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47C934FB2C91766400981BA7 /* PenNavUI.xcframework */; };
-		47C935052C91766A00981BA7 /* PenNavUI.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 47C934FB2C91766400981BA7 /* PenNavUI.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		762D738E274E42650063CE73 /* ring_30Sec.caf in Resources */ = {isa = PBXBuildFile; fileRef = 762D738C274E42650063CE73 /* ring_30Sec.caf */; };
 		762D738F274E42650063CE73 /* ring_30Sec.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 762D738D274E42650063CE73 /* ring_30Sec.mp3 */; };
@ -51,19 +51,19 @@
 		E9C8C136256BACDA00EFFB62 /* HMG_Guest.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9C8C135256BACDA00EFFB62 /* HMG_Guest.swift */; };
 		E9E27168256E3A4000F49B69 /* LocalizedFromFlutter.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E27167256E3A4000F49B69 /* LocalizedFromFlutter.swift */; };
 		E9F7623B25922BCE00FB5CCF /* FlutterConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F7623A25922BCE00FB5CCF /* FlutterConstants.swift */; };
-		FD7241B0D73FB24C87572FAC /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E413842321D0D624872E9BE /* Pods_Runner.framework */; };
+		F74B5001ECD140A97800DC22 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C56AF9B31AA04A5292EEA39F /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */

 /* Begin PBXCopyFilesBuildPhase section */
-		768D81742C6DF6E4005C655F /* Embed Frameworks */ = {
+		17AB294F2D8707DE001C125B /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				47C935032C91766900981BA7 /* PenguinINRenderer.xcframework in Embed Frameworks */,
-				47C935012C91766800981BA7 /* Penguin.xcframework in Embed Frameworks */,
-				47C935052C91766A00981BA7 /* PenNavUI.xcframework in Embed Frameworks */,
+				17AB29512D8707DF001C125B /* PenguinINRenderer.xcframework in Embed Frameworks */,
+				17AB294E2D8707DE001C125B /* Penguin.xcframework in Embed Frameworks */,
+				17AB29532D8707E2001C125B /* PenNavUI.xcframework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@ -71,25 +71,22 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
+		02C0468611167F0E858967A9 /* 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>"; };
+		17AB29432D86D210001C125B /* PenNavUI.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = PenNavUI.xcframework; path = Frameworks/PenNavUI.xcframework; sourceTree = "<group>"; };
+		17AB29442D86D210001C125B /* PenguinINRenderer.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = PenguinINRenderer.xcframework; path = Frameworks/PenguinINRenderer.xcframework; sourceTree = "<group>"; };
+		17AB29452D86D210001C125B /* Penguin.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Penguin.xcframework; path = Frameworks/Penguin.xcframework; sourceTree = "<group>"; };
 		29631B9D2C96C7F600DF5916 /* PenguinNavigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PenguinNavigator.swift; sourceTree = "<group>"; };
 		301C79AD27200D9F0016307B /* OpenTokRemoteVideoFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTokRemoteVideoFactory.swift; sourceTree = "<group>"; };
 		301C79AF27200DED0016307B /* OpenTokLocalVideoFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTokLocalVideoFactory.swift; sourceTree = "<group>"; };
 		306FE6C7271D790C002D6EFC /* OpenTokPlatformBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTokPlatformBridge.swift; sourceTree = "<group>"; };
 		306FE6CA271D8B73002D6EFC /* OpenTok.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTok.swift; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		47C934FA2C91766400981BA7 /* PenguinINRenderer.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = PenguinINRenderer.xcframework; path = Frameworks/PenguinINRenderer.xcframework; sourceTree = "<group>"; };
-		47C934FB2C91766400981BA7 /* PenNavUI.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = PenNavUI.xcframework; path = Frameworks/PenNavUI.xcframework; sourceTree = "<group>"; };
-		47C934FC2C91766400981BA7 /* Penguin.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Penguin.xcframework; path = Frameworks/Penguin.xcframework; sourceTree = "<group>"; };
-		6EE8819867EC2775AB578377 /* 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>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		762D738C274E42650063CE73 /* ring_30Sec.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ring_30Sec.caf; path = ../../assets/sounds/ring_30Sec.caf; sourceTree = "<group>"; };
 		762D738D274E42650063CE73 /* ring_30Sec.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = ring_30Sec.mp3; path = ../../assets/sounds/ring_30Sec.mp3; sourceTree = "<group>"; };
-		7643E4042BE0D0B400BD2F25 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Main_Custom.strings; sourceTree = "<group>"; };
-		7643E4052BE0D0B400BD2F25 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Main.strings; sourceTree = "<group>"; };
-		7643E4062BE0D0B400BD2F25 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		76815B26275F381C00E66E94 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; };
 		76962ECD28AE5C10004EAE09 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		76D71B662C6B7F9C00DAFB84 /* HMGPenguinInPlatformBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HMGPenguinInPlatformBridge.swift; sourceTree = "<group>"; };
@ -99,8 +96,6 @@
 		76D71B6F2C6B81EA00DAFB84 /* PenguinViewFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PenguinViewFactory.swift; sourceTree = "<group>"; };
 		76F2556027F1FFED0062C1CD /* PassKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PassKit.framework; path = System/Library/Frameworks/PassKit.framework; sourceTree = SDKROOT; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		838788A2BEDC4910F4B029A6 /* 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>"; };
-		8E413842321D0D624872E9BE /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		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; };
@ -108,6 +103,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>"; };
+		9E4A8F0312C6AED5D3DC152C /* 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>"; };
+		C56AF9B31AA04A5292EEA39F /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		D72A14381E2E5999FC41D0A8 /* 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>"; };
 		E91B538D256AAA6500E96549 /* GlobalHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalHelper.swift; sourceTree = "<group>"; };
 		E91B538E256AAA6500E96549 /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
 		E91B538F256AAA6500E96549 /* API.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = API.swift; sourceTree = "<group>"; };
@ -126,7 +124,6 @@
 		E9C8C135256BACDA00EFFB62 /* HMG_Guest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMG_Guest.swift; sourceTree = "<group>"; };
 		E9E27167256E3A4000F49B69 /* LocalizedFromFlutter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizedFromFlutter.swift; sourceTree = "<group>"; };
 		E9F7623A25922BCE00FB5CCF /* FlutterConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlutterConstants.swift; sourceTree = "<group>"; };
-		F2C7D3C4718A1DED85DA3AD4 /* 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>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@ -137,10 +134,10 @@
 				76F2556127F1FFED0062C1CD /* PassKit.framework in Frameworks */,
 				76815B27275F381C00E66E94 /* HealthKit.framework in Frameworks */,
 				E9620805255C2ED100D3A35D /* NetworkExtension.framework in Frameworks */,
-				47C935042C91766A00981BA7 /* PenNavUI.xcframework in Frameworks */,
-				47C935002C91766800981BA7 /* Penguin.xcframework in Frameworks */,
-				47C935022C91766900981BA7 /* PenguinINRenderer.xcframework in Frameworks */,
-				FD7241B0D73FB24C87572FAC /* Pods_Runner.framework in Frameworks */,
+				F74B5001ECD140A97800DC22 /* Pods_Runner.framework in Frameworks */,
+				17AB29522D8707E2001C125B /* PenNavUI.xcframework in Frameworks */,
+				17AB294D2D8707DE001C125B /* Penguin.xcframework in Frameworks */,
+				17AB29502D8707DF001C125B /* PenguinINRenderer.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -160,13 +157,13 @@
 		555EAAA626EFB641859EF0BE /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				47C934FC2C91766400981BA7 /* Penguin.xcframework */,
-				47C934FA2C91766400981BA7 /* PenguinINRenderer.xcframework */,
-				47C934FB2C91766400981BA7 /* PenNavUI.xcframework */,
+				17AB29452D86D210001C125B /* Penguin.xcframework */,
+				17AB29442D86D210001C125B /* PenguinINRenderer.xcframework */,
+				17AB29432D86D210001C125B /* PenNavUI.xcframework */,
 				76F2556027F1FFED0062C1CD /* PassKit.framework */,
 				76815B26275F381C00E66E94 /* HealthKit.framework */,
 				E9620804255C2ED100D3A35D /* NetworkExtension.framework */,
-				8E413842321D0D624872E9BE /* Pods_Runner.framework */,
+				C56AF9B31AA04A5292EEA39F /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@ -174,9 +171,9 @@
 		605039E5DDF72C245F9765FE /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				F2C7D3C4718A1DED85DA3AD4 /* Pods-Runner.debug.xcconfig */,
-				838788A2BEDC4910F4B029A6 /* Pods-Runner.release.xcconfig */,
-				6EE8819867EC2775AB578377 /* Pods-Runner.profile.xcconfig */,
+				D72A14381E2E5999FC41D0A8 /* Pods-Runner.debug.xcconfig */,
+				02C0468611167F0E858967A9 /* Pods-Runner.release.xcconfig */,
+				9E4A8F0312C6AED5D3DC152C /* Pods-Runner.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@ -293,15 +290,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				6D0B2FE51DC05E2D0395E861 /* [CP] Check Pods Manifest.lock */,
+				BEE88E0BBD555ACCD7E82B57 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
-				768D81742C6DF6E4005C655F /* Embed Frameworks */,
+				17AB294F2D8707DE001C125B /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				487FDD6493EB9AE7D8E39485 /* [CP] Embed Pods Frameworks */,
-				4671D3CD126F6635F4B75A6E /* [CP] Copy Pods Resources */,
+				191312D8478950EB12CBDD28 /* [CP] Embed Pods Frameworks */,
+				4CC68CB45B720A365C7CF7DC /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@ -334,7 +331,6 @@
 			knownRegions = (
 				en,
 				Base,
-				ar,
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
@ -368,6 +364,23 @@
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXShellScriptBuildPhase section */
+		191312D8478950EB12CBDD28 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			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 = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@ -384,7 +397,7 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
 		};
-		4671D3CD126F6635F4B75A6E /* [CP] Copy Pods Resources */ = {
+		4CC68CB45B720A365C7CF7DC /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@ -401,24 +414,22 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		487FDD6493EB9AE7D8E39485 /* [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";
 		};
-		6D0B2FE51DC05E2D0395E861 /* [CP] Check Pods Manifest.lock */ = {
+		BEE88E0BBD555ACCD7E82B57 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@ -440,21 +451,6 @@
 			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;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
-		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@ -496,7 +492,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				97C146FB1CF9000F007C117D /* Base */,
-				7643E4052BE0D0B400BD2F25 /* ar */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@ -505,7 +500,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				97C147001CF9000F007C117D /* Base */,
-				7643E4062BE0D0B400BD2F25 /* ar */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
@ -514,7 +508,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				E91B53A2256AAD8200E96549 /* Base */,
-				7643E4042BE0D0B400BD2F25 /* ar */,
 			);
 			name = Main_Custom.storyboard;
 			sourceTree = "<group>";
@ -589,6 +582,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
+					"$(SRCROOT)/Frameworks",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@ -600,7 +594,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.5.991;
+				MARKETING_VERSION = 4.6.004;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@ -740,6 +734,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
+					"$(SRCROOT)/Frameworks",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@ -751,7 +746,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.5.991;
+				MARKETING_VERSION = 4.6.004;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@ -783,6 +778,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
+					"$(SRCROOT)/Frameworks",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@ -794,7 +790,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.5.991;
+				MARKETING_VERSION = 4.6.004;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -122,5 +122,7 @@
 	<true/>
    <key>MBXAccessToken</key>
    <string>pk.eyJ1IjoicndhaWQiLCJhIjoiY2x5cGo4aHNjMGNsbTJyc2djempobGQxaSJ9.RCaC6WrUt4A4YnZNfxnONQ</string>
+    <key>FlutterDeepLinkingEnabled</key>
+    <false/>
 </dict>
 </plist>
--- a/ios/Runner/Runner.entitlements
+++ b/ios/Runner/Runner.entitlements
@ -4,6 +4,11 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:www.hmg.com</string>
+		<string>webcredentials:example.com</string>
+	</array>
 	<key>com.apple.developer.healthkit</key>
 	<true/>
 	<key>com.apple.developer.healthkit.access</key>
@ -26,5 +31,9 @@
 	<array>
 		<string>$(TeamIdentifierPrefix)*</string>
 	</array>
+	<key>com.apple.developer.associated-domains</key>
+      <array>
+        <string>applinks:hmg.com</string>
+      </array>
 </dict>
 </plist>
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@ -21,8 +21,9 @@ var PACKAGES_ORDERS = '/api/orders';
 var PACKAGES_ORDER_HISTORY = '/api/orders/items';
 var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
 // var  BASE_URL = 'http://10.50.100.198:2018/';
- var  BASE_URL = 'https://uat.hmgwebservices.com/';
-// var BASE_URL = 'https://hmgwebservices.com/';
+ // var  BASE_URL = 'https://uat.hmgwebservices.com/';
+var BASE_URL = 'https://hmgwebservices.com/';
+// var  BASE_URL = 'http://10.201.204.103/';
 // var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
 // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
 // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/';
@ -102,6 +103,7 @@ var GET_Patient_LAB_ORDERS_RESULT = 'Services/Patients.svc/REST/GetPatientLabOrd
 var SEND_COVID_LAB_RESULT_EMAIL = 'Services/Notifications.svc/REST/GenerateCOVIDReport';
 var COVID_PASSPORT_UPDATE = 'Services/Patients.svc/REST/Covid19_Certificate_PassportUpdate';
 var GET_PATIENT_PASSPORT_NUMBER = 'Services/Patients.svc/REST/Covid19_Certificate_GetPassport';
+var SEND_LAB_RESULT_EMAIL_NEW = 'ReportsAPI/api/reports/labReport';

 var UPDATE_WORKPLACE_NAME = 'Services/Patients.svc/REST/ActivateSickLeave_FromVida';
 var GET_SICKLEAVE_STATUS_ADMISSION_NO = 'Services/ChatBot_Service.svc/REST/GetSickLeaveStatusByAdmissionNo';
@ -352,7 +354,7 @@ var CAN_PAY_FOR_FOR_WALKIN_APPOINTMENT = 'Services/Doctors.svc/REST/CanPayForWal
 var CHANNEL = 3;
 var GENERAL_ID = 'Cs2020@2016\$2958';
 var IP_ADDRESS = '10.20.10.20';
-var VERSION_ID = 17.2;
+var VERSION_ID = 18.7;
 var SETUP_ID = '91877';
 var LANGUAGE = 2;
 // var  PATIENT_OUT_SA = 0;
@ -694,6 +696,8 @@ var GET_PROJECT_FROM_NFC = 'Services/OUTPs.svc/Rest/GetProjectByNFC';

 var GET_PATIENT_OCCUPATION_LIST = 'Services/Authentication.svc/REST/GetPatientOccupation';

+var IS_DOCTOR_AVAILABLE_BY_CALENDAR_SCHEDULE = 'Services/OUTPs.svc/REST/HIS_IsDoctorAvailableByCalendarSchedule';
+
 //PAYFORT
 var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails";
 var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse";
@ -704,6 +708,7 @@ var applePayMerchantId = "merchant.com.hmgwebservices";

 class AppGlobal {
  static var context;
+  static var projectViewModelContext;

  AppSharedPreferences sharedPref = AppSharedPreferences();

--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@ -2,43 +2,28 @@
 // Used for Native through Platform Method Channel
 // --------- - -- - - - - - - - - ----------------
 const Map platformLocalizedValues = {
-  "errorConnectingHmgNetwork": {
-    "en": "Sorry you are not connecting to  network",
-    "ar": "نعتذر لست متصل في شكبة مستشفى د.سليمان الحبيب"
-  },
-  "successConnectingHmgNetwork": {
-    "en": "You connected to  network successfully, you can access the app",
-    "ar":
-        "تم التصال بشبكة د.سليمان الحبيب بنجاح, تستطيع الان استخدام تطبيق الحبيب"
-  },
+  "errorConnectingHmgNetwork": {"en": "Sorry you are not connecting to HMG network", "ar": "نعتذر لست متصل في شكبة مستشفى د.سليمان الحبيب"},
+  "successConnectingHmgNetwork": {"en": "You connected to HMG network successfully, you can access the app", "ar": "تم التصال بشبكة د.سليمان الحبيب بنجاح, تستطيع الان استخدام تطبيق الحبيب"},
  "failedConnectingHmgNetwork": {
-    "en":
-        "Sorry the connection to  network had been failed, make sure you are in range of  network",
+    "en": "Sorry the connection to HMG network had been failed, make sure you are in range of HMG network",
    "ar": "نعتذر لقد فشل الاتصال بشبكة د.سليمان الحبيب, تاكد من وجودك داخل نطاق الشبكة"
  },
-  "alreadyConnectedHmgNetwork": {
-    "en": " You already connected to  network to access Alhabib app",
-    "ar": "انت متصل مسبقاً بالشبكة تستطيع استخدام تطبيق الحبيب"
-  },
+  "alreadyConnectedHmgNetwork": {"en": " You already connected to HMG network to access Alhabib app", "ar": "انت متصل مسبقاً بالشبكة تستطيع استخدام تطبيق الحبيب"},
  "somethingWentWrong": {"en": "Sorry something went wrong please try again later", "ar": "نعتذر لخدمتكم يرجى المحاولة لاحقا"},
  "enablingWifi": {"en": "Enabling wifi...", "ar": "Enabling wifi..."},
-  "connectedHmgNetworkWithInternet": {
-    "en": "Successfully connected to the  network to access internet",
-    "ar": "Successfully connected to the HMG network to access internet"
-  },
+  "connectedHmgNetworkWithInternet": {"en": "Successfully connected to the HMG network to access internet", "ar": "Successfully connected to the HMG network to access internet"},
  "connectedToHmgNetworkWithNoInternet": {
-    "en":
-        "Successfully connected to the  network but it have no internet access",
-    "ar":
-        "Successfully connected to the  network but it have no internet access"
+    "en": "Successfully connected to the HMG network but it have no internet access",
+    "ar": "Successfully connected to the HMG network but it have no internet access"
  },
  "notConnectedToHmgNetworkSecurityIssue": {
-    "en": "We are not able to connect you to  network due to security reasons",
-    "ar": "We are not able to connect you to  network due to security reasons"
+    "en": "We are not able to connect you to HMG network due to security reasons",
+    "ar": "We are not able to connect you to HMG network due to security reasons"
  }
 };

 const Map localizedValues = {
+  'kilometerUnit': {'en': 'KM', 'ar': 'كيلومتر'},
  'dashboardScreenToolbarTitle': {'ar': 'الرئيسة', 'en': 'Home'},
  'settings': {'en': 'Settings', 'ar': 'الاعدادات'},
  'language': {'en': 'App Language', 'ar': 'لغة التطبيق'},
@ -139,18 +124,9 @@ const Map localizedValues = {
  "welcome": {"en": "Welcome", "ar": "مرحبا بكم"},
  "welcome-to": {"en": "Welcome to", "ar": "مرحبا بك في"},
  "patient-app": {"en": "Patient App", "ar": "تطبيق المراجعين"},
-  "welcome_text": {
-    "en": "Vida Mobile Application",
-    "ar": "تطبيق فيدا للموبايل"
-  },
-  "dr-sulaiman-text": {
-    "en": "Vida Mobile Application",
-    "ar": "تطبيق فيدا للموبايل"
-  },
-  'welcome_text2': {
-    'en': 'Have you previously visited the hospitals or medical centers?',
-    'ar': "هل سبق لك زيارة المستشفيات أو المراكز الطبية؟"
-  },
+  "welcome_text": {"en": "Dr. Sulaiman Al Habib Mobile Application", "ar": "الدكتور سليمان الحبيب لتطبيقات الهاتف"},
+  "dr-sulaiman-text": {"en": "Dr. Sulaiman Al Habib", "ar": "د. سليمان الحبيب"},
+  'welcome_text2': {'en': 'Have you previously visited the hospitals or medical centers of Dr. Sulaiman Al Habib?', 'ar': 'هل قمت مسبقا بزيارة مستشفيات او مراكز الدكتور سليمان الحبيب الطبية ؟'},
  'yes': {'en': 'Yes', 'ar': 'نعم'},
  'no': {'en': 'No', 'ar': 'لا'},
  "logintyperadio": {"en": " Choose from the below options to login to your medical file.", "ar": " اختر احدى الخيارات أدناه لتسجيل الدخول إلى ملفك الطبي "},
@ -304,7 +280,7 @@ const Map localizedValues = {
  "OnlinePaymentService": {"en": "Online Payment Service", 'ar': 'خدمة الدفع الإلكتروني'},
  "OffersAndPackages": {"en": "Online transfer request", 'ar': 'طلب التحويل الالكتروني'},
  "ComprehensiveMedicalCheckup": {"en": "Comprehensive Medical Check-up", 'ar': 'فحص طبي شامل'},
-  "HMGService": {"en": "Our Service", 'ar': 'الخدمات الإلكترونية'},
+  "HMGService": {"en": "HMG Service", 'ar': 'الخدمات الإلكترونية'},
  "ViewAllHabibMedicalService": {"en": "View All Habib Medical Service", 'ar': 'عرض خدمات الحبيب الطبية'},
  "viewAll": {"en": "View All", 'ar': 'عرض الكل'},
  "view": {"en": "View", 'ar': 'عرض'},
@ -323,14 +299,13 @@ const Map localizedValues = {
  "logs": {"en": "Logs", "ar": "السجلات"},
  "textToSpeech": {"en": "How May I Help You?", "ar": "كيف يمكنني مساعدتك؟"},
  "locationDialogMessage": {
-    "en":
-        "Allow the app to access your location will assist you in showing the hospitals according to the nearest to you.",
+    "en": "Allow the HMG app to access your location will assist you in showing the hospitals according to the nearest to you.",
    "ar": "السماح لتطبيق مجموعة الحبيب الطبية بالوصول إلى موقعك سيساعدك في إظهار المستشفيات وفقًا للأقرب إليك."
  },
  "user-view-requester": {"en": "User Wants to View Your Medical File", "ar": "أشخاص يرغبون في الاطلاع على ملفك الطبي"},
  "user-view": {"en": "User Can View Your Medical File", "ar": "أشخاص مصرح لهم الاطلاع على ملفك الطبي"},
  "parking": {"en": "Parking", "ar": "مواقف"},
-  "alhabiServices": {"en": "Our Service", "ar": "خدمات الحبيب"},
+  "alhabiServices": {"en": "HMG Service", "ar": "خدمات الحبيب"},
  "parkingTitle": {
    "en":
        "Car service, car service, service to save parking information, return to it later, 1- By clicking on (Read the code), save the parking data. 2- By clicking on the button (view my car park), it shows you the car’s location in Google Maps. 3- Read another position by pressing the Clear Position Data button.",
@ -612,6 +587,7 @@ const Map localizedValues = {
  "items": {"en": "item(s)", "ar": "عنصر"},
  "checkOut": {"en": "CHECK OUT", "ar": "الدفع"},
  "sar": {"en": "SAR", "ar": " ر.س "},
+  // "sar": {"en": "", "ar": " "},
  "aed": {"en": "AED", "ar": "درهم"},
  "payOnline": {"en": "PAY ONLINE", "ar": "اتمام عملية الدفع "},
  "cancelOrder": {"en": "CANCEL ORDER", "ar": "الغاء الطلب "},
@ -850,7 +826,7 @@ const Map localizedValues = {
  "Feedback": {"en": "Feedback", "ar": "رأيك يهمنا"},
  "LiveChat": {"en": "Live Chat", "ar": "محادثة مباشرة"},
  "Service": {"en": "Service", "ar": "خدمة"},
-  "HMGServiceLabel": {"en": "Our Service", 'ar': 'خدمات الحبيب'},
+  "HMGServiceLabel": {"en": "HMG Service", 'ar': 'خدمات الحبيب'},
  "HealthWeatherIndicators": {"en": "Health Weather Indicators", 'ar': ' مؤشرات الطقس الصحية '},
  "HealthTipsBasedOnCurrentWeather": {"en": "Health Tips Based On Current Weather", 'ar': ' نصائح صحية بناءاً على الطقس الحالي '},
  "MoreDetails": {"en": "More details", "ar": " المزيد من التفاصيل "},
@ -902,7 +878,7 @@ const Map localizedValues = {
  "select-part": {"en": "Please select the part that complain about", "ar": "يرجى تحديد الجزء الذي تشكو منه"},
  "number": {"en": "Number", "ar": "الرقم"},
  "not-classified": {"en": "Not classified", "ar": "غير محدد"},
-  "selectClinic": {"en": "Select Clinic", "ar": " بحث بالعيادة"},
+  "selectClinic": {"en": "Select Clinic", "ar": "اختر بالعيادة"},
  "selectProject": {"en": "Select Hospital", "ar": " بحث المستشفى"},
  "searchItemError": {"en": "Item name should be more than 3 character ", "ar": "يجب أن يكون الاسم المدخل أكثر من 3 أحرف"},
  "YouCanFind": {"en": "You Can Find ", "ar": "باستطاعتك العثور على "},
@ -915,19 +891,12 @@ const Map localizedValues = {
  "blood-instruction": {"en": "Enter the required information, in order to register for Blood Donation Service", "ar": "ادخل المعلومات المطلوبة للتسجيل بخدمة التبرع بالدم"},
  "view-terms": {"en": "To view the terms and conditions", "ar": "عرض الشروط والأحكام"},
  "wantConnectHmgNetwork": {
-    "en":
-        "Dear customer there is no internet access, do you want to connect with  network to use our app, make sure you are in range of  network",
+    "en": "Dear customer there is no internet access, do you want to connect with HMG network to use our app, make sure you are in range of HMG network",
    "ar": "عزيز العميل لا يوجد اتصال بالإنترنت, هل تريد الاتصال بشبكة مستشفى د. سليمان الحبيب لاستخدام التطبيق. يجب عليك ان تكون في نطاق شبكة المستشفى"
  },
-  "failedToAccessHmgServices": {
-    "en": "Connected with  Network,\n\nBut failed to access  services",
-    "ar": "Connected with  Network,\n\nBut failed to access  services"
-  },
+  "failedToAccessHmgServices": {"en": "Connected with HMG Network,\n\nBut failed to access HMG services", "ar": "Connected with HMG Network,\n\nBut failed to access HMG services"},
  "offerAndPackages": {"en": "Offers and Packages", "ar": "العروض والباقات"},
-  "offerAndPackagesDetails": {
-    "en": "This service allows you to view all  Offers:",
-    "ar": "This service allows you to view all  Offers:"
-  },
+  "offerAndPackagesDetails": {"en": "This service allows you to view all HMG Offers:", "ar": "This service allows you to view all HMG Offers:"},
  "InvoiceNo": {"en": "Invoice No", "ar": "رقم الفاتورة"},
  "InvoiceDate": {"en": "Invoice Date", "ar": "تاريخ الفاتورة"},
  "SpecialResult": {"en": " Special Result", "ar": "نتيجة خاصة"},
@ -1041,7 +1010,7 @@ const Map localizedValues = {
  "waterTracker": {"en": "Water Tracker", "ar": "حساب كمية الماء"},
  "h2o": {"en": "H2O", "ar": "استهلاك"},
  "v-tour": {"en": "Virtual Tour", "ar": "جولة إفتراضية"},
-  "hmg-news": {"en": " News", "ar": "أخبار المجموعة"},
+  "hmg-news": {"en": "HMG News", "ar": "أخبار المجموعة"},
  "blood-d": {"en": "Blood Donation", "ar": "تبرع بالدم"},
  "symptomCheckerTitle": {"en": "Symptom Checker", "ar": "مدقق الأعراض"},
  "latest-news": {"en": "Latest News", "ar": "أحدث الأخبار"},
@ -1368,9 +1337,9 @@ const Map localizedValues = {
  "please_select_gender": {"en": "Please select gender", "ar": "يرجى تحديد الجنس"},
  "covid-info": {
    "en":
-        "Hospitals are conducting a test for the emerging corona virus and issuing travel certificates 24/7 in a short time and with high accuracy. Those wishing to benefit from this service can visit one of branches to conduct a corona test within few minutes, and obtain the result within several hours. Corona Virus Covid 19 testing service with PCR technology to detect the virus according to the highest international standards and with the latest high-precision RT-PCR devices (American GeneXpert and others), That is approved by the Food and Drug Authority as well as by the Saudi Center for Infectious Diseases Prevention.",
+        "Dr. Sulaiman Al Habib hospitals are conducting a test for the emerging corona virus and issuing travel certificates 24/7 in a short time and with high accuracy. Those wishing to benefit from this service can visit one of Dr. Sulaiman Al Habib branches to conduct a corona test within few minutes, and obtain the result within several hours. Corona Virus Covid 19 testing service with PCR technology to detect the virus according to the highest international standards and with the latest high-precision RT-PCR devices (American GeneXpert and others), That is approved by the Food and Drug Authority as well as by the Saudi Center for Infectious Diseases Prevention.",
    "ar":
-        "تقوم المستشفيات بإجراء فحص فيروس كورونا المستجد وإصدار شهادات السفر على مدار الساعة وطوال أيام الأسبوع في وقت قصير وبدقة عالية، ويمكن للراغبين في الاستفادة من هذه الخدمة زيارة أحد الفروع لإجراء فحص كورونا خلال دقائق معدودة، والحصول على النتيجة خلال عدة ساعات. خدمة فحص فيروس كورونا كوفيد 19 بتقنية PCR للكشف عن الفيروس وفق أعلى المعايير العالمية وبأحدث أجهزة RT-PCR عالية الدقة (جينيكسبرت الأمريكية وغيرها)، المعتمدة من هيئة الغذاء والدواء وكذلك من المركز السعودي للوقاية من الأمراض المعدية."
+        "تجري مستشفيات د. سليمان الحبيب فحص فيروس كورونا المستجد وتصدر شهادات السفر على مدار الساعة، طوال أيام الأسبوع، وبسرعة ودقة عالية. يمكن للراغبين في الاستفادة من هذه الخدمة زيارة أحد فروع مستشفيات د. سليمان الحبيب وإجراء فحص كورونا خلال بضع دقائق والحصول على النتائج خلال عدة ساعات خدمة فحص فيروس كورونا Covid 19 بتقنية PCR للكشف عن الفيروس وفقاً لأعلى المعايير العالمية وبأحدث أجهزة RT-PCR عالية الدقة (GeneXpert الأمريكي وغيره)، وهي طرق معتمدة من قبل هيئة الغذاء والدواء وكذلك من قبل المركز السعودي للوقاية من الأمراض المُعدية"
  },
  "select-appo": {"en": "Kindly select one of the available appointments from below:", "ar": " يرجى اختيار أحد المواعيد المتاحة مما يلي:"},
  "covid-alert-header": {"en": "Pay With-in 15 mins to confirm the appointment", "ar": "الرجاء اتمام عملية الدفع خلال 15 دقيقه لتاكيد الموعد"},
@ -1458,9 +1427,9 @@ const Map localizedValues = {
  "type": {"en": "Type", "ar": "اكتب"},
  "info-ereferral": {
    "en":
-        "This service allows you to submit a Referral request from any health care providers either inside or outside the kingdom of Saudi Arabia to any of  Hospitals, by filling some of the patient's data and attaching the medical reports, moreover you can track the request status (Under process, Accepted or Rejected)",
+        "This service allows you to submit a Referral request from any health care providers either inside or outside the kingdom of Saudi Arabia to any of HMG Hospitals, by filling some of the patient's data and attaching the medical reports, moreover you can track the request status (Under process, Accepted or Rejected)",
    "ar":
-        "تتيح لك هذه الخدمة إرسال طلب إحالة من أي من مقدمي الرعاية الصحية سواء داخل المملكة العربية السعودية أو خارجها إلى أي من مستشفيات  ، عن طريق ملء بعض بيانات المراجع وإرفاق التقارير الطبية ، علاوة على ذلك يمكنك تتبع حالة الطلب (قيد المعالجة ، مقبول أو مرفوض)"
+        "تتيح لك هذه الخدمة إرسال طلب إحالة من أي من مقدمي الرعاية الصحية سواء داخل المملكة العربية السعودية أو خارجها إلى أي من مستشفيات HMG ، عن طريق ملء بعض بيانات المراجع وإرفاق التقارير الطبية ، علاوة على ذلك يمكنك تتبع حالة الطلب (قيد المعالجة ، مقبول أو مرفوض)"
  },
  "er-consultation": {
    "en": "This service allows you to make an online virtual consultation via video call directly with the doctor from anywhere at any time.",
@ -1630,8 +1599,8 @@ const Map localizedValues = {
  "RequesterInfo": {"en": "Requester Info", "ar": "معلومات مقدم الطلب"},
  "PatientInfo": {"en": "Patient Info", "ar": "معلومات المراجع"},
  "OtherInfo": {"en": "Other Info", "ar": "معلومات اخرى"},
-  "inPrgress": {"en": "In Progress", "ar": "في تقدم"},
-  "locked": {"en": "Locked", "ar": "مقفل"},
+  "inPrgress": {"en": "Active", "ar": "نشط"},
+  "locked": {"en": "Inactive", "ar": "غير نشط"},
  "personalInfo": {"en": "Personal Information", "ar": "معلومات شخصية"},
  "cmcTitle": {"en": "Comprehensive", "ar": "خدمة"},
  "cmcSubtitle": {"en": "Medical Checkup", "ar": "الفحص الشامل"},
@ -1838,7 +1807,7 @@ const Map localizedValues = {
  "connectSubtitle": {"en": "With us", "ar": "معنا"},
  "covidConsent": {
    "en":
-        "Covid-19 Test feature allows you to book an appointment for the Covid-19 Lab test within  branches, where a swab sample will be collected & processed. Once the result has been processed, we shall notify you via SMS on your registered mobile number & the test result will also be available in the Lab Results section of this app. Please note that this result is only available to you & not publicly available to anyone else.",
+        "Covid-19 Test feature allows you to book an appointment for the Covid-19 Lab test within HMG branches, where a swab sample will be collected & processed. Once the result has been processed, we shall notify you via SMS on your registered mobile number & the test result will also be available in the Lab Results section of this app. Please note that this result is only available to you & not publicly available to anyone else.",
    "ar":
        "تتيح لك ميزة اختبار كوفيد19  حجز موعد في احد فروع مجموعة الحبيب الطبية ، حيث سيتم اخذ عينة المسحة ومعالجتها. بمجرد معالجة النتيجة ، سنخطرك عبر رسالة نصية قصيرة على رقم هاتفك المحمول المسجل وستكون نتيجة الاختبار متاحة أيضًا على التطبيق في قسم نتائج المختبر. يرجى ملاحظة أن هذه النتيجة متاحة لك فقط وليست متاحة للجمهور او اي  شخص آخر. الرجاء الموافقة للتأكيد والمتابعة."
  },
@ -1857,7 +1826,7 @@ const Map localizedValues = {
  },
  "locationPermissionDialog": {
    "en":
-        "Dr. Al Habib app collects location data to show the nearest  hospitals and ER Locations and provides health care services to your location and Health weather indicators service and the medication delivery.",
+        "Dr. Al Habib app collects location data to show the nearest HMG hospitals and ER Locations and provides health care services to your location and Health weather indicators service and the medication delivery.",
    "ar": "يحتاج تطبيق دكتور الحبيب إلى صلاحية الوصول الى الموقع لإظهار أقرب مستشفيات المجموعة، مواقع الطوارئ، تقديم خدمات الرعاية الصحية إلى موقعك، خدمة مؤشرات الطقس الصحية وكذلك خدمة توصيل الأدوية."
  },
  "calendarPermission": {
@ -1869,8 +1838,7 @@ const Map localizedValues = {
    "ar": "يحتاج تطبيق دكتور الحبيب إلى صلاحية الوصول الى الصوت لتفعيل خدمة الأوامر الصوتية."
  },
  "wifiPermission": {
-    "en":
-        "Dr. Al Habib app needs to access WiFi state permission to connect to the  WiFi network from within the app when you visit the hospital.",
+    "en": "Dr. Al Habib app needs to access WiFi state permission to connect to the HMG WiFi network from within the app when you visit the hospital.",
    "ar": "يحتاج تطبيق دكتور الحبيب إلى الوصول إلى الواي فاي للاتصال بشبكة الواي فاي في المجموعة عند زيارة المستشفى."
  },
  "physicalActivityPermission": {
@ -1925,15 +1893,11 @@ const Map localizedValues = {
  "pharmaLiveCare": {"en": "Pharma LiveCare", "ar": "لايف كير الصيدلية"},
  "pharmaLiveCare1": {"en": "What is Pharma LiveCare?", "ar": "ما هولايف كير الصيدلية؟"},
  "pharmaLiveCareDesc1": {
-    "en":
-        "Pharma LiveCare allows you to get consultation from your doctor virtually being in  Pharmacy booth.",
+    "en": "Pharma LiveCare allows you to get consultation from your doctor virtually being in HMG Pharmacy booth.",
    "ar": "تتيح لك خدمة لايف كير الصيدلية الحصول على استشارة من طبيبك المتواجد فعليًا في كشك صيدلية د.سليمان الحبيب."
  },
  "wherePharmaLiveCare": {"en": "Where can i find Pharma LiveCare?", "ar": "أين يمكنني أن أجد لايف كير الصيدلية؟"},
-  "pharmaLiveCareDesc2": {
-    "en": "You can find the booth in  Pharmacies.",
-    "ar": "يمكنك العثور على الكشك في صيدليات مستشفى د.سليمان الحبيب."
-  },
+  "pharmaLiveCareDesc2": {"en": "You can find the booth in HMG Pharmacies.", "ar": "يمكنك العثور على الكشك في صيدليات مستشفى د.سليمان الحبيب."},
  "howPharmaLiveCare": {"en": "How can i use Pharma LiveCare?", "ar": "كيف يمكنني استخدام لايف كير الصيدلية؟"},
  "pharmaLiveCareDesc3": {
    "en": "Following the below steps you can easily benefit from the virtual consultation service:",
@ -2087,7 +2051,7 @@ const Map localizedValues = {
  "communicationConsent": {"en": "COMMUNICATION VIA EMAIL, TEXT MESSAGES AND PHONE CALLS: ", "ar": "الاتصال عبر البريد الإلكتروني والرسائل النصية والمكالمات الهاتفية: "},
  "generalConsent3": {
    "en":
-        "I understand that the contact number or Email that I have provided on registration will be used for communication by the Hospital. I hereby agree to be notified by the Hospital through SMS, Email, phone calls or any other method, for appointments notifications, special promotions, new features or products, current medical services, and of any services introduced by the Hospital or any third party in the future or any modifications made to the services offered by the Hospital. And these messages may be submitted as evidence where the Hospital has the right to use at any time whatsoever and as it sees fit. I understand the risks of communicating by email and text messages, in particular the privacy risks. I understand that the Hospital cannot guarantee the security and confidentiality of email or text communication. The Hospital will not be responsible for messages that are not received or delivered due to technical failure, or for disclosure of confidential information unless caused by intentional misconduct.",
+    "I understand that the contact number or Email that I have provided on registration will be used for communication by the Hospital. I hereby agree to be notified by the Hospital through SMS, Email, phone calls or any other method, for appointments notifications, special promotions, new features or products, current HMG's medical services, and of any services introduced by the Hospital or any third party in the future or any modifications made to the services offered by the Hospital. And these messages may be submitted as evidence where the Hospital has the right to use at any time whatsoever and as it sees fit. I understand the risks of communicating by email and text messages, in particular the privacy risks. I understand that the Hospital cannot guarantee the security and confidentiality of email or text communication. The Hospital will not be responsible for messages that are not received or delivered due to technical failure, or for disclosure of confidential information unless caused by intentional misconduct.",
    "ar":
    "المستشفى أدرك بأن رقم الجوال الهاتف أو البريد الإلكتروني الذي قدمته في نموذج التسجيل سيستخدم كوسيلة اتصال بيني وبين | وأقر بموافقتي على قيام المستشفى بإخطاري عن طريق رسائل البريد أو الرسائل القصيرة أو البريد الإلكتروني أو المكالمات الهاتفية أو أي طريقة أخرى بالمواعيد والعروض الترويجية أو المميزات والمنتجات الخاصة بالمستشفى أو) خاصة بأي طرف خارجي) وبأي خدمات طبية تقدمها المجموعة أو قد يطرحها المستشفى في المستقبل أو أي تعديلات قد تطرأ على الخدمات المقدمة من قبل المستشفى. وتعتبر هذه الرسائل دليل إثبات يحق للمستشفى استخدامه في اي وقت يشاء. أفهم مخاطر التواصل عبر البريد الإلكتروني والرسائل النصية خاصة مخاطر الخصوصية وأدرك أن المستشفى لا يمكنه ضمان أمن وسرية البريد الإلكتروني أو الرسائل النصية ولن يكون المستشفى مسؤول عن الرسائل التي لم يتم استلامها أو تسليمها بسبب الفشل التقني أو الكشف عن المعلومات السرية ما لم يكن سببها سوء سلوك متعمد."
  },
@ -2175,32 +2139,192 @@ const Map localizedValues = {
  "EROnlineCheckInWaitTurnInstruction": {"en": "Please wait in the waiting area until called by the nurse.", "ar": "يرجى الانتظار في منطقة الانتظار حتى يتم استدعاؤك من قبل الممرضة."},
  "EROnlineCheckInHoldPhoneInstruction": {"en": "Hold the phone 1 to 2 cm from the NFC sign displayed on the board", "ar": "امسك الهاتف على مسافة 1 إلى 2 سم من علامة NFC المعروضة على اللوحة"},
  "EROnlineCheckInTapOnCheckIn": {"en": "Tap on the check-in button within the app", "ar": "اضغط على زر تسجيل الدخول داخل التطبيق"},
-
  "download": {"en": "Download", "ar": "تحميل"},
  "share": {"en": "Share", "ar": "يشارك"},
-  "byFace": {"en": "By Face", "ar": "حسب الوجه"},
-  "stress": {"en": "Stress", "ar": "ضغط"},
-  "cvd": {"en": "Cardiovascular Disease (CVD) Risk", "ar": "مخاطر أمراض القلب والأوعية الدموية (CVD)"},
-  "generalWellness": {"en": "General Wellness", "ar": "العافية العامة"},
-  "BMI": {"en": "BMI", "ar": "مؤشر كتله الجسم"},
-  "respiratoryRate": {"en": "Respiratory Rate", "ar": "معدل التنفس"},
-  "oxygenSaturation": {"en": "Oxygen Saturation", "ar": "تشبع الأكسجين"},
-  "scanning": {"en": "Scanning", "ar": "المسح الضوئي"},
-  "normal": {"en": "Normal", "ar": "عادي"},
-  "poor": {"en": "Poor", "ar": "فقير"},
-  "low": {"en": "Low", "ar": "منخفض"},
-  "atRisk": {"en": "At Risk", "ar": "في خطر"},
-  "high": {"en": "High", "ar": "عال"},
-  "moderatelyHigh": {"en": "Moderately high", "ar": "مرتفع بشكل معتدل"},
-  "possiblyLow": {"en": "Possibly low", "ar": "ربما منخفض"},
-  "slightylyHigh": {"en": "Slightly high", "ar": "مرتفع قليلا"},
-  'frameRate': {'ar': 'معدل الإطارات', 'en': 'FrameRate'},
-  'movement': {'ar': 'الحركة', 'en': 'Movement'},
-  'centered': {'ar': 'مركّز', 'en': 'Centered'},
-  'lighting': {'ar': 'الإضاءة', 'en': 'Lighting'},
-  'scanningConditions': {'ar': 'شروط المسح', 'en': 'Scanning Conditions'},
-  'serverReady': {'ar': 'الخادم جاهز', 'en': 'Server Ready'},
-  'analyzingData': {'ar': 'تحليل البيانات...', 'en': 'Analyzing Data...'},
-  'collectingData': {'ar': 'جمع البيانات...', 'en': 'Collecting Data...'},
-  'waitingData': {'ar': 'انتظار البيانات...', 'en': 'Waiting Data...'},
+  "nearest": {"en": "Nearest", "ar": "الأقرب"},
+  "selectRegion": {"en": "Select Region", "ar": "اختر المنطقة"},
+  "selectFacitlity": {"en": "Select Facility", "ar": "اختر المنشأة"},
+  "selectDoctor": {"en": "Select Doctor", "ar": "اختر الطبيب"},
+  "hmgHospital": {"en": "Hospital", "ar": "المستشفيات "},
+  "hmcHospital": {"en": "Medical Center", "ar": "المراكز الطبية"},
+  "hmcHospitalCountSingle": {
+    "en": "@ Medical Center",
+    "ar": "المراكز الطبية @"
+  },
+  "hmgHospitalCountSingle": {"en": "@ Hospital", "ar": "المستشفيات @"},
+  "hmcHospitalCountPlural": {
+    "en": "@ Medical Centers",
+    "ar": "المراكز الطبية @"
+  },
+  "hmgHospitalCountPlural": {"en": "@ Hospitals", "ar": "المستشفيات @"},
+
+  "termsHeading": {"en": "ONLINE SERVICES TERMS OF USE", "ar": "شروط استخدام الخدمات الالكترونية"},
+  "termsConditions1": {"en": "These Online Services Terms of Use (Service Terms) govern certain online services provided by Dr Sulaiman Al Habib Medical Services Group Company (HMG, we, us, our) to the visitors and users of our websites and mobile app (you, your).", "ar": "تخضع الخدمات الالكترونية المحددة التي تقدمها شركة مجموعة الدكتور سليمان الحبيب للخدمات الطبية (المجموعة، نحن، والضمائر التي تشير إلينا) إلى زوار ومستخدمي مواقع الويب الخاصة بنا وتطبيقاتنا المحمولة (أنت، والضمائر التي تشير إليك) لشروط استخدام الخدمات الالكترونية (شروط الخدمة) هذه."},
+  "termsConditions2": {"en": "By accessing our websites and/or mobile app, you agree to our Website Terms of Use and App User Agreement, as applicable (General Terms), which creates an agreement between you and us. When you accept these Service Terms they are incorporated into and become part of that same agreement. ", "ar": "بمجرد دخولك إلى مواقع الويب و/أو تطبيق الجوال الخاص بنا، فإنك توافق على شروط استخدام الموقع الإلكتروني الخاص بنا واتفاقية مستخدم التطبيق، حسب الاقتضاء (الشروط العامة)، والتي اتفاقاً بينك وبيننا. عندما تقبل شروط الخدمة هذه، فإنها تصبح مشمولة في وتشكل جزءا من نفس الاتفاقية."},
+  "termsConditions3": {"en": "Please ensure you have read our Privacy Policy. Use of our online services may require you to provide us with personal information to create an account and may also require you to provide us with personal information, including information related to your health and wellbeing, to access specific services. If you purchase items from us and wish to bill charges to your insurance provider, we will need to provide personal information relating to you and your purchase to your insurance provider. By using our online services, you agree and consent to our use of your personal information in accordance with the Privacy Policy.", "ar": "يرجى التأكد من أنك قد قرأت سياسة الخصوصيةالخاصة بنا. قد يتطلب منك استخدام خدماتنا عبر الإنترنت أن تزودنا بالمعلومات الشخصية لإنشاء حساب قد تتطلب منك أيضاً تزويدنا بالمعلومات الشخصية بما في ذلك المعلومات المتعلقة بصحتك ورفاهيتك، للوصول إلى خدمات محددة. إذا قمت بشراء سلع منا وترغب منا في تقاضي قيمة الفاتورة من مزود التأمين الخاص بك، فسوف نحتاج إلى تقديم معلومات شخصية تتعلق بك وبمشترياتك لمزود التأمين الخاص بك. بمجرد استخدامك لخدماتنا الالكترونية، فإنك توافق على استخدامنا لمعلوماتك الشخصية وفقاً لسياسة الخصوصية."},
+  "termsConditions4": {"en": "The Service Terms apply when you access services on our Sites, which require you to create a user account or log-in to your existing user account. You are required to indicate your acceptance of these Service Terms when creating your user account. If the Service Terms are updated by us, you will be required to confirm your agreement again, on your next log-in.", "ar": "تنطبق شروط الخدمة عند دخولك إلى الخدمات على مواقعنا التي تتطلب منك إنشاء حساب مستخدم أو تسجيل الدخول إلى حساب المستخدم الحالي. يتعين عليك الإشارة إلى قبولك لشروط الخدمة هذه عند إنشاء حساب المستخدم الخاص بك. إذا تم تحديث شروط الخدمة من قبلنا، فسيُطلب منك تأكيد موافقتك عليها مرة أخرى، عند تسجيل الدخول التالي الخاص بك."},
+  "termsConditions5": {"en": "Telehealth and Online Pharmacy - Additional terms apply to our telehealth and online pharmacy services, and you will be required to agree to such terms before using those particular services.", "ar": "الرعاية الصحية عن بعد والصيدلية الإلكترونية – تنطبق شروط إضافية على خدماتنا المتعلقة بالرعاية الصحية عن بُعد والصيدلية الإلكترونية، ويتعين عليك الموافقة على هذه الشروط قبل استخدام هذه الخدمات."},
+  "termsHeading2": {"en": "1. GENERAL TERMS", "ar": "1.	أحكام عامة"},
+  "termsConditions6": {"en": "The General Terms form part of this agreement, and all provisions of the General Terms apply to our online services.", "ar": "تشكل الشروط العامة جزءاً من هذه الاتفاقية وتُطبق جميع أحكام الشروط العامة على خدماتنا الإلكترونية عبر الإنترنت."},
+  "termsHeading3": {"en": "2. APPOINTMENT BOOKING CONDITIONS", "ar": "2.	شروط حجز الموعد"},
+  "termsConditions7": {"en": "2.1	The Sites (all the websites defined in the General Terms, along with the mobile app) must not be used for speculative, false, or fraudulent appointment bookings. You warrant, represent and undertake that all information you provide about yourself and about anyone else is true and accurate when you are providing information to make an appointment.", "ar": "2-1	يتعين عليك ألا تستخدم المواقع (جميع مواقع الويب المحددة في الشروط العامة، إلى جانب تطبيق الجوال) لإجراء حجوزات غير مؤكدة أو خاطئة أو احتيالية. أنت تضمن وتقر وتتعهد بأن جميع المعلومات التي تقدمها عن نفسك وحول أي شخص آخر هي معلومات صحيحة ودقيقة عند تقديمك لمعلومات لحجز موعد."},
+  "termsConditions8": {"en": "2.2	Appointment bookings can only be made through the Sites for selected HMG hospitals and clinics, to be determined at our sole discretion. ", "ar": "2-2	لا يمكن إجراء حجوزات المواعيد إلا من خلال مواقع مستشفيات وعيادات المجموعة المحددة، والتي نقوم بتحديدها وفقاً لتقديرنا الخاص."},
+  "termsConditions9": {"en": "2.3	Once the appointment booking has been made through the Site, you will be required to confirm your appointment through the Sites, by phone, or in person at least twenty-four (24) hours prior to the appointment.", "ar": "2-3	بمجرد إجراء حجز المواعيد من خلال الموقع، سيُطلب منك تأكيد موعدك من خلال المواقع أو عن طريق الهاتف أو شخصياً قبل ما لا يقل عن أربعة وعشرين (24) ساعة من الموعد."},
+  "termsConditions10": {"en": "2.4	For those HMG hospitals and clinics for which appointment bookings through the Sites are not permitted, you shall be required to book an appointment by phone or in person.", "ar": "2-4	بالنسبة لمستشفيات وعيادات المجموعة التي لا يسمح بحجز مواعيد فيها من خلال المواقع، يتعين عليك حجز موعد عبر الهاتف أو شخصياً. "},
+  "termsConditions11": {"en": "2.5	You must register in accordance with the terms outlined in clause 7 to be able to make appointment bookings through the Sites.", "ar": "2-5	يتعين عليك التسجيل وفقاً للشروط المبينة في البند 7 لكي تتمكن من إجراء حجوزات المواعيد من خلال المواقع."},
+  "termsConditions12": {"en": "2.6	In using the Sites, you will be entitled to:", "ar": "2-6	عند استخدامك للمواقع، فإنه يحق لك:"},
+  "termsConditions12a": {"en": "a) book an appointment at an HMG hospital or clinic ", "ar": "(1) حجز موعد في إحدى مستشفيات أو عيادات المجوعة"},
+  "termsConditions12b": {"en": "b) book one appointment at given time", "ar": "(2) حجز موعد في وقت معين"},
+  "termsConditions12c": {"en": "c) book one appointment at given clinic. ", "ar": "(3) حجز موعد في عيادة معينة."},
+  "termsConditions13": {"en": "To ensure there is no misunderstanding, In case that you won’t attend your confirmed appointment, you shall be required to cancel or reschedule appointment by phone or in person or through the Sites.", "ar": "	تفادياً للشك، في حال عدم الرغبة في الحضور للموعد المؤكد، يتعين عليك إلغاء أو إعادة جدولة أي موعد مؤكد إما عن طريق الهاتف أو شخصياً أو من خلال المواقع."},
+  "termsConditions14": {"en": "2.7	We reserve the right to disable your ability to book appointments through the Sites for a period, the duration of which is at sole discretion in the following circumstances: ", "ar": "2-7	نحن نحتفظ بالحق في تعطيل قدرتك على حجز المواعيد من خلال المواقع لفترة يتم تحديد مدتها وفقًا لتقديرنا الخاص، وذلك في الحالات التالية:"},
+  "termsConditions14a": {"en": "a) you fail to attend appointments booked and confirmed through the Sites ", "ar": "(1) في حال أخفقت في حضور  مواعيد تم حجزها وتأكيدها من خلال المواقع"},
+  "termsConditions14b": {"en": "b) we determine at our sole discretion to do so for whatever reason. ", "ar": "(1) في حال أخفقت في حضور  مواعيد تم حجزها وتأكيدها من خلال المواقع"},
+  "termsHeading4": {"en": "3. ONLINE ENQUIRY CONDITIONS", "ar": "3.	شروط الاستفسار عبر الإنترنت"},
+  "termsConditions15": {"en": "3.1	You shall be entitled to communicate your enquiries to doctors through the Sites should you have visited an HMG hospital or clinic within the last 14 days. The enquiry must be submitted to the doctor with whom you had your appointment. For enquiries that are not directed towards doctors, you can submit them through the Sites without any time limitation.", "ar": "3-1	يحق لك إيصال استفساراتك إلى الأطباء من خلال المواقع في حال كان قد سبق لك أن قمت بزيارة أي مستشفى أو عيادة في المجموعة خلال الـ 14 يوما الماضية. يجب تقديم الاستفسار إلى الطبيب الذي كان لديك موعد معه. بالنسبة للاستفسارات التي لا يتم توجيهها إلى الأطباء، يمكنك إرسالها عبر المواقع دون أي قيود زمنية."},
+  "termsConditions16": {"en": "3.2	In using the Sites, you shall only be entitled to:", "ar": "3-2	عند استخدامك للمواقع، فإنه لا يحق لك سوى:"},
+  "termsConditions16a": {"en": "a) submit the enquiry to the doctor with whom you had your appointment within the last 14 days.", "ar": "(1) إرسال الاستفسار للطبيب الذي كان لديك موعد معه خلال الـ 14 يوما الماضية."},
+  "termsConditions16b": {"en": "b) only make one doctor enquiry in any twenty-four (24) hour period.", "ar": "(2) إرسال استفسار واحد فقط للطبيب في أي فترة أربع وعشرين (24) ساعة."},
+  "termsConditions17": {"en": "3.3	A response to enquiries made through the Sites is not guaranteed and is subject to doctor availability. Responses to enquiries will be subject to the doctor's sole discretion.", "ar": "3-3	عدم ضمان استجابة الاستفسارات المقدمة من خلال المواقع وهي عرضة لتوافر الطبيب. الردود على الاستفسارات سوف تخضع لتقدير الطبيب وحده ."},
+  "termsConditions18": {"en": "3.4	Any response to enquiries made through the Sites which include details concerning, amongst other things, prescriptions, lab results, and radiology reports should not be considered as final and should be verified and stamped by the relevant medical office.", "ar": "3-4	أي رد على الاستفسارات المقدمة من خلال المواقع التي تشمل تفاصيل تتعلق، من بين الأشياء الأخرى، بالوصفات الطبية، نتائج المختبرات وتقارير الأشعة ينبغي عدم اعتبارها نهائية وينبغي التحقق منها وختمها من قبل المكتب الطبي المختص."},
+  "termsConditions19": {"en": "3.5	We reserve the right to disable your ability to make enquiries through the Sites for a period, the duration of which is at sole discretion in the following circumstances:", "ar": "3-5	نحن نحتفظ بالحق في تعطيل قدرتك على إرسال الاستفسارات من خلال المواقع لأي فترة يتم تحديد مدتها وفقًا لتقديرنا الخاص في الحالات التالية:"},
+  "termsConditions19a": {"en": "a) you fail to attend three (3) appointments booked and confirmed through the Sites. ", "ar": "(1) في حال أخفقت في حضور ثلاثة (3) مواعيد تم حجزها وتأكيدها من خلال المواقع. "},
+  "termsConditions19b": {"en": "b) we determine at our sole discretion to do so for whatever reason.", "ar": "(2) في حال ارتأينا القيام بذلك وفقاً لتقديرنا المنفرد لأي سبب كان."},
+  "termsHeading5": {"en": "4. PURCHASE CONDITIONS", "ar": "4.	شروط الشراء"},
+  "termsConditions20": {"en": "4.1	The Sites must not be used for speculative, false, or fraudulent purchases. You warrant, represent and undertake that all information you provide about yourself and about anyone else is true and accurate when you are making payments to the Sites. ", "ar": "4-1	يتعين عدم استخدام المواقع لإجراء مشتريات مضاربة أو خاطئة أو احتيالية. أنت تضمن وتقر وتتعهد بأن جميع المعلومات التي تقدمها عن نفسك وحول أي شخص آخر هي معلومات صحيحة ودقيقة عند سدادك لمدفوعات عبر المواقع."},
+  "termsConditions21": {"en": "4.2	Services purchased through the Sites as a result of visits to the Sites made by you will be subject to the policy that applies to the particular services purchased by you (Policy). In the event of any discrepancy between these Terms of Use and the relevant Policy, the terms of the Policy will prevail, but only to the extent of the inconsistency. If there is a Policy for any particular service, it will be made clear to you before you access the service.", "ar": "4-2	الخدمات التي تم شراؤها من خلال المواقع نتيجة لزياراتك إلى المواقع، ستكون خاضعة للسياسة التي تنطبق على الخدمات المعينة التي تم شراؤها من جانبك (السياسة). في حالة وجود أي تباين بين شروط الاستخدام هذه والسياسة ذات الصلة، فإنه يُعتد بشروط السياسة، ولكن فقط في حدود ذلك التعارض . إذا كانت هناك سياسة محددة لأي خدمة معينة، فسيتم توضيحها لك قبل دخولك إلى الخدمة."},
+  "termsHeading6": {"en": "5. PRICING AND AVAILABILITY", "ar": "5.	التسعير والتوافر"},
+  "termsConditions22": {"en": "5.1	Unless otherwise expressly stated, all prices on the Sites are exclusive of all applicable taxes and surcharges. All prices are expressed to be in Saudi riyals, as indicated on the Sites. We may also accept payment in US dollars, if indicated.", "ar": "5-1	ما لم يرد نص على خلاف ذلك صراحةً، فإن جميع الأسعار على المواقع لا تشمل أياً من الضرائب والرسوم الإضافية المعمول بها. جميع الأسعار معبر عنها بالريال السعودي، كما هو موضح في المواقع. قد نقبل أيضاً الدفع بالدولار الأمريكي، إذا تم بيان ذلك."},
+  "termsConditions23": {"en": "5.2	Prices and availability stated on the Sites are subject to change at any time until your online purchase has been confirmed and your payment has been processed. While we will endeavour to ensure that the information on the Sites is as accurate and as up to date as possible, we do not provide a warranty to that effect. You acknowledge that we have no responsibility for the accuracy, completeness, currency or timeliness of price and availability information that is made available on the Sites.", "ar": "5-2	الأسعار ومدى التوافر الموضح على المواقع عرضة للتغيير في أي وقت حتى يتم تأكيد الشراء عبر الإنترنت ومعالجة مدفوعاتك بنجاح. رغم أننا سنسعى للتأكد من أن المعلومات الموجودة على المواقع دقيقة ومحدثة قدر الإمكان، إلا أننا لا نقدم أي ضمان بهذا الخصوص. أنت تقر بأننا لا نتحمل أي مسؤولية عن دقة معلومات السعر ومدى التوافر المبين على المواقع أو مدى اكتمالها أو حداثتها أو إتاحتها في الوقت المناسب."},
+  "termsConditions24": {"en": "5.3	Special offers may be advertised on the Sites at any time. Special offers are not applicable to any transactions that have already been confirmed.", "ar": "5-3	قد يتم الإعلان عن عروض خاصة على المواقع في أي وقت. لا تنطبق العروض الخاصة على أي معاملات سبق أن تم تأكيدها بالفعل."},
+  "termsHeading7": {"en": "6. PAYMENTS", "ar": "6.	سداد المدفوعات"},
+  "termsConditions25": {"en": "6.1	We may accept the following methods of payment: ", "ar": "6-1	يجوز لنا قبول طرق السداد التالية:"},
+  "termsConditions25a": {"en": "a) direct debit bank transfers in accordance with the provisions of clause 6.2 below: ", "ar": "(1) تحويلات بنكية بالخصم المباشر وفقاً لأحكام البند 6-2 أدناه:  "},
+  "termsConditions25b": {"en": "b) credit card payments in accordance with the provisions of clauses 6.3, 6.4 and 6.5 below: ", "ar": "(2) مدفوعات بطاقات الائتمان وفقاً لبنود 6-3 و 6-4 و 6-5 أدناه: "},
+  "termsConditions25c": {"en": "c) direct billing to medical insurance providers in accordance with the provisions of clause 6.6 below. ", "ar": "(3) الفواتير المباشرة لمزودي خدمات التأمين الطبي وفقاً لأحكام البند 6-6 أدناه."},
+  "termsConditions26": {"en": "6.2	All payments made by direct debit bank transfer should be made to respective bank account that will be shown along with your purchasing activity.", "ar": "6-2	يجب أن يتم سداد جميع المدفوعات التي تتم عن طريق التحويل المصرفي بالخصم المباشر إلى الحساب المصرفي المعني الذي سيتم بيانه جنباً إلى جنب مع عملية الشراء التي تخصك."},
+  "termsConditions27": {"en": "6.3	We accept all major international credit and debit cards (each a Card). Your Card will be debited when you click the 'confirm payment' button. ", "ar": "6-3	نقبل جميع بطاقات الائتمان والخصم الدولية الرئيسية (ويُشار إلى كل منها بلفظ بطاقة). سيتم الخصم من بطاقتك عندما تنقر على زر 'تأكيد الدفع'."},
+  "termsConditions28": {"en": "6.3	We accept all major international credit and debit cards (each a Card). Your Card will be debited when you click the 'confirm payment' button. ", "ar": "6-3	نقبل جميع بطاقات الائتمان والخصم الدولية الرئيسية (ويُشار إلى كل منها بلفظ بطاقة). سيتم الخصم من بطاقتك عندما تنقر على زر 'تأكيد الدفع'."},
+  "termsConditions29": {"en": "6.4	Please supply us with the correct c card billing and cardholder information (Payment Information). If you do not supply the correct Payment Information, purchases made through the Sites may be delayed. We reserve the right to cancel purchases made through the Sites if payment is declined or if you have supplied incorrect Payment Information.", "ar": "6-4	يرجى تزويدنا بفاتورة البطاقة الصحيحة ومعلومات حامل البطاقة (معلومات الدفع). إذا لم تقدم معلومات الدفع الصحيحة، فقد تتأخر عمليات الشراء التي تتم عبر المواقع. نحتفظ بالحق في إلغاء المشتريات التي تتم عبر المواقع إذا تم رفض الدفع أو إذا قدمت معلومات دفع غير صحيحة."},
+  "termsConditions30": {"en": "6.5	We may incur charges when a booking is made through the Sites using a Card. We reserve the right to pass on to you, in full, any changes incurred by us in connection with any purchase made through the Sites by you using a Card. We will let you know of any applicable charges prior to you clicking the 'confirm payment' button.", "ar": "6-5	قد نتحمل  رسوماً عند إجراء الحجز عبر المواقع باستخدام البطاقة. نحتفظ بالحق في أن نتقاضى منك، بالكامل، أي تغييرات نُطالب بدفعها فيما يتعلق بأي عملية شراء يتم إجراؤها عبر المواقع بواسطتك باستخدام البطاقة. سنخبرك بأي رسوم مطبقة قبل النقر فوق زر 'تأكيد الدفع'."},
+  "termsConditions31": {"en": "6.6	If our Site provides the option for you to submit insurance provider details for the purposes of direct billing then you may do so. We may provide the ability for you to store insurance details on your account profile. You are responsible for ensuring all insurance details provided are valid and up to date. You represent and warrant to us that any insurance details you provide will relate to a valid medical insurance policy which covers treatment in the country from which you are making your purchase. You acknowledge that we will need to provide details to your insurer of your  purchase, and you hereby consent to us doing so. Before we confirm an order, we will need to verify that your insurer accepts payment for the order. If the insurer declines payment or you are required to pay part or all of the order  price, we will contact you and the order will not progress until you have paid the remainder of the total amount due. Aside from seeking approval of costs in accordance with the information you provide with your order, we cannot act as an intermediary for communications between you and your insurer and we accept no liability whatsoever for any delay, act or omission of your insurer. If you are unhappy with your insurer’s treatment of your claim you must contact your insurer or the appropriate supervisory authority directly. ", "ar": "6-6	إذا كان موقعنا يوفر لك خيار إرسال تفاصيل مزود التأمين لأغراض الفوترة المباشرة، فيمكنك القيام بذلك. قد نوفر لك القدرة على تخزين تفاصيل التأمين في ملف تعريف حسابك. أنت مسؤول عن التأكد من أن جميع تفاصيل التأمين المقدمة صحيحة ومحدثة. أنت تقر وتضمن لنا أن أي تفاصيل تأمين تقدمها سوف تتعلق بوثيقة تأمين طبي سارية المفعول تغطي العلاج في البلد الذي تقوم بالشراء منه. أنت تقر بأننا سنحتاج إلى تقديم تفاصيل إلى شركة التأمين الخاصة بك عن مشترياتك وأنت توافق بموجبه على قيامنا بذلك. قبل تأكيد طلب الشراء، سنحتاج إلى التحقق من أن شركة التأمين توافق على سداد قيمة طلب الشراء. إذا رفضت شركة التأمين سداد ذلك أو طُلب منك سداد جزء من قيمة الطلبية أو جميعها، فسنقوم بالاتصال بك ولن يتم تنفيذ طلب الشراء حتى تقوم بسداد باقي المبلغ الإجمالي المستحق. بصرف النظر عن السعي للحصول على الموافقة على التكاليف وفقاً للمعلومات التي تقدمها مع طلبك، لا يمكننا العمل كوسيط للاتصالات بينك وبين شركة التأمين الخاصة بك ولا نتحمل أي مسؤولية من أي نوع عن أي تأخير أو فعل أو إغفال من جانب شركة التأمين الخاصة بك. إذا لم تكن راضيًا عن كيفية معاملة شركة التأمين الخاصة بك لطلبك، فيجب عليك الاتصال بشركة التأمين أو السلطة الإشرافية المناسبة بشكل مباشر."},
+  "termsConditions32": {"en": "6.7	We may outsource payment processing to a third party provider. We will not be liable to you or anyone else for any loss resulting from an act or omission of a third party payment provider.", "ar": "6-7	يجوز لنا تعهيد مسألة معالجة المدفوعات لمزود خارجي. لن نتحمل أي مسؤولية تجاهك أو تجاه أي شخص آخر عن أي خسارة ناتجة عن أي فعل أو إغفال من قبل مزود خارجي لخدمات المدفوعات."},
+  "termsHeading8": {"en": "7. ACCOUNT RULES ", "ar": "7.	قواعد الحساب"},
+  "termsConditions33": {"en": "7.1	In order to access certain services, you will need to: ", "ar": "7-1	من أجل الدخول إلى خدمات معينة، سوف تحتاج إلى:"},
+  "termsConditions33a": {"en": "(a) enter your credentials (registered National ID and mobile number). ", "ar": "(1) إدخال بيانات الاعتماد الخاصة بك (رقم الهوية الوطنية المسجل ورقم الجوال  )"},
+  "termsConditions33b": {"en": "(b) enter the onetime secure-access code that you will receive to your registered mobile number. ", "ar": "(2) إدخال رمز الدخول الآمن لمرة واحدة الذي ستتلقاه على رقم هاتفك الجوال المسجل."},
+  "termsConditions34": {"en": "7.2	In order to create an account to obtain full access to the services on the Sites, you must: ", "ar": "7-2	لإنشاء حساب والحصول على حق الوصول الكامل إلى الخدمات على المواقع، يتعين عليك:"},
+  "termsConditions34a": {"en": "(a) satisfy the minimum age requirement of 18 years (measured according to the Gregorian calendar); ", "ar": "(1) استيفاء شرط الحد الأدنى للسن وهو 18 سنة (يُقاس بالتقويم الميلادي)؛"},
+  "termsConditions34b": {"en": "(b) provide us with complete and accurate registration information in accordance with requested information fields on the Site;", "ar": "(2) تزويدنا بمعلومات تسجيل كاملة ودقيقة وفقاً لحقول المعلومات المطلوبة على الموقع؛"},
+  "termsConditions34c": {"en": "(c) ensure your use of the Sites is in accordance with these Online Services Terms of Use and any applicable laws;", "ar": "(3) التأكد من أن استخدامك للمواقع يتوافق مع شروط استخدام الخدمات الالكترونية هذه وأي أنظمة معمول بها؛"},
+  "termsConditions34d": {"en": "(d) enter your national ID card number; ", "ar": "(4)إدخال رقم بطاقة الهوية الوطنية الخاصة بك؛ و"},
+  "termsConditions34e": {"en": "(e) enter your mobile telephone number to receive a confidential secure-access code via SMS. ", "ar": "(5) إدخال رقم هاتفك الجوال لتلقي رمز دخول آمن سري عبر رسالة نصية قصيرة."},
+  "termsConditions35": {"en": "7.3	When you create an account, and any time you attempt to access our on-line services, you warrant, represent and undertake that:  ", "ar": "7-3	عندما تنشئ حساباً، وفي أي وقت تحاول فيه الدخول إلى خدماتنا الالكترونية عبر الإنترنت، فإنك تضمن وتقر وتتعهد بما يلي:"},
+  "termsConditions35a": {"en": "(a) you meet the minimum age requirement ", "ar": "(1)أنك تستوفي الحد الأدنى من متطلبات العمر"},
+  "termsConditions35b": {"en": "(b) you have given complete and accurate registration information, and will keep that information updated; ", "ar": "(2) أنك قدمت معلومات تسجيل كاملة ودقيقة، وأنك ستقوم بتحديث هذه المعلومات "},
+  "termsConditions35c": {"en": "(c) you are resident in the Kingdom of Saudi Arabia. ", "ar": "(3) أنك مقيم في المملكة العربية السعودية؛"},
+  "termsConditions35d": {"en": "(d) you have authorised us to execute all instructions and transactions on your behalf in relation to your use of the Sites; ", "ar": "(4) أنك قد فوضتنا بتنفيذ جميع التعليمات والمعاملات نيابة عنك فيما يتعلق باستخدامك للمواقع"},
+  "termsConditions35e": {"en": "(e) your use of the Sites will not violate these Online Services Terms of Use or breach any applicable laws. ", "ar": "(5) أن استخدامك للمواقع لا ينتهك شروط استخدام الخدمات الالكترونية هذه ولا ينتهك أي أنظمة معمول بها. "},
+  "termsConditions36": {"en": "7.4	We reserve the right to reject or revoke, for whatever reason and at our sole discretion, your request to access the Sites or to freeze access to the Sites.", "ar": "7-4	نحتفظ بالحق في رفض أو إلغاء طلبك للدخول إلى المواقع أو تجميد إمكانية الوصول  إلى إلى المواقع، لأي سبب من الأسباب ووفقاً لتقديرنا الخاص ."},
+  "termsConditions37": {"en": "7.5	In order to use the Sites, you will require access to the Internet. You are responsible for any connection, service and other fees associated with such access and for providing all equipment necessary to enable you to connect to the Internet (including a computer and modem or other access device).", "ar": "7-5	من أجل استخدام المواقع، سوف تحتاج إلى الاتصال بالإنترنت. أنت مسؤول عن أي رسوم اتصال أو رسوم خدمة أو أي رسوم أخرى مرتبطة بهذا الدخول وعن توفير جميع المعدات اللازمة لتمكينك من الاتصال بالإنترنت (بما في ذلك الكمبيوتر والمودم أو أي جهاز اتصال آخر)."},
+  "termsConditions38": {"en": "7.6	We may use information from your profile for aggregated analysis purposes (such as your age, gender, nationality etc.) to enable us to gain insights into who is using our online services and how we may improve the reach and quality of the services. We will not use any information which can personally identify you, including any information which links you to any medical procedure or health status, for any such purpose. Please see our Privacy Policy for more information about how we use your information.", "ar": "7-6	قد نستخدم معلومات من ملفك الشخصي لأغراض التحليل المجمع (مثل عمرك وجنسك وجنسيتك وما إلى ذلك) لتمكيننا من اكتساب نظرة عامة بشأن من يستخدم خدماتنا الإلكترونية عبر الإنترنت وكيف يمكننا تحسين الدخول إلى الخدمات وجودتها. لن نستخدم أي معلومات يمكن أن تحدد هويتك، بما في ذلك أي معلومات تربطك بأي إجراء طبي أو حالة صحية لأي غرض من هذا القبيل. يرجى الاطلاع على سياسة الخصوصية الخاصة بنا للحصول على مزيد من المعلومات حول كيفية استخدامنا لمعلوماتك."},
+  "termsConditions39": {"en": "7.7	You may create an account on behalf of a child for whom you have legal responsibility. If you create an account on behalf of a child you warrant, represent and undertake that:", "ar": "7-7	يمكنك إنشاء حساب نيابة عن طفل ما تكون مسؤولاً عنه بموجب النظام. إذا أنشأت حساباً نيابةً عن أي طفل، فإنك تضمن وتقر وتتعهد بما يلي:"},
+  "termsConditions39a": {"en": "(a) you are a parent or legal guardian of that child and are lawfully authorised to direct the medical care of the child and to provide us will all necessary information in connection with the child (such as identification documents, medical history etc.)", "ar": "(1)أنك أحد الوالدين أو الوصي الشرعي لذلك الطفل ومصرح لك نظاماً بتوجيه الرعاية الطبية للطفل وتزويدنا بجميع المعلومات اللازمة فيما يتعلق بالطفل (مثل وثائق الهوية والتاريخ الطبي وما إلى ذلك)"},
+  "termsConditions39b": {"en": "(b) you have authorised us to execute all instructions and transactions on behalf of the child in relation to your use of the Sites;", "ar": "(2) أنك قد فوضتنا بتنفيذ جميع التعليمات والمعاملات نيابة عن الطفل فيما يتعلق باستخدامك للمواقع"},
+  "termsConditions39c": {"en": "(c) without prejudice to any patient/doctor confidentiality obligations that may occur if the child independently seeks medical advice, you will supervise and direct all use of the child’s account on the Site and will not permit the child to use the account without supervision;", "ar": "(3) دون الإخلال بأي التزامات سرية بين المريض / الطبيب قد تحدث إذا طلب الطفل مشورة طبية بشكل مستقل، فسوف تشرف وتوجه كافة استخدامات حساب الطفل على الموقع ولن تسمح للطفل باستخدام الحساب دون إشراف؛ و"},
+  "termsConditions39d": {"en": "(d) you will remain responsible for all charges incurred in connection with the account.", "ar": "(4) ستظل مسؤولاً عن جميع الرسوم المستحقة  فيما يتعلق بالحساب."},
+  "termsHeading9": {"en": "8.PASSWORD SECURITY AND NOTIFICATION", "ar": "8.	أمن كلمة المرور والإشعار"},
+  "termsConditions40": {"en": "8.1	You are solely responsible for all activities that occur in connection with your log-in details in respect of the Sites. You must take steps to protect the confidentiality of your log-in details and you must not allow any other person to use your account.", "ar": "8-1	أنت وحدك المسؤول عن جميع الأنشطة التي تحدث فيما يتعلق بتفاصيل تسجيل الدخول الخاصة بك بخصوص المواقع. يتعين عليك اتخاذ خطوات لحماية سرية بيانات تسجيل الدخول الخاصة بك ويجب ألا تسمح لأي شخص آخر باستخدام حسابك."},
+  "termsConditions41": {"en": "8.2	You must notify us immediately if you become aware of any disclosure, loss, theft or unauthorised use of your log-In details.", "ar": "8-2	يتعين عليك إخطارنا على الفور إذا علمت بأي إفشاء أو ضياع أو سرقة أو استخدام غير مصرح به لبيانات تسجيل الدخول الخاصة بك."},
+  "termsHeading10": {"en": "9.TERMINATION", "ar": "9.	الإنهاء"},
+  "termsConditions42": {"en": "9.1	We may discontinue any service at any time or terminate your access to one or more services at any time for any reason, with or without notice to you and without incurring any liability to you, however that liability may arise.", "ar": "9-1	يجوز لنا التوقف عن توفير أي خدمة أو أنهاء حقك في الدخول إلى أي خدمة أو أكثر في أي وقت ولأي سبب سواء بموجب إخطار نرسله لك أو بدونه ودون أنت نتحمل أي مسؤولية تجاهك، بغض النظر عن كيفية نشوء تلك المسؤولية."},
+  "termsConditions43": {"en": "9.2	All restrictions and all disclaimers and exclusions and limitations of our liability will survive any termination. Upon termination, you must not directly or indirectly access or use the services.", "ar": "9-2	ستظل جميع القيود وجميع إخلاءات الطرف من المسؤولية والاستثناءات والقيود الخاصة بمسؤوليتنا سارية بعد أي إنهاء. عند الإنهاء، يتعين عليك عدم الدخول إلى الخدمات سواء بشكل مباشر أو غير مباشر."},
+  "termsHeading11": {"en": "10. INDEMNITY", "ar": "10.	ضمان التعويض"},
+  "termsConditions44": {"en": "You indemnify us in full in respect of any liability incurred by us or suffered by us for any loss, cost, damage or expense, as a result of your breach of these Online Services Terms of Use. Where you use our services inappropriately or maliciously, you agree that you will indemnify us against any losses suffered by us or any third parties as a result of or in connection with such use.", "ar": "أنت تلتزم بضمان تعويضنا بشكل الكامل فيما يتعلق بأي مسؤولية تترتب علينا أو نتحملها عن أي خسارة أو تكلفة أو ضرر أو مصاريف، نتيجة لإخلالك بشروط استخدام الخدمات الالكترونية هذه. عندما تستخدم خدماتنا بشكل غير مناسب أو ضار، فإنك توافق على أنك ستعوضنا عن أي خسائر نتكبدها نحن أو أي طرف ثالث نتيجة هذا الاستخدام أو فيما يتعلق به."},
+  "termsHeading12": {"en": "11. GENERAL", "ar": "11.	أحكام عامة"},
+  "termsConditions45": {"en": "As noted above, these Online Services Terms of Use are subject to the General Terms and form part of the same agreement. You should ensure you have read the General Terms. In particular, please note the following sections, as they relate to the online services, Website Terms of Use: 2) No Warranties; 3) Submission of Content; 12) Limitation of Liability; 13) Indemnity; 14) Availability of the Site; 15) Privacy; 18) General. App User Agreement: 1.4) use of location data.", "ar": "11-1	كما هو مذكور أعلاه، تخضع شروط استخدام الخدمات الالكترونية هذه للشروط العامة وتشكل جزءاً من نفس الاتفاقية. يتعين عليك الحرص على قراءة الشروط العامة بتمعن. على وجه الخصوص، يرجى التمعن في الأقسام التالية، من حيث صلتها بالخدمات الالكترونية,	شروط استخدام الموقع الإلكتروني: 2) انعدام الضمانات؛ 3) تقديم المحتوى؛ 12) حدود المسؤولية؛ 13) ضمان التعويض؛ 14) توافر الموقع؛ 15) الخصوصية؛ 18) أحكام عامة.	اتفاقية مستخدم التطبيق: 1-4) استخدام بيانات تحديد المواقع."},
+  "termsConditionsRead": {"en": "I have read these Online Services Terms of Use and all other terms and conditions referred to in them. I understand that by ticking this box and proceeding to use the services I will be bound by these Terms & Conditions and that they govern the services to be provided to me.  I consent to the receipt of the online services and the use of my personal information, including sensitive personal information, for the purposes set out above and in accordance with the Privacy Policy.", "ar": "لقد قرأت شروط وأحكام الخدمات الالكترونية عبر الانترنت هذه وجميع البنود والشروط الأخرى المشار إليها فيها. أدرك أنه بمجرد وضع إشارة صح في هذا المربع والاستمرار  في استخدام الخدمات، سأكون ملزماً بهذه الشروط والأحكام وأنها تحكم الخدمات التي سيتم تقديمها لي. أوافق على تلقي الخدمات الالكترونية عبر الانترنت واستخدام معلوماتي الشخصية، بما في ذلك المعلومات الشخصية الحساسة، للأغراض الموضحة أعلاه ووفقاً لسياسة الخصوصية."},
+  "liveCareTermsHeading": {"en": "TELEHEALTH SERVICES TERMS OF USE", "ar": "شروط خدمات الرعاية الصحية عن بُعد"},
+  "liveCareTermsIntroHeading": {"en": "INTRODUCTION", "ar": "مقدمة"},
+  "liveCareTermsConditions1": {"en": "Dr. Sulaiman Al Habib Medical Services Group Company (the “Group”) is one of the leaders in the healthcare sector in the Kingdom of Saudi Arabia with an aim to always improve its services in the region, and as a step to take our services to another level and to facilitate the process of receiving healthcare services we have adopted the approach of providing some of our services remotely to patients. These terms apply to our Telehealth Services, which enable consultations to occur between a doctor and a patient over the internet, using audio or and video conferencing technology (often referred to as “Telehealth Services”).", "ar": "تعتبر شركة مجموعة الدكتور سليمان الحبيب للخدمات الطبية ('المجموعة') واحدة من الشركات الرائدة في قطاع الرعاية الصحية في المملكة العربية السعودية والتي تسعى  دائمًا  لتحسين خدماتها في المنطقة، وكخطوة لنقل خدماتنا إلى مستوى آخر ولتسهيل عملية تلقي خدمات الرعاية الصحية، فقد اعتمدنا نهج تقديم بعض خدماتنا عن بُعد للمرضى. تنطبق هذه الشروط على خدمات الرعاية الصحية عن بُعد التي نقدمها، والتي تتيح إجراء الاستشارات بين الطبيب والمريض عبر الإنترنت، باستخدام تقنية الاتصالات الصوتية أو المرئية (يشار إليها غالباً باسم 'خدمات الرعاية الصحية عن بُعد')."},
+  "liveCareTermsConditions2": {"en": "The purpose of the Telehealth Services is to facilitate communication between healthcare practitioners and patients to provide healthcare services through advanced electronic communication means, which allows healthcare professionals to evaluate, diagnose, treat and follow-up with patients remotely without the need for patients to attend in person.).", "ar": "الغرض من خدمات الرعاية الصحية عن بعد هو تسهيل الاتصالات بين الممارسين الصحيين والمرضى لتقديم خدمات الرعاية الصحية من خلال وسائل الاتصال الإلكترونية المتقدمة، والتي تتيح للممارسين الصحيين تقييم وتشخيص وعلاج ومتابعة المرضى عن بُعد دون الحاجة إلى حضور المرضى شخصياً."},
+  "liveCareTermsHeading2": {"en": "AGREEMENT", "ar": "الاتفاقية"},
+  "liveCareTermsConditions3": {"en": "Telehealth Services is delivered over the Group’s mobile application or and Website. The following terms apply to the Telehealth Services: ", "ar": "يتم تقديم خدمات الرعاية الصحية عن بُعد عبر تطبيق الهاتف المحمول أو الموقع الإلكتروني للمجموعة. تنطبق الشروط التالية على خدمات الرعاية الصحية عن بُعد: "},
+  "liveCareTermsConditions3a": {"en": " - Website Terms of Use", "ar": "شروط استخدام الموقع الالكتروني - "},
+  "liveCareTermsConditions3b": {"en": " - App User Agreement", "ar": "تفاقية مستخدم التطبيق - "},
+  "liveCareTermsConditions3c": {"en": " - Online Services Terms of Use", "ar": "روط استخدام الخدمات الإلكترونية - "},
+  "liveCareTermsConditions3d": {"en": " - These Telehealth Services User Terms of Use", "ar": "شروط خدمات الرعاية الصحية عن بُعد هذه - "},
+  "liveCareTermsConditions4": {"en": "By agreeing to proceed with the Telehealth Services and accepting these terms, you enter into an agreement with The Group incorporating all the above terms (Telehealth Services Agreement).", "ar": "بالموافقة على الاستمرار  في خدمات الرعاية الصحية عن بُعد وقبول هذه الشروط، فإنك تدخل في اتفاقية مع المجموعة تتضمن جميع الشروط المذكورة أعلاه (اتفاقية خدمات الرعاية الصحية عن بُعد)."},
+  "liveCareTermsConditions5": {"en": "Our Privacy Policy should also be read. It contains details about how we use your personal information and your rights. By proceeding with the Telehealth Services, you agree to our use of your personal information in accordance with our Privacy Policy and you expressly consent to our use of your personal information for the performance of the Telehealth Services and the discharge of our professional duties as a medical care provider.", "ar": "يتعين عليك أيضاً قراءة سياسة الخصوصية الخاصة بنا حيث تحتوي سياسة الخصوصية على تفاصيل حول كيفية استخدامنا لمعلوماتك الشخصية وحقوقك بشأنها. من خلال متابعة استخدام خدمات الرعاية الصحية عن بُعد، فإنك توافق على استخدامنا لمعلوماتك الشخصية وفقاً لسياسة الخصوصية الخاصة بنا وتوافق صراحةً على استخدامنا لمعلوماتك الشخصية لأداء خدمات الرعاية الصحية عن بُعد وأداء واجباتنا المهنية كمقدم لخدمات الرعاية الطبية."},
+  "liveCareTermsConditions6": {"en": "Our Privacy Policy should also be read. It contains details about how we use your personal information and your rights. By proceeding with the Telehealth Services, you agree to our use of your personal information in accordance with our Privacy Policy and you expressly consent to our use of your personal information for the performance of the Telehealth Services and the discharge of our professional duties as a medical care provider.", "ar": "يتعين عليك أيضاً قراءة سياسة الخصوصية الخاصة بنا حيث تحتوي سياسة الخصوصية على تفاصيل حول كيفية استخدامنا لمعلوماتك الشخصية وحقوقك بشأنها. من خلال متابعة استخدام خدمات الرعاية الصحية عن بُعد، فإنك توافق على استخدامنا لمعلوماتك الشخصية وفقاً لسياسة الخصوصية الخاصة بنا وتوافق صراحةً على استخدامنا لمعلوماتك الشخصية لأداء خدمات الرعاية الصحية عن بُعد وأداء واجباتنا المهنية كمقدم لخدمات الرعاية الطبية."},
+  "liveCareTermsHeading3": {"en": "1. DEFINITIONS", "ar": "1.	التعاريف"},
+  "liveCareTermsConditions7": {"en": "Group means Dr. Sulaiman Al Habib Medical Services Group Company and its subsidiaries. ", "ar": "المجموعة تعني شركة مجموعة الدكتور سليمان الحبيب للخدمات الطبية والشركات التابعة لها."},
+  "liveCareTermsConditions8": {"en": "Telehealth Services means the Group’s telehealth service, enabling remote consultation, diagnosis and follow-up between the patient and doctor, using the Application and or the Website.", "ar": "خدمات الرعاية الصحية عن بُعد تعني خدمة الرعاية الصحية عن بُعد التي تقدمها المجموعة، والتي تتيح الاستشارة والتشخيص والمتابعة عن بُعد بين المريض والطبيب، باستخدام التطبيق و/أو موقع الويب."},
+  "liveCareTermsConditions9": {"en": "Our Services means certain services provided by the Group which covers viewing patients’ medical records and medical test results, providing medical diagnostics in addition to the availability of voice and video Telehealth Service between healthcare practitioners and patients.", "ar": "خدماتنا تعني بعض الخدمات التي تقدمها المجموعة والتي تغطي استعراض السجلات الطبية للمرضى ونتائج الفحوصات الطبية، وتوفير التشخيصات الطبية بالإضافة إلى توفر خدمة الرعاية الصحية عن بعد بالصوت والفيديو بين ممارسي الرعاية الصحية والمرضى."},
+  "liveCareTermsConditions10": {"en": "Application means Dr. ALHABIB Application which is a platform where Our Services are provided through and accessible by users. ", "ar": "التطبيق يعني تطبيق (Dr. ALHABIB) وهو عبارة عن منصة يتم من خلالها تقديم خدماتنا ويمكن للمستخدمين الولوج إليها."},
+  "liveCareTermsConditions11": {"en": "Website means the Group internet website which is a platform where Our Services are provided through and accessible by users. ", "ar": "موقع الويب يعني موقع الويب الخاص بالمجموعة وهو عبارة عن منصة يتم من خلالها تقديم خدماتنا ويمكن للمستخدمين الدخول إليها."},
+  "liveCareTermsConditions12": {"en": "Terms & Conditions means these Telehealth Services Terms of Use.  ", "ar": "الشروط والأحكام تعني شروط خدمات الرعاية الصحية عن بُعد هذه."},
+  "liveCareTermsConditions13": {"en": "Content means any message, data, information, text, sound, photos, video, graphics, code or any other material contained on the Application and or the Website or transmitted via the Application and or the Website.  ", "ar": "المحتوى يعني أي رسالة أو بيانات أو معلومات أو نص أو صوت أو صور أو فيديو أو رسومات أو رمز أو أي مادة أخرى واردة في التطبيق أو موقع الويب أو يتم نقلها عبر التطبيق أو موقع الويب."},
+  "liveCareTermsHeading4": {"en": "2. USER UNDERTAKINGS", "ar": "2.	تعهدات المستخدم"},
+  "liveCareTermsConditions14": {"en": "2.1 By accessing and using Telehealth Services, you agree to these Terms &  Conditions, and you should not attempt to access Our Services if you do not agree. ", "ar": "2-1	من خلال دخولك إلى خدمات الرعاية الصحية عن بُعد واستخدامها، فإنك توافق على هذه الشروط والأحكام ويتعين عليك ألا تحاول الدخول إلى خدماتنا إذا كنت لا توافق عليها."},
+  "liveCareTermsConditions15": {"en": "2.2 You warrant, represent and undertake that all information you provide about yourself and about anyone else is true and accurate. ", "ar": "2-2	أنت تضمن وتقر وتتعهد بأن جميع المعلومات التي تقدمها عن نفسك وعن أي شخص آخر صحيحة ودقيقة."},
+  "liveCareTermsConditions16": {"en": "2.3 Telehealth Services is intended for use by patients physically located in the Kingdom Saudi Arabia (Permitted Territory) and should not be used by patients outside the Permitted Territory. By agreeing to these Terms & Conditions and accessing Telehealth Services via the Application and or the Website, you represent and warrant to us that you are physically located in one of the Permitted Territory. ", "ar": "2-3	خدمات الرعاية الصحية عن بعد مخصصة للاستخدام من قبل المرضى الموجودين فعلياً في المملكة العربية السعودية (المنطقة المسموح بها) ولا ينبغي استخدامها من قبل المرضى خارج المنطقة المسموح بها. بالموافقة على هذه الشروط والأحكام والدخول إلى خدمات الرعاية الصحية عن بُعد عبر التطبيق أو موقع الويب، فإنك تقر وتضمن لنا أنك موجود فعلياً في إحدى المناطق المسموح بها."},
+  "liveCareTermsHeading5": {"en": "3. LIMITATIONS OF TELEHEALTH SERVICES AND ASSOCIATED RISKS", "ar": "3.	القيود على خدمات الرعاية الصحية عن بعد والمخاطر المرتبطة بها"},
+  "liveCareTermsConditions17": {"en": "3.1 Do not use the Application and or the Website or the Telehealth Services to communicate or treat medical emergencies. Neither the Application nor the Website nor Telehealth Services are intended for the provision of care in an emergency. IF THERE IS AN URGENT MEDICAL EMERGENCY OR A RESPONSE IS NEEDED QUICKLY REGARDING YOUR HEALTH, GO TO A NEARBY EMERGENCY CENTER/HOSPITAL OR CALL IMMEDIATELY ANY EMERGENCY PHONE NUMBER. ", "ar": "3-1	لا تستخدم التطبيق أو موقع الويب أو خدمات الرعاية الصحية عن بُعد للتواصل بشأن الحالات الطبية الطارئة أو علاجها. لا التطبيق ولا موقع الويب ولا خدمات الرعاية الصحية عن بُعد توفر الرعاية في الحالات الطبية الطارئة. إذا كانت هناك حالة طبية طارئة عاجلة أو كانت هناك حاجة إلى استجابة سريعة فيما يتعلق بصحتك، فانتقل إلى أقرب مركز/مستشفى طوارئ أو اتصل على الفور بأي رقم هاتف للطوارئ."},
+  "liveCareTermsConditions18": {"en": "3.2 Telehealth Services is not appropriate for emergency conditions and there may be some treatments or medicines which cannot be provided without follow-up physical consultation. If you believe you have a serious medical condition, you should seek an in-person consultation with a licensed medical professional.", "ar": "3-2	خدمات الرعاية الصحية عن بعد ليست مناسبة للحالات الطبية الطارئة وقد تكون هناك بعض العلاجات أو الأدوية التي لا يمكن تقديمها دون استشارة متابعة في حضور المريض شخصياً. إذا كنت تعتقد أن لديك حالة طبية خطيرة، فعليك طلب استشارة شخصية مع أخصائي طبي مرخص."},
+  "liveCareTermsConditions19": {"en": "3.3 Telehealth Services is intended to provide benefits including patient convenience. As such, it is most suitable as an alternative to in-person consultation for routine medical matters. However, there are potential risks associated with the use of any telehealth service, including Telehealth Services, and these risks may include but not be limited to the following: ", "ar": "3-3	تهدف خدمات الرعاية الصحية عن بُعد إلى توفير مزايا تشمل راحة المريض. لذلك، فهو قد يكون الأنسب كبديل للاستشارة الشخصية للأمور الطبية الروتينية. ومع ذلك، هناك مخاطر محتملة مرتبطة باستخدام أي خدمة للرعاية الصحية عن بُعد، بما في ذلك خدمات الرعاية الصحية عن بُعد، وقد تشمل هذه المخاطر على سبيل المثال لا الحصر ما يلي:"},
+  "liveCareTermsConditions19a": {"en": "(a) information transmitted may not be sufficient (e.g. poor resolution of images) to allow for appropriate medical decision making by healthcare practitioners.", "ar": "(1) المعلومات المنقولة قد لا تكون كافية (مثل ضعف دقة الصور) للسماح باتخاذ القرار الطبي المناسب من قبل الممارسين الصحيين"},
+  "liveCareTermsConditions19b": {"en": "(b) healthcare practitioners may determine that the transmitted information is of inadequate quality, thus necessitating a face-to-face meeting with the patient, or at least a rescheduled voice and video medical consult. ", "ar": "(2) قد يقرر الممارسين الصحيين أن المعلومات المنقولة ليست ذات جودة كافية، مما يستلزم مقابلة المريض وجهاً لوجه، أو على الأقل إعادة جدولة استشارة طبية صوتية ومرئية في وقت لاحق"},
+  "liveCareTermsConditions19c": {"en": "(c) delays in medical care could occur due to deficiencies or failures of the electronic devices. ", "ar": "(3) يمكن أن يحدث تأخير في تقديم الرعاية الطبية بسبب أوجه القصور أو الأعطال في الأجهزة الإلكترونية"},
+  "liveCareTermsConditions19d": {"en": "(d) the practitioner is dependent on the patient to provide all relevant information orally and via the appropriate use of the patient’s own camera device. It is possible that information may not be provided to the practitioner or may not be apparent which would have been apparent to the practitioner during an in-person physical examination. ", "ar": "(4) يعتمد الممارس الصحي على المريض لتقديم جميع المعلومات ذات الصلة شفوياً وعبر الاستخدام المناسب لجهاز الكاميرا الخاص بالمريض. من الممكن ألا يتم تقديم المعلومات إلى الممارس أو قد لا تكون واضحة بقدر الوضوح الذي يتوفر للممارس الصحي أثناء إجراء الفحص البدني الشخصي"},
+  "liveCareTermsConditions19e": {"en": "(e) security protocols could fail, causing a breach of privacy of personal medical information. Whilst we take reasonable measures to protect the security of the information transmitted over the Application and or the Website, such transmissions can never be guaranteed to be completely secure and information transmitted over public telecommunications networks is outside our control and cannot be secured by us.", "ar": "(5) قد تفشل البروتوكولات الأمنية، مما يتسبب في انتهاك خصوصية المعلومات الطبية الشخصية. على الرغم من أننا نتخذ تدابير معقولة لحماية أمن المعلومات المنقولة عبر التطبيق و/أو الموقع الإلكتروني، إلا أنه لا يمكن أبدًا ضمان أن تكون عمليات الإرسال هذه آمنة تماماً، والمعلومات المنقولة عبر شبكات الاتصالات العامة خارجة عن سيطرتنا ولا يمكننا تأمينها."},
+  "liveCareTermsConditions20": {"en": "3.4 If you use Telehealth Services but are experiencing any ongoing condition or concerns, we recommend you schedule an in-person consultation. ", "ar": "3-4	في حال كنت تستخدم خدمات الرعاية الصحية عن بُعد ولكنك تواجه أي حالة أو مخاوف مستمرة، فإننا نوصيك بحجز استشارة شخصية."},
+  "liveCareTermsHeading6": {"en": "4. DISCLAIMER OF WARRANTY ", "ar": "4.	إخلاء المسؤولية عن الضمان"},
+  "liveCareTermsConditions21": {"en": "4.1 We do not warrant, represent or undertake that Telehealth Services will meet your needs, or that it will be uninterrupted, timely, secure, error-free or free from viruses. We shall have no liability to you if a Telehealth Services session cannot occur or is interrupted or abandoned due to any unavailability of our online platform, however, where the Telehealth Services session cannot be delivered fully due to the downtime of our own  platform, we will not charge you for a replacement consultation.", "ar": "4-1	نحن لا نضمن ولا نقر أو نتعهد بأن خدمات الرعاية الصحية عن بُعد ستلبي احتياجاتك، أو أنها ستكون مستمرة دون انقطاع أو سيتم توفيرها في الوقت المناسب أو أنها آمنة أو خالية من الأخطاء أو خالية من الفيروسات. لن نتحمل أي مسؤولية تجاهك في حالة تعذر حدوث جلسة خدمات الرعاية الصحية عن بُعد أو تمت مقاطعتها أو التخلي عنها بسبب عدم توفر منصتنا عبر الإنترنت ومع ذلك، في حالة تعذر علينا إجراء جلسة خدمات الرعاية الصحية عن بُعد بالكامل بسبب تعطل منصتنا، فلن نتقاضى منك أي أجور عن جلسة الاستشارة البديلة."},
+  "liveCareTermsConditions22": {"en": "4.2 All warranties expressed or implied by law, except those that cannot be lawfully excluded, are excluded. ", "ar": "4-2	تُستثنى جميع الضمانات الصريحة أو الضمنية بموجب النظام، باستثناء تلك التي لا يمكن استثناؤها بشكل قانوني."},
+  "liveCareTermsConditions23": {"en": "4.3 Nothing in this section 4 is intended to exclude or limit our liability for any medical negligence claim, to the extent the applicable law in the relevant Permitted Territory does not permit us to do so.", "ar": "4-3	لا يوجد في هذا القسم 4 أي نص يُقصد منه استبعاد أو تقييد مسؤوليتنا عن أي مطالبة تتعلق بالإهمال الطبي، إلى الحد الذي لا يسمح لنا فيه النظام المعمول به في المنطقة المسموح بها ذات الصلة بالقيام بذلك."},
+  "liveCareTermsHeading7": {"en": "5. ELIGIBILITY, REGISTRATION AND USE", "ar": "5.	الأهلية والتسجيل والاستخدام"},
+  "liveCareTermsConditions24": {"en": "5.1 To access Telehealth Services, you must satisfy the minimum age requirement of 18 years (measured according to the Gregorian calendar) and have full legal capacity. ", "ar": "5-1	من أجل الدخول إلى خدمات الرعاية الصحية عن بُعد، يتعين عليك أن تفي بمتطلبات الحد الأدنى للسن وهو 18 عاماً (يتم احتسابها وفقاً للتقويم الميلادي) وأن تتمتع بالأهلية القانونية الكاملة."},
+  "liveCareTermsConditions25": {"en": "5.2 Any person under the age of 18 years (measured according to the Gregorian calendar) accessing Telehealth Services must have permission from their parent or guardian to do so.", "ar": "5-2	يجب أن يحصل أي شخص يقل عمره عن 18 عاماً (يتم احتسابها وفقاً للتقويم الميلادي) يقوم بالدخول إلى خدمات الرعاية الصحية عن بُعد على إذن من أحد الوالدين أو الوصي للقيام بذلك."},
+  "liveCareTermsConditions26": {"en": "5.3 You warrant, represent and undertake that you possess the legal right and ability to access the Application and or the Website in accordance with these Terms & Conditions and, where relevant, to make bookings and payments through the Application and or the Website.", "ar": "5-3	أنت تضمن وتقر وتتعهد بأن لديك الحق القانوني والقدرة على الدخول إلى التطبيق و/أو موقع الويب وفقاً لهذه الشروط والأحكام و، عند الاقتضاء، إجراء الحجوزات والمدفوعات من خلال التطبيق أو موقع الويب."},
+  "liveCareTermsConditions27": {"en": "5.4 The registration process is as provided in the Online Services Terms of Use.", "ar": "5-4	تتم عملية التسجيل وفق ما ورد في شروط استخدام الخدمات الإلكترونية"},
+  "liveCareTermsConditions28": {"en": "5.5 Telehealth Services is intended only for your own personal use and the use of your children under your supervision. You must not share your user access details (log-in name, password etc.) with any other person and must take reasonable steps to maintain the security of such details. Our services are delivered on the basis that we have certain information about the user, which may be connected to or obtained from your account details (age, gender, medical history etc.). We accept no responsibility whatsoever to you or any other person if our services are delivered via a user account to a person other than the registered user. This is particularly important for telehealth services, where the practitioner will need to assess the  information, the patient provides during the consultation in the context of the patient’s medical file and history.", "ar": "5-5	خدمات الرعاية الصحية عن بُعد مخصصة فقط لاستخدامك الشخصي واستخدام أطفالك تحت إشرافك. يتعين عليك ألا تشارك بيانات تسجيل الدخول الخاصة بك (اسم المستخدم وكلمة المرور وما إلى ذلك) مع أي شخص آخر ويجب أن تتخذ خطوات معقولة للحفاظ على أمان هذه البيانات. يتم تقديم خدماتنا على أساس أن لدينا معلومات معينة حول المستخدم، والتي قد تكون مرتبطة أو تم الحصول عليها من تفاصيل حسابك (العمر والجنس والتاريخ الطبي وما إلى ذلك). نحن لا نتحمل أي مسؤولية من أي نوع تجاهك أو تجاه أي شخص آخر إذا تم تقديم خدماتنا عبر حساب مستخدم إلى شخص آخر غير المستخدم المسجل. هذا مهم بشكل خاص لخدمات الرعاية الصحية عن بعد، حيث سيحتاج الممارس الصحي إلى تقييم المعلومات التي يقدمها المريض أثناء الاستشارة في سياق الملف الطبي للمريض وتاريخه."},
+  "liveCareTermsConditions29": {"en": "5.6 You are responsible for ensuring you have a device connected to the internet and capable of transmitting and receiving video and sound. We are not responsible for any failure of a Telehealth Services session caused by your device or your internet connection. You are responsible for all costs associated with your own internet connection and use.", "ar": "5-6	أنت مسؤول عن التأكد من أن لديك جهازاً متصلاً بالإنترنت وقادراً على إرسال واستقبال الفيديو والصوت. نحن لسنا مسؤولين عن أي انقطاع في جلسة خدمات الرعاية الصحية عن بعد بسبب ناجم عن جهازك أو اتصالك بالإنترنت. أنت مسؤول عن جميع التكاليف المرتبطة باتصالك بالإنترنت واستخدامك لها."},
+  "liveCareTermsConditions30": {"en": "5.7 From time to time we may release updates to our Application and or the Website. You should ensure that you are running the latest version of the Application. Use of old versions of the Application may lead to technical errors in your use of the Telehealth Services and may expose you to additional security risks.", "ar": "5-7	قد نقوم من وقت لآخر بإصدار تحديثات لتطبيقنا و/أو موقع الويب الخاص بنا. يجب عليك التأكد من أنك تقوم بتشغيل أحدث إصدار من التطبيق. قد يؤدي استخدام الإصدارات القديمة من التطبيق إلى حدوث أخطاء فنية أثناء استخدامك لخدمات الرعاية الصحية عن بُعد وقد يعرضك ذلك لمخاطر أمنية إضافية."},
+
+  "liveCareTermsHeading8": {"en": "6. TELEHEALTH SERVICES", "ar": "6.	خدمات الرعاية الصحية عن بُعد"},
+  "liveCareTermsConditions31": {"en": "Our Telehealth Services will be for specific medical specialties or follow-up or medication refill appointments.", "ar": "خدمات الرعاية الصحية عن بُعد الخاصة بنا سوف تكون لتخصصات طبية محددة أو لمواعيد المتابعة أو إعادة صرف الدواء. "},
+  "liveCareTermsHeading9": {"en": "7. CHARGES AND PAYMENT", "ar": "7.	الأجور والسداد"},
+  "liveCareTermsConditions32": {"en": "Our Telehealth Services will be for specific medical specialties or follow-up or medication refill appointments.", "ar": "خدمات الرعاية الصحية عن بُعد الخاصة بنا سوف تكون لتخصصات طبية محددة أو لمواعيد المتابعة أو إعادة صرف الدواء. "},
+  "liveCareTermsConditions33": {"en": "7.1 The charges for a Telehealth Services consultation will be indicated before you choose to proceed. By proceeding, you agree to pay the charges. Any subsequent charges, such as prescription charges, lab tests, follow-up consultations etc. are excluded from the initial charge and will be communicated to you following the initial consultation. ", "ar": "7-1	ستتم الإشارة إلى أجور استشارة خدمات الرعاية الصحية عن بُعد قبل أن تختار المتابعة. بمجرد المتابعة، فإنك توافق على سداد الأجور. لا تشمل تلك الأجور الأولية أي أجور لاحقة مثل أجور الوصفات الطبية والاختبارات المعملية واستشارات المتابعة وما إلى ذلك من أجور وسيتم إبلاغك بها بعد الاستشارة الأولية."},
+  "liveCareTermsConditions34": {"en": "7.2 The applicable payment terms and methods are set out in our Online Services Terms of Use. ", "ar": "7-2	يتم تحديد شروط وطرق السداد المعمول بها في شروط استخدام الخدمات عبر الإنترنت الخاصة بنا."},
+  "liveCareTermsConditions35": {"en": "7.3 It may be possible to charge Telehealth Services directly to a provider of medical insurance, although we give no undertaking or warranty that this shall be possible at any given time. Further details are set out in our Online Services Terms of Use. If such facility is made available and you choose to use it, you will need to provide us with details of your medical insurer and policy coverage, unless you have already done so and linked them to your account. You hereby authorise us to contact any such insurer with the details you provide at the time of purchase, or which are linked to your account to seek approval of the cost of your services. You acknowledge that we may be required to provide specific details of the medical services sought by you  to do so and you expressly consent to such disclosure.", "ar": "7-3	قد يكون من الممكن فرض أجور خدمات الرعاية الصحية عن بُعد مباشرة على مزود التأمين الطبي، على الرغم من أننا لا نقدم أي تعهد أو ضمان بأن هذا سيكون ممكناً في أي وقت. تضمنت شروط استخدام الخدمات عبر الإنترنت الخاصة بنا مزيد من التفاصيل حول ذلك. إذا كان هذا التسهيل الخدمي متاحاً واخترت استخدامه، فستحتاج إلى تزويدنا بتفاصيل شركة التأمين الطبي وتغطية وثيقة التأمين، ما لم تكن قد قمت بذلك مسبقاً وربطتها بحسابك. أنت تفوضنا بموجب هذا بالتواصل مع أي شركة تأمين وفق التفاصيل التي تقدمها لنا في وقت الشراء أو المرتبطة بحسابك من أجل الحصول على الموافقة على تكلفة الخدمات المقدمة لك. أنت تقر بأنه قد يُطلب منا تقديم تفاصيل محددة عن الخدمات الطبية التي تطلبها من أجل القيام بذلك وتوافق صراحة على هذا الإفصاح."},
+  "liveCareTermsHeading10": {"en": "8. COMMUNICATION AND/OR INQUIRIES", "ar": "8.	الاتصالات و/أو الاستفسارات"},
+  "liveCareTermsConditions36": {"en": "In case there are any questions and/or inquiries regarding the use of Telehealth Services please contact: EServices.HMG@drsulaimanalhabib.com or call 011 525 9553", "ar": "في حال وجود أي أسئلة و/أو استفسارات بخصوص استخدام خدمات الرعاية الصحية عن بُعد، يرجى التواصل معنا على: EServices.HMG@drsulaimanalhabib.com أو الاتصال على الرقم: 9553 525 011"},
+  "liveCareTermsHeading11": {"en": "9. LIMITATION OF LIABILITY ", "ar": "9.	حدود المسؤولية"},
+  "liveCareTermsConditions37": {"en": "9.1 Subject to any responsibilities implied by law and which cannot be excluded, neither the Group nor any of our directors, employees, agents or contractors, are liable to you for any losses, damages, liabilities, claims and expenses (including without limitation but not limited to legal costs and defense or settlement costs) whatsoever, whether direct, indirect or consequential, arising out of or referable to your use of Telehealth Services , however caused, whether in contract, tort (including negligence), statute or otherwise. ", "ar": "9-1	مع مراعاة أي مسؤوليات ينص عليها النظام والتي لا يمكن استبعادها بموجبه، لا تتحمل المجموعة أو أي من مديرينا أو موظفينا أو وكلائنا أو مقاولينا المسؤولية تجاهك عن أي خسائر وأضرار ومسؤوليات ومطالبات ونفقات (بما في ذلك على سبيل المثال لا الحصر الأتعاب القانونية وتكاليف الدفاع أو التسوية) أيا كانت، سواء كانت مباشرة أو غير مباشرة أو تبعية، ناشئة عن أو متعلقة باستخدامك لخدمات الرعاية الصحية عن بُعد، أياً كان سبب نشوئها، سواء كان ذلك بموجب عقد أو المسؤولية التقصيرية (بما في ذلك الإهمال) أو النظام أو غير ذلك."},
+  "liveCareTermsConditions38": {"en": "9.2 We will not be liable to you or anyone else for any loss resulting from a cause over which we do not have control. This includes failure of electronic or mechanical equipment or communications lines (including telephone, cable and Internet), unauthorized access, acts or omissions of third parties, viruses, theft, operator errors, severe or extraordinary weather (including flood, earthquake, or other act of God), fire, war, insurrection, terrorist act, riot, labor dispute or other labor problems, accident, emergency, delay, overbooking, cancellation, Royal demise or action of government", "ar": "9-2	لن نكون مسؤولين تجاهك أو تجاه أي شخص آخر عن أي خسارة ناتجة عن سبب خارج عن سيطرتنا. يتضمن ذلك تعطل المعدات الإلكترونية أو الميكانيكية أو خطوط الاتصالات (بما في ذلك الهاتف والكابل والإنترنت)، أو الدخول غير المصرح به، أو أفعال أو إغفالات الأطراف الثالثة، أو الفيروسات، أو السرقة، أو أخطاء المشغل، أو الطقس القاسي أو غير العادي (بما في ذلك الفيضانات، أو الزلازل، أو أي من أفعال القضاء والقدر الأخرى)، أو الحرائق والحروب والتمرد والأعمال الإرهابية وأعمال شغب والنزاع العمالي أو المشاكل العمالية الأخرى أو الحوادث أو الطوارئ أو التأخير أو الحجز الزائد أو الإلغاء، أو الزوال الملكي أو أي إجراء حكومي."},
+  "liveCareTermsHeading12": {"en": "10. TERMINATION OF USE", "ar": "10.	إنهاء الاستخدام"},
+  "liveCareTermsConditions39": {"en": "10.1 We may discontinue the provision of Telehealth Services at any time and for any reason. We shall have no liability for any discontinuation, including where you are part-way through a series of consultations or courses of treatment using Telehealth Services. We will assist in enabling you to book in-person consultations instead or in transferring relevant information to an alternative medical provider to enable you to continue treatment (subject to data protection, confidentiality and medical practice laws and to prevailing medical good practice).", "ar": "10-1	يجوز لنا التوقف عن توفير خدمات الرعاية الصحية عن بُعد في أي وقت ولأي سبب. لن نتحمل أي مسؤولية عن أي توقف، بما في ذلك عندما تكون خلال الاستشارات أو دورات العلاج باستخدام خدمات الرعاية الصحية عن بُعد. سنساعدك للتمكن من حجز الاستشارات الشخصية بدلاً من ذلك أو في نقل المعلومات ذات الصلة إلى مزود طبي بديل لتمكينك من مواصلة العلاج (مع مراعاة أنظمة حماية البيانات والسرية والممارسات الطبية والممارسات الطبية الجيدة السائدة)."},
+  "liveCareTermsConditions40": {"en": "10.2 We may terminate your use and access to Telehealth Services for any or no reason, at any time, with or without notice to you and without incurring any liability to you, however that liability may arise (although we will consider our medical duties to you, if doing so). ", "ar": "10-2	يجوز لنا إنهاء استخدامك ودخولك إلى خدمات الرعاية الصحية عن بُعد لأي سبب أو بدون سبب، في أي وقت، سواء بإشعارك أو بدونه ودون تحمل أي مسؤولية تجاهك، ومع ذلك قد تنشأ هذه المسؤولية (على الرغم من أننا سنأخذ واجباتنا الطبية تجاهك بعين الاعتبار في حالة القيام بذلك)."},
+  "liveCareTermsConditions41": {"en": "10.3 All restrictions and all disclaimers and exclusions and limitations of our liability will survive any termination. Upon termination, you must not directly or indirectly access or use the Application and or the Website.", "ar": "10-3	ستظل جميع القيود وجميع إخلاءات الطرف من المسؤولية والاستثناءات والقيود الخاصة بمسؤوليتنا سارية بعد أي إنهاء. عند الإنهاء، يتعين عليك عدم الدخول إلى أو استخدام التطبيق و/أو موقع الويب بشكل مباشر أو غير مباشر."},
+  "liveCareTermsHeading13": {"en": "11. GOVERNING LAW AND JURISDICTION ", "ar": "11.	القانون الحاكم والاختصاص القضائي"},
+  "liveCareTermsConditions42": {"en": "The law applicable to the Application and or the Website User Terms and Conditions and to disputes arising out of or in connection with them are the laws of The Kingdom of Saudi Arabia. You irrevocably submit to the exclusive jurisdiction of the courts of the Kingdom of Saudi Arabia. ", "ar": "النظام المعمول به على التطبيق و/أو شروط وأحكام مستخدم موقع الويب والنزاعات الناشئة عنها أو المتعلقة بها هي أنظمة المملكة العربية السعودية. وأنت تخضع بشكل لا رجوع فيه للاختصاص القضائي الحصري لمحاكم المملكة العربية السعودية."},
+  "liveCareTermsHeading14": {"en": "12. ACKNOWLEDGEMENTS", "ar": "12.	الإقرارات"},
+  "liveCareTermsConditions43": {"en": "12.1 Except as expressly set out in these Terms & Conditions or as permitted by any applicable law, you agree on the following: ", "ar": "12-1	باستثناء ما هو منصوص عليه صراحةً في هذه الشروط والأحكام أو ما يسمح به أي نظام معمول به، فإنك توافق على ما يلي:"},
+  "liveCareTermsConditions43a": {"en": "(a) you have read and understand these Terms & Conditions and the other terms forming part of your Agreement with us; ", "ar": "(1) أنك قد قرأت وفهمت هذه الشروط والأحكام والبنود الأخرى التي تشكل جزءاً من اتفاقيتك معنا"},
+  "liveCareTermsConditions43b": {"en": "(b) you have read our Privacy Policy and hereby expressly consent to our use of your personal information as described. In addition, you understand that the contact number or email address that you have provided on registration will be used for communications by the Group through SMS, email or any other method in connection with the Telehealth Services, including for appointment notifications and current medical services;", "ar": "(2) أنك قد قرأت سياسة الخصوصية الخاصة بنا وتوافق بموجبه صراحة على استخدامنا لمعلوماتك الشخصية كما هو موضح فيها. بالإضافة إلى ذلك، أنت تدرك أن رقم الاتصال أو عنوان البريد الإلكتروني الذي زودتنا به عند التسجيل سيتم استخدامه للاتصالات من قبل المجموعة من خلال الرسائل القصيرة أو البريد الإلكتروني أو أي طريقة أخرى فيما يتعلق بخدمات الرعاية الصحية عن بُعد، بما في ذلك إشعارات المواعيد والخدمات الطبية الحالية."},
+  "liveCareTermsConditions43c": {"en": "(c) you understand that you have the right to withhold or withdraw your consent to the use of the Application and or the Website in the course of your care at any time, without affecting your right to future care or treatment; ", "ar": "(3) أنت تدرك أن لديك الحق في حجب أو سحب موافقتك بشأن استخدام التطبيق و/أو موقع الويب في سياق رعايتك في أي وقت، دون التأثير على حقك في تلقي الرعاية أو العلاج في المستقبل؛"},
+  "liveCareTermsConditions43d": {"en": "(d) you understand that you may expect to receive benefits from the use of Application and or the Website concerning your healthcare, but that no results can be guaranteed or assured; ", "ar": "(4) أنت تدرك أنك قد تتوقع الحصول على مزايا من استخدام التطبيق و/أو موقع الويب فيما يتعلق برعايتك الصحية، ولكن لا يمكن ضمان أي نتائج أو تأكيدها؛"},
+  "liveCareTermsConditions43e": {"en": "(e) you understand that your healthcare information may be shared with other employees in the Group for scheduling and billing purposes;", "ar": "(5) أنت تدرك أنه قد تتم مشاركة معلومات الرعاية الصحية الخاصة بك مع موظفين آخرين في المجموعة لأغراض جدولة المواعيد والفواتير؛"},
+  "liveCareTermsConditions43f": {"en": "(f) you understand that video images and audio recordings of you may be captured and stored electronically. You understand that these recordings may be later used in connection with legal proceedings if necessary but will not otherwise be used for any purpose other than providing Telehealth Services and follow-up medical services to you. You acknowledge and consent to the use of these images and audio recordings by us for the purposes described; ", "ar": "(6) أنت تدرك أن صور الفيديو والتسجيلات الصوتية الخاصة بك قد يتم التقاطها وتخزينها إلكترونياً. وأنت تدرك كذلك أنه يمكن استخدام هذه التسجيلات لاحقاً فيما يتعلق بالإجراءات النظامية إذا لزم الأمر ولكن لن يتم استخدامها لأي غرض بخلاف توفير خدمات الرعاية الصحية عن بُعد وخدمات المتابعة الطبية لك. أنت تقر وتوافق على استخدام هذه الصور والتسجيلات الصوتية من قبلنا للأغراض الموضحة؛"},
+  "liveCareTermsConditions43g": {"en": "(g) you understand the risks of communicating by email and text messages,  particularly the privacy risks. You understand that the Group cannot guarantee the security and confidentiality of email or text communication. The Group will not be responsible for messages that are not received or delivered due to technical failure, or for disclosure of confidential information unless caused by intentional misconduct.", "ar": "(7) أنك تدرك مخاطر الاتصال عبر البريد الإلكتروني والرسائل النصية، ولا سيما مخاطر الخصوصية. أنت تدرك أن المجموعة لا يمكنها ضمان أمان وسرية البريد الإلكتروني أو الاتصالات النصية. لن تكون المجموعة مسؤولة عن الرسائل التي لم يتم استلامها أو تسليمها بسبب عطل فني أو الكشف عن معلومات سرية ما لم يكن ذلك بسبب سوء سلوك متعمد."},
+  "liveCareTermsHeading15": {"en": "13. GENERAL TERMS AND CONDITIONS ", "ar": "13.	شروط وأحكام عامة"},
+  "liveCareTermsConditions44": {"en": "13.1 We may at any time vary these Terms & Conditions for security, legal or regulatory reasons, or to reflect updates or changes to the services or functionality of Telehealth Services or the Application, by publishing the varied Terms & Conditions on the Application. We will notify you on the Application that these Terms & Conditions have changed before your next use of the Telehealth Services and you will have the opportunity to agree to the revised terms before using the service again. ", "ar": "13-1	يجوز لنا في أي وقت تغيير هذه الشروط والأحكام لأسباب أمنية أو نظامية أو تنظيمية ، أو لتعكس التحديثات أو التغييرات التي تطرأ على خدمات أو وظائف خدمات الرعاية الصحية عن بُعد أو التطبيق، عن طريق نشر الشروط والأحكام المتنوعة على التطبيق. سنخطرك في التطبيق بأن هذه الشروط والأحكام قد تغيرت قبل استخدامك التالي لخدمات الرعاية الصحية عن بُعد وستتاح لك الفرصة للموافقة على الشروط المعدلة قبل استخدام الخدمة مرة أخرى."},
+  "liveCareTermsConditions45": {"en": "13.2 We may perform any of our obligations, and exercise any of the rights granted to us under these Terms & Conditions, through a third party. We may assign any or  all our rights and obligations under these Terms & Conditions to any third party.", "ar": "13-2	يجوز لنا أداء أي من التزاماتنا، وممارسة أي من الحقوق الممنوحة لنا بموجب هذه الشروط والأحكام، من خلال طرف ثالث. يجوز لنا التنازل عن أي من حقوقنا والتزاماتنا أو جميعها بموجب هذه الشروط والأحكام إلى أي طرف ثالث."},
+  "liveCareTermsConditions46": {"en": "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. ", "ar": "13-3	إذا تبين أن أي بند أو جزء من أي بند من هذه الشروط والأحكام باطل أو غير قابل للإنفاذ أو غير صالح، فسيتم فصله عن هذه الشروط والأحكام، تاركاً باقي الشروط سارية المفعول بكامل الأثر والنفاذ، بشرط ألا يغير فصل ذلك البند من الطبيعة الأساسية لهذه الشروط والأحكام."},
+  "liveCareTermsHeading16": {"en": "14. COMPLAINTS", "ar": "14.	الشكاوى"},
+  "liveCareTermsConditions47": {"en": "Our Telehealth Services will be for specific medical specialties or follow-up or medication refill appointments.", "ar": "خدمات الرعاية الصحية عن بُعد الخاصة بنا سوف تكون لتخصصات طبية محددة أو لمواعيد المتابعة أو إعادة صرف الدواء. "},
+  "liveCareTermsConditions48": {"en": "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", "ar": "إذا كانت لديك أي شكاوى أو مخاوف بشأن التطبيق و/أو موقع الويب أو خدماتنا أو كيفية تعاملنا مع معلوماتك الشخصية، فيرجى التواصل معنا على: EServices.HMG@drsulaimanalhabib.com أو الاتصال على الرقم: 9553 525 011"},
+  "clickPrivacyPolicy": {"en": "Please click here to view the privacy policy", "ar": "الرجاء الضغط هنا لعرض سياسة الخصوصية"},
 };
--- a/lib/core/model/hospitals/hospitals_model.dart
+++ b/lib/core/model/hospitals/hospitals_model.dart
@ -15,6 +15,11 @@ class HospitalsModel {
  dynamic mainProjectID;
  bool? projectOutSA;
  bool? usingInDoctorApp;
+  bool? isHMC;
+  String? region;
+  String? regionArabic;
+  String? regionEnglish;
+  String? regionID;

  HospitalsModel(
      {this.desciption,
@ -32,7 +37,13 @@ class HospitalsModel {
      this.longitude,
      this.mainProjectID,
      this.projectOutSA,
-      this.usingInDoctorApp});
+    this.usingInDoctorApp,
+    this.isHMC,
+    this.region,
+    this.regionArabic,
+    this.regionEnglish,
+    this.regionID,
+  });

  HospitalsModel.fromJson(Map<String, dynamic> json) {
    desciption = json['Desciption'];
@ -51,6 +62,23 @@ class HospitalsModel {
    mainProjectID = json['MainProjectID'];
    projectOutSA = json['ProjectOutSA'];
    usingInDoctorApp = json['UsingInDoctorApp'];
+    this.isHMC = json["IsHMC"];
+    this.regionArabic = json['RegionNameN'];
+    this.regionEnglish = json['RegionName'];
+  }
+
+  String? getRegionName(bool isArabic) {
+    if (isArabic) {
+      return regionArabic;
+    }
+    return regionEnglish;
+  }
+
+  String? getName(bool isArabic) {
+    if (isArabic) {
+      return "$nameN";
+    }
+    return name;
  }

  Map<String, dynamic> toJson() {
--- a/lib/core/model/prescriptions/request_send_prescription_email.dart
+++ b/lib/core/model/prescriptions/request_send_prescription_email.dart
@ -28,6 +28,7 @@ class RequestSendPrescriptionEmail {
  int? projectID;
  List<PrescriptionReport>? listPrescriptions;
  List<PrescriptionReportINP>? listPrescriptionsINP;
+  bool? isDownload;

  RequestSendPrescriptionEmail(
      {this.appointmentDate,
@ -53,7 +54,8 @@ class RequestSendPrescriptionEmail {
      this.clinicName,
      this.doctorName,
      this.projectID,
-      this.doctorID});
+      this.doctorID,
+      this.isDownload});

  RequestSendPrescriptionEmail.fromJson(Map<String, dynamic> json) {
    appointmentDate = json['AppointmentDate'];
@ -114,6 +116,7 @@ class RequestSendPrescriptionEmail {
    data['DoctorName'] = this.doctorName;
    data['ProjectID'] = this.projectID;
    data['DoctorID'] = this.doctorID;
+    data['IsDownload'] = this.isDownload;
    return data;
  }
 }
--- a/lib/core/model/radiology/final_radiology.dart
+++ b/lib/core/model/radiology/final_radiology.dart
@ -44,6 +44,7 @@ class FinalRadiology {
  bool? isCVI;
  bool? isRadMedicalReport;
  bool? isLiveCareAppointment;
+  String? exam_Id;

  FinalRadiology(
      {this.setupID,
@ -88,7 +89,8 @@ class FinalRadiology {
      this.speciality,
      this.isCVI,
      this.isRadMedicalReport,
-      this.isLiveCareAppointment});
+      this.isLiveCareAppointment,
+      this.exam_Id});

  FinalRadiology.fromJson(Map<String, dynamic> json) {
    try {
@ -135,6 +137,7 @@ class FinalRadiology {
      //  speciality = json['Speciality'].cast<String>();
      isCVI = json['isCVI'];
      isRadMedicalReport = json['isRadMedicalReport'];
+      exam_Id = json['Exam_id'];
    } catch (e) {
      print(e);
    }
--- a/lib/core/model/radiology/request_send_rad_report_email.dart
+++ b/lib/core/model/radiology/request_send_rad_report_email.dart
@ -28,6 +28,7 @@ class RequestSendRadReportEmail {
  String? tokenID;
  double? versionID;
  int? invoiceLineItemNo;
+  bool? isDownload;

  RequestSendRadReportEmail(
      {this.channel,
@ -57,7 +58,7 @@ class RequestSendRadReportEmail {
        this.setupID,
        this.to,
        this.tokenID,
-        this.versionID});
+        this.versionID, this.isDownload});

  RequestSendRadReportEmail.fromJson(Map<String, dynamic> json) {
    channel = json['Channel'];
@ -122,6 +123,7 @@ class RequestSendRadReportEmail {
    data['TokenID'] = this.tokenID;
    data['VersionID'] = this.versionID;
    data['InvoiceLineItemNo'] = this.invoiceLineItemNo;
+    data['IsDownload'] = this.isDownload;
    return data;
  }
 }
--- a/lib/core/service/client/base_app_client.dart
+++ b/lib/core/service/client/base_app_client.dart
@ -187,7 +187,7 @@ class BaseAppClient {

      // body['IdentificationNo'] = 1023854217;
      // body['MobileNo'] = "531940021";  //0560717232
-      // body['PatientID'] = 1058229; //4609100
+      // body['PatientID'] = 5690832; //4609100
      // body['TokenID'] = "@dm!n";

      // Patient ID: 3027574
--- a/lib/core/service/medical/PatientSickLeaveService.dart
+++ b/lib/core/service/medical/PatientSickLeaveService.dart
@ -3,15 +3,16 @@ import 'package:diplomaticquarterapp/core/model/sick_leave/sick_leave.dart';
 import 'package:diplomaticquarterapp/core/service/base_service.dart';

 class PatientSickLeaveService extends BaseService {
-  List<SickLeave> sickLeaveList =[];
+  List<SickLeave> sickLeaveList = [];
+
+  String sickLeavePDF = "";

  getSickLeave() async {
    hasError = false;
    super.error = "";
-    await baseAppClient.post(GET_PATIENT_SICK_LEAVE_STATUS,
-        onSuccess: (response, statusCode) async {
+    await baseAppClient.post(GET_PATIENT_SICK_LEAVE_STATUS, onSuccess: (response, statusCode) async {
      sickLeaveList.clear();
-      if(response['List_SickLeave'] != null && response['List_SickLeave'].length != 0) {
+      if (response['List_SickLeave'] != null && response['List_SickLeave'].length != 0) {
        response['List_SickLeave'].forEach((sickLeave) {
          sickLeaveList.add(SickLeave.fromJson(sickLeave));
        });
@ -22,12 +23,7 @@ class PatientSickLeaveService extends BaseService {
    }, body: Map());
  }

-  sendSickLeaveEmail(
-      {required int requestNo,
-      required String projectName,
-      required String doctorName,
-      required int projectID,
-      required String setupID}) async {
+  sendSickLeaveEmail({required int requestNo, required String projectName, required String doctorName, required int projectID, required String setupID, required bool isDownload}) async {
    hasError = false;
    super.error = "";
    Map<String, dynamic> body = Map();
@ -41,9 +37,12 @@ class PatientSickLeaveService extends BaseService {
    body['DoctorName'] = doctorName;
    body['ProjectID'] = projectID;
    body['SetupID'] = setupID;
-    await baseAppClient
-        .post(SendSickLeaveEmail, onSuccess: (response, statusCode) async {},
-            onFailure: (String error, int statusCode) {
+    body['IsDownload'] = isDownload;
+    await baseAppClient.post(SendSickLeaveEmail, onSuccess: (response, statusCode) async {
+      if(isDownload) {
+        sickLeavePDF = response['Base64Data'];
+      }
+    }, onFailure: (String error, int statusCode) {
      hasError = true;
      super.error = error;
    }, body: body);
--- a/lib/core/service/medical/ask_doctor_services.dart
+++ b/lib/core/service/medical/ask_doctor_services.dart
@ -29,6 +29,25 @@ class AskDoctorService extends BaseService {
    return Future.value(localRes);
  }

+  Future isDoctorAvailable({int? projectId, int? doctorId, int? clinicId}) async {
+    hasError = false;
+    Map<String, dynamic> body = Map();
+    body['isDentalAllowedBackend'] = false;
+    body['DoctorID'] = doctorId;
+    body['ProjectID'] = projectId;
+    body['ClinicID'] = clinicId;
+
+    dynamic localRes;
+
+    await baseAppClient.post(IS_DOCTOR_AVAILABLE_BY_CALENDAR_SCHEDULE, onSuccess: (dynamic response, int statusCode) {
+      localRes = response;
+    }, onFailure: (String error, int statusCode) {
+      hasError = true;
+      super.error = error;
+    }, body: body);
+    return Future.value(localRes);
+  }
+
  Future getCallRequestTypeLOV() async {
    hasError = false;
    Map<String, dynamic> body = Map();
--- a/lib/core/service/medical/labs_service.dart
+++ b/lib/core/service/medical/labs_service.dart
@ -42,7 +42,7 @@ class LabsService extends BaseService {
    _requestPatientLabSpecialResult.invoiceNo = isVidaPlus! ? "0" : invoiceNo;
    _requestPatientLabSpecialResult.invoiceNoVP = isVidaPlus ? invoiceNo : "0";

-    _requestPatientLabSpecialResult.invoiceType = invoiceType!;
+    _requestPatientLabSpecialResult.invoiceType = invoiceType ?? "";

    _requestPatientLabSpecialResult.orderNo = orderNo;
    _requestPatientLabSpecialResult.setupID = setupID;
@ -125,7 +125,7 @@ class LabsService extends BaseService {
  }

  Future updateWorkplaceName(String workplaceName, String workplaceNameAR, String occupation, String occupationAR, int requestNumber, String setupID, int projectID) async {
-  // Future updateWorkplaceName(String workplaceName, String workplaceNameAR, int requestNumber, String setupID, int projectID) async {
+    // Future updateWorkplaceName(String workplaceName, String workplaceNameAR, int requestNumber, String setupID, int projectID) async {
    hasError = false;
    Map<String, dynamic> body = Map();

@ -209,7 +209,7 @@ class LabsService extends BaseService {

  RequestSendLabReportEmail _requestSendLabReportEmail = RequestSendLabReportEmail();

-  Future sendLabReportEmail({PatientLabOrders? patientLabOrder, AuthenticatedUser? userObj, bool isVidaPlus = false, bool isDownload = false}) async {
+  Future sendLabReportEmail({PatientLabOrders? patientLabOrder, AuthenticatedUser? userObj, bool isVidaPlus = false, bool isDownload = false, int languageID = 1}) async {
    _requestSendLabReportEmail.projectID = patientLabOrder!.projectID;
    _requestSendLabReportEmail.invoiceNo = isVidaPlus ? "0" : patientLabOrder.invoiceNo;
    _requestSendLabReportEmail.invoiceNoVP = isVidaPlus ? patientLabOrder.invoiceNo : "0";
@ -228,11 +228,12 @@ class LabsService extends BaseService {
    _requestSendLabReportEmail.orderNo = patientLabOrder.orderNo;
    _requestSendLabReportEmail.isDownload = isDownload;
    _requestSendLabReportEmail.doctorID = patientLabOrder.doctorID;
-    _requestSendLabReportEmail.languageID = 1;
+    _requestSendLabReportEmail.languageID = languageID;

-    await baseAppClient.post(SEND_LAB_RESULT_EMAIL, onSuccess: (dynamic response, int statusCode) {
+    // await baseAppClient.post(SEND_LAB_RESULT_EMAIL, onSuccess: (dynamic response, int statusCode) {
+    await baseAppClient.post(isVidaPlus ? SEND_LAB_RESULT_EMAIL : SEND_LAB_RESULT_EMAIL_NEW, onSuccess: (dynamic response, int statusCode) {
      if (isDownload) {
-        labReportPDF = response['LabReportsPDFContent'];
+        labReportPDF = isVidaPlus ? response['LabReportsPDFContent'] : response['PdfContent'];
      }
    }, onFailure: (String error, int statusCode) {
      hasError = true;
--- a/lib/core/service/medical/medical_service.dart
+++ b/lib/core/service/medical/medical_service.dart
@ -55,7 +55,7 @@ class MedicalService extends BaseService {

  getSchedule(DoctorList doctorRequest) async {
    Map<String, dynamic> request;
-    request = {'DoctorID': doctorRequest.doctorID, 'ProjectID': doctorRequest.projectID, 'ClinicID': doctorRequest.clinicID, 'DoctorWorkingHoursDays': 7};
+    request = {'DoctorID': doctorRequest.doctorID, 'ProjectID': doctorRequest.projectID, 'ClinicID': doctorRequest.clinicID, 'DoctorWorkingHoursDays': 90};
    dynamic localRes;
    await baseAppClient.post(DOCTOR_SCHEDULE_URL, onSuccess: (response, statusCode) async {
      localRes = response;
@ -68,7 +68,7 @@ class MedicalService extends BaseService {

  getFreeSlot(DoctorList doctorRequest) async {
    Map<String, dynamic> request;
-    request = {'DoctorID': doctorRequest.doctorID, 'ProjectID': doctorRequest.projectID, 'ClinicID': doctorRequest.clinicID, 'DoctorWorkingHoursDays': 7};
+    request = {'DoctorID': doctorRequest.doctorID, 'ProjectID': doctorRequest.projectID, 'ClinicID': doctorRequest.clinicID, 'DoctorWorkingHoursDays': 90};
    dynamic localRes;
    await baseAppClient.post(GET_DOCTOR_FREE_SLOTS, onSuccess: (response, statusCode) async {
      localRes = response;
--- a/lib/core/service/medical/prescriptions_service.dart
+++ b/lib/core/service/medical/prescriptions_service.dart
@ -16,12 +16,14 @@ import 'package:diplomaticquarterapp/core/service/base_service.dart';
 import 'package:flutter/cupertino.dart';

 class PrescriptionsService extends BaseService {
-  List<Prescriptions> prescriptionsList =[];
-  List<PrescriptionReportINP> prescriptionReportListINP =[];
-  List<GetCMCAllOrdersResponseModel> prescriptionsOrderList =[];
-  List<PrescriptionInfoRCModel> prescriptionsOrderListRC =[];
+  List<Prescriptions> prescriptionsList = [];
+  List<PrescriptionReportINP> prescriptionReportListINP = [];
+  List<GetCMCAllOrdersResponseModel> prescriptionsOrderList = [];
+  List<PrescriptionInfoRCModel> prescriptionsOrderListRC = [];
  var isMedDeliveryAllowed;

+  String prescriptionReportPDF = "";
+
  Future getPrescriptions() async {
    hasError = false;
    Map<String, dynamic> body = Map();
@ -80,7 +82,7 @@ class PrescriptionsService extends BaseService {
  }

  RequestPrescriptionReport _requestPrescriptionReport = RequestPrescriptionReport(appointmentNo: 0, isDentalAllowedBackend: false);
-  List<PrescriptionReport> prescriptionReportList =[];
+  List<PrescriptionReport> prescriptionReportList = [];

  Future getPrescriptionReport({required Prescriptions prescriptions}) async {
    hasError = false;
@ -121,7 +123,7 @@ class PrescriptionsService extends BaseService {
    isDentalAllowedBackend: false,
  );

-  Future sendPrescriptionEmail(String appointmentDate, int patientID, String clinicName, String doctorName, int doctorID, int projectID, bool isInOutPatient) async {
+  Future sendPrescriptionEmail(String appointmentDate, int patientID, String clinicName, String doctorName, int doctorID, int projectID, bool isInOutPatient, bool isDownload) async {
    _requestSendPrescriptionEmail.listPrescriptions = prescriptionReportList;
    _requestSendPrescriptionEmail.listPrescriptionsINP = prescriptionReportListINP;
    _requestSendPrescriptionEmail.appointmentDate = appointmentDate;
@ -137,8 +139,13 @@ class PrescriptionsService extends BaseService {
    _requestSendPrescriptionEmail.patientName = user.firstName! + " " + user.lastName!;
    _requestSendPrescriptionEmail.setupID = user.setupID;
    _requestSendPrescriptionEmail.to = user.emailAddress;
+    _requestSendPrescriptionEmail.isDownload = isDownload;
    hasError = false;
-    await baseAppClient.post(SEND_PRESCRIPTION_EMAIL, onSuccess: (response, statusCode) {}, onFailure: (String error, int statusCode) {
+    await baseAppClient.post(SEND_PRESCRIPTION_EMAIL, onSuccess: (response, statusCode) {
+      if (isDownload) {
+        prescriptionReportPDF = response["Base64Data"];
+      }
+    }, onFailure: (String error, int statusCode) {
      hasError = true;
      super.error = error;
    }, body: _requestSendPrescriptionEmail.toJson());
@ -149,7 +156,7 @@ class PrescriptionsService extends BaseService {
    longitude: 0,
    isDentalAllowedBackend: false,
  );
-  List<PharmacyPrescriptions> pharmacyPrescriptionsList =[];
+  List<PharmacyPrescriptions> pharmacyPrescriptionsList = [];

  Future getListPharmacyForPrescriptions({required int itemId}) async {
    hasError = false;
@ -177,7 +184,7 @@ class PrescriptionsService extends BaseService {
    isDentalAllowedBackend: false,
  );

-  List<PrescriptionReportEnh> prescriptionReportEnhList =[];
+  List<PrescriptionReportEnh> prescriptionReportEnhList = [];

  Future getPrescriptionReportEnh({required PrescriptionsOrder prescriptionsOrder}) async {
    bool isInPatient = false;
--- a/lib/core/service/medical/radiology_service.dart
+++ b/lib/core/service/medical/radiology_service.dart
@ -10,7 +10,9 @@ class RadiologyService extends BaseService {

  bool isRadiologyVIDAPlus = false;

-  Future getRadImageURL({int? invoiceNo, String? invoiceType, int? lineItem, int? projectId, bool? isVidaPlus}) async {
+  String radReportPDF = "";
+
+  Future getRadImageURL({int? invoiceNo, String? invoiceType, int? lineItem, int? projectId, bool? isVidaPlus, String? examId}) async {
    hasError = false;
    final Map<String, dynamic> body = new Map<String, dynamic>();
    body['InvoiceNo'] = isVidaPlus! ? "0" : invoiceNo;
@ -18,6 +20,7 @@ class RadiologyService extends BaseService {
    body['LineItemNo'] = lineItem;
    body['ProjectID'] = projectId;
    body['InvoiceType'] = invoiceType;
+    body['ExamId'] = examId;

    await baseAppClient.post(GET_RAD_IMAGE_URL, isAllowAny: true, onSuccess: (dynamic response, int statusCode) {
      url = response['Data'];
@ -64,7 +67,7 @@ class RadiologyService extends BaseService {

  RequestSendRadReportEmail _requestSendRadReportEmail = RequestSendRadReportEmail();

-  Future sendRadReportEmail({FinalRadiology? finalRadiology, AuthenticatedUser? userObj}) async {
+  Future sendRadReportEmail({FinalRadiology? finalRadiology, AuthenticatedUser? userObj, required bool isDownload}) async {
    _requestSendRadReportEmail.projectID = finalRadiology!.projectID;
    _requestSendRadReportEmail.clinicName = finalRadiology.clinicDescription;
    _requestSendRadReportEmail.invoiceNo = finalRadiology.invoiceNo;
@ -81,9 +84,14 @@ class RadiologyService extends BaseService {
    _requestSendRadReportEmail.to = userObj.emailAddress;
    _requestSendRadReportEmail.dateofBirth = userObj.dateofBirth;
    _requestSendRadReportEmail.invoiceType = finalRadiology.invoiceType;
+    _requestSendRadReportEmail.isDownload = isDownload;

    hasError = false;
-    await baseAppClient.post(SEND_RAD_REPORT_EMAIL, isAllowAny: true, onSuccess: (dynamic response, int statusCode) {}, onFailure: (String error, int statusCode) {
+    await baseAppClient.post(SEND_RAD_REPORT_EMAIL, isAllowAny: true, onSuccess: (dynamic response, int statusCode) {
+      if(isDownload) {
+        radReportPDF = response["Base64Data"];
+      }
+    }, onFailure: (String error, int statusCode) {
      hasError = true;
      super.error = error;
    }, body: _requestSendRadReportEmail.toJson());
--- a/lib/core/service/medical/reports_service.dart
+++ b/lib/core/service/medical/reports_service.dart
@ -195,6 +195,7 @@ class ReportsService extends BaseService {
    body['ClinicName'] = clinicName;
    body['ProjectID'] = projectID;
    body['InvoiceNo'] = invoiceNo;
+    body['InvoiceNo_VP'] = invoiceNo;
    body['PrintedByName'] = user.firstName! + " " + user.lastName!;

    dynamic response;
--- a/lib/core/viewModels/medical/labs_view_model.dart
+++ b/lib/core/viewModels/medical/labs_view_model.dart
@ -1,3 +1,7 @@
+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+
 import 'package:diplomaticquarterapp/core/enum/filter_type.dart';
 import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
 import 'package:diplomaticquarterapp/core/model/labs/LabOrderResult.dart';
@ -9,6 +13,8 @@ import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.da
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
 import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
+import 'package:open_filex/open_filex.dart';
+import 'package:path_provider/path_provider.dart';

 import '../../../locator.dart';
 import '../base_view_model.dart';
@ -76,13 +82,7 @@ class LabsViewModel extends BaseViewModel {

  getLaboratoryResult({String? projectID, int? clinicID, String? invoiceNo, String? invoiceType, String? orderNo, String? setupID, bool? isVidaPlus}) async {
    setState(ViewState.Busy);
-    await _labsService.getLaboratoryResult(invoiceNo: invoiceNo,
-        invoiceType: invoiceType,
-        orderNo: orderNo,
-        projectID: projectID,
-        clinicID: clinicID,
-        setupID: setupID,
-        isVidaPlus: isVidaPlus);
+    await _labsService.getLaboratoryResult(invoiceNo: invoiceNo, invoiceType: invoiceType, orderNo: orderNo, projectID: projectID, clinicID: clinicID, setupID: setupID, isVidaPlus: isVidaPlus);
    if (_labsService.hasError) {
      error = _labsService.error!;
      setState(ViewState.Error);
@ -109,7 +109,7 @@ class LabsViewModel extends BaseViewModel {
          //     })
          //     .toList();
          // if (value.isEmpty)
-            labResultLists[labResultLists.indexOf(patientLabOrdersClinic[0])].patientLabResultList!.add(element);
+          labResultLists[labResultLists.indexOf(patientLabOrdersClinic[0])].patientLabResultList!.add(element);
        } else {
          labResultLists.add(LabResultList(filterName: element.testCode, lab: element));
        }
@ -150,15 +150,31 @@ class LabsViewModel extends BaseViewModel {
    }
  }

-  sendLabReportEmail({PatientLabOrders? patientLabOrder, String? mes, AuthenticatedUser? userObj, required bool isVidaPlus, bool isDownload = false}) async {
-    await _labsService.sendLabReportEmail(patientLabOrder: patientLabOrder, userObj: userObj, isVidaPlus: isVidaPlus, isDownload: isDownload);
+  sendLabReportEmail({PatientLabOrders? patientLabOrder, String? mes, AuthenticatedUser? userObj, required bool isVidaPlus, bool isDownload = false, int languageID = 1}) async {
+    await _labsService.sendLabReportEmail(patientLabOrder: patientLabOrder, userObj: userObj, isVidaPlus: isVidaPlus, isDownload: isDownload, languageID: languageID);
    if (_labsService.hasError) {
      error = _labsService.error!;
    } else {
      if (isDownload) {
+        if (labReportPDF.isNotEmpty) {
+          String path = await _createFileFromString(labReportPDF, "pdf");
+          try {
+            OpenFilex.open(path);
+          } catch (ex) {
+            AppToast.showErrorToast(message: "Cannot open file.");
+          }
+        }
      } else {
        AppToast.showSuccessToast(message: mes!);
      }
    }
  }
+
+  Future<String> _createFileFromString(String encodedStr, String ext) async {
+    Uint8List bytes = base64.decode(encodedStr);
+    String dir = (await getApplicationDocumentsDirectory()).path;
+    File file = File("$dir/" + DateTime.now().millisecondsSinceEpoch.toString() + "." + ext);
+    await file.writeAsBytes(bytes);
+    return file.path;
+  }
 }
--- a/lib/core/viewModels/medical/patient_sick_leave_view_model.dart
+++ b/lib/core/viewModels/medical/patient_sick_leave_view_model.dart
@ -5,11 +5,19 @@ import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart';
 import 'package:diplomaticquarterapp/locator.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';

+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+import 'package:open_filex/open_filex.dart';
+import 'package:path_provider/path_provider.dart';
+
 class PatientSickLeaveViewMode extends BaseViewModel {
  PatientSickLeaveService _patientSickLeaveService = locator<PatientSickLeaveService>();

  List<SickLeave> get sickLeaveList => _patientSickLeaveService.sickLeaveList;

+  String get sickLeavePDF => _patientSickLeaveService.sickLeavePDF;
+
  getSickLeave() async {
    setState(ViewState.Busy);
    await _patientSickLeaveService.getSickLeave();
@ -21,16 +29,36 @@ class PatientSickLeaveViewMode extends BaseViewModel {
    }
  }

-  Future sendSickLeaveEmail({required String message, required int requestNo, required String projectName, required String doctorName, required int projectID, required String setupID}) async {
+  Future sendSickLeaveEmail(
+      {required String message, required int requestNo, required String projectName, required String doctorName, required int projectID, required String setupID, required bool isDownload}) async {
    setState(ViewState.Busy);
-    await _patientSickLeaveService.sendSickLeaveEmail(requestNo: requestNo, projectName: projectName, doctorName: doctorName, projectID: projectID, setupID: setupID);
+    await _patientSickLeaveService.sendSickLeaveEmail(requestNo: requestNo, projectName: projectName, doctorName: doctorName, projectID: projectID, setupID: setupID, isDownload: isDownload);
    if (_patientSickLeaveService.hasError) {
      error = _patientSickLeaveService.error!;
      setState(ViewState.ErrorLocal);
      AppToast.showErrorToast(message: error);
    } else {
-      AppToast.showSuccessToast(message: message);
+      if (isDownload) {
+        if (sickLeavePDF.isNotEmpty) {
+          String path = await _createFileFromString(sickLeavePDF, "pdf");
+          try {
+            OpenFilex.open(path);
+          } catch (ex) {
+            AppToast.showErrorToast(message: "Cannot open file.");
+          }
+        }
+      } else {
+        AppToast.showSuccessToast(message: message);
+      }
      setState(ViewState.Idle);
    }
  }
+
+  Future<String> _createFileFromString(String encodedStr, String ext) async {
+    Uint8List bytes = base64.decode(encodedStr);
+    String dir = (await getApplicationDocumentsDirectory()).path;
+    File file = File("$dir/" + DateTime.now().millisecondsSinceEpoch.toString() + "." + ext);
+    await file.writeAsBytes(bytes);
+    return file.path;
+  }
 }
--- a/lib/core/viewModels/medical/prescriptions_view_model.dart
+++ b/lib/core/viewModels/medical/prescriptions_view_model.dart
@ -7,6 +7,7 @@ import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_repor
 import 'package:diplomaticquarterapp/core/model/prescriptions/prescriptions_order.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:open_filex/open_filex.dart';

 import '../../../core/enum/filter_type.dart';
 import '../../../core/enum/viewstate.dart';
@ -15,17 +16,20 @@ import '../../../core/service/medical/prescriptions_service.dart';
 import '../../../locator.dart';
 import '../base_view_model.dart';

+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+import 'package:path_provider/path_provider.dart';
+
 class PrescriptionsViewModel extends BaseViewModel {
  FilterType filterType = FilterType.Clinic;
  PrescriptionsService _prescriptionsService = locator<PrescriptionsService>();

-  List<PrescriptionsList> _prescriptionsOrderListClinic =[];
-  List<PrescriptionsList> _prescriptionsOrderListHospital =[];
+  List<PrescriptionsList> _prescriptionsOrderListClinic = [];
+  List<PrescriptionsList> _prescriptionsOrderListHospital = [];

  List<PrescriptionReport> get prescriptionReportList => _prescriptionsService.prescriptionReportList;

-
-
  List<PrescriptionReportINP> get prescriptionReportListINP => _prescriptionsService.prescriptionReportListINP;

  List<Prescriptions> get prescriptionsList => _prescriptionsService.prescriptionsList;
@ -45,6 +49,9 @@ class PrescriptionsViewModel extends BaseViewModel {
  }

  get isMedDeliveryAllowed => _prescriptionsService.isMedDeliveryAllowed;
+
+  String get prescriptionReportPDF => _prescriptionsService.prescriptionReportPDF;
+
  getPrescriptions() async {
    setState(ViewState.Busy);
    await _prescriptionsService.getPrescriptions();
@ -114,15 +121,36 @@ class PrescriptionsViewModel extends BaseViewModel {
    }
  }

-  sendPrescriptionEmail({required String appointmentDate, required int patientID, required String clinicName, required String doctorName, required int doctorID, required String mes, required int projectID, required bool isInOutPatient}) async {
+  sendPrescriptionEmail(
+      {required String appointmentDate,
+      required int patientID,
+      required String clinicName,
+      required String doctorName,
+      required int doctorID,
+      required String mes,
+      required int projectID,
+      required bool isInOutPatient,
+      required bool isDownload}) async {
    setState(ViewState.BusyLocal);
-    await _prescriptionsService.sendPrescriptionEmail(appointmentDate, patientID, clinicName, doctorName, doctorID, projectID, isInOutPatient);
+    await _prescriptionsService.sendPrescriptionEmail(appointmentDate, patientID, clinicName, doctorName, doctorID, projectID, isInOutPatient, isDownload);
    if (_prescriptionsService.hasError) {
      error = _prescriptionsService.error!;
      setState(ViewState.ErrorLocal);
      AppToast.showErrorToast(message: error);
    } else {
-      AppToast.showSuccessToast(message: mes);
+      if (isDownload) {
+        if (prescriptionReportPDF.isNotEmpty) {
+          String path = await _createFileFromString(prescriptionReportPDF, "pdf");
+          try {
+            OpenFilex.open(path);
+          } catch (ex) {
+            AppToast.showErrorToast(message: "Cannot open file.");
+          }
+        }
+      } else {
+        AppToast.showSuccessToast(message: mes);
+      }
+      // AppToast.showSuccessToast(message: mes);
      setState(ViewState.Idle);
    }
  }
@ -160,6 +188,14 @@ class PrescriptionsViewModel extends BaseViewModel {
    }
  }

+  Future<String> _createFileFromString(String encodedStr, String ext) async {
+    Uint8List bytes = base64.decode(encodedStr);
+    String dir = (await getApplicationDocumentsDirectory()).path;
+    File file = File("$dir/" + DateTime.now().millisecondsSinceEpoch.toString() + "." + ext);
+    await file.writeAsBytes(bytes);
+    return file.path;
+  }
+
  Future updatePressOrder({required int presOrderID}) async {
    setState(ViewState.Busy);
    // await _prescriptionsService.updatePressOrder(presOrderID: presOrderID);
--- a/lib/core/viewModels/medical/radiology_view_model.dart
+++ b/lib/core/viewModels/medical/radiology_view_model.dart
@ -9,12 +9,18 @@ import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 import '../../../locator.dart';
 import '../base_view_model.dart';

+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+import 'package:open_filex/open_filex.dart';
+import 'package:path_provider/path_provider.dart';
+
 class RadiologyViewModel extends BaseViewModel {
  FilterType filterType = FilterType.Clinic;
  RadiologyService _radiologyService = locator<RadiologyService>();

-  List<FinalRadiologyList> _finalRadiologyListClinic =[];
-  List<FinalRadiologyList> _finalRadiologyListHospital =[];
+  List<FinalRadiologyList> _finalRadiologyListClinic = [];
+  List<FinalRadiologyList> _finalRadiologyListHospital = [];

  List<FinalRadiologyList> get finalRadiologyList => filterType == FilterType.Clinic ? _finalRadiologyListClinic : _finalRadiologyListHospital;

@ -22,6 +28,8 @@ class RadiologyViewModel extends BaseViewModel {

  bool get isRadiologyVIDAPlus => _isRadiologyVIDAPlus;

+  String get radReportPDF => _radiologyService.radReportPDF;
+
  void getPatientRadOrders() async {
    setState(ViewState.Busy);
    await _radiologyService.getPatientRadOrders();
@ -48,9 +56,9 @@ class RadiologyViewModel extends BaseViewModel {

  String get radImageURL => _radiologyService.url;

-  getRadImageURL({required int invoiceNo, String? invoiceType, required int lineItem, required int projectId, required bool isVidaPlus}) async {
+  getRadImageURL({required int invoiceNo, String? invoiceType, required int lineItem, required int projectId, required bool isVidaPlus, required String examId}) async {
    setState(ViewState.Busy);
-    await _radiologyService.getRadImageURL(invoiceNo: invoiceNo, invoiceType: invoiceType, lineItem: lineItem, projectId: projectId, isVidaPlus: isVidaPlus);
+    await _radiologyService.getRadImageURL(invoiceNo: invoiceNo, invoiceType: invoiceType, lineItem: lineItem, projectId: projectId, isVidaPlus: isVidaPlus, examId: examId);
    if (_radiologyService.hasError) {
      error = _radiologyService.error!;
      setState(ViewState.Error);
@ -58,18 +66,38 @@ class RadiologyViewModel extends BaseViewModel {
      setState(ViewState.Idle);
  }

-  sendRadReportEmail({required FinalRadiology finalRadiology, required String mes, required AuthenticatedUser userObj}) async {
+  sendRadReportEmail({required FinalRadiology finalRadiology, required String mes, required AuthenticatedUser userObj, required isDownload}) async {
    setState(ViewState.BusyLocal);
-    await _radiologyService.sendRadReportEmail(finalRadiology: finalRadiology, userObj: userObj);
+    await _radiologyService.sendRadReportEmail(finalRadiology: finalRadiology, userObj: userObj, isDownload: isDownload);
    if (_radiologyService.hasError) {
      error = _radiologyService.error!;
      AppToast.showErrorToast(message: error);
    } else {
-      AppToast.showSuccessToast(message: mes);
+      if (isDownload) {
+        if (radReportPDF.isNotEmpty) {
+          String path = await _createFileFromString(radReportPDF, "pdf");
+          try {
+            OpenFilex.open(path);
+          } catch (ex) {
+            AppToast.showErrorToast(message: "Cannot open file.");
+          }
+        }
+      } else {
+        AppToast.showSuccessToast(message: mes);
+      }
+      // AppToast.showSuccessToast(message: mes);
    }
    setState(ViewState.Idle);
  }

+  Future<String> _createFileFromString(String encodedStr, String ext) async {
+    Uint8List bytes = base64.decode(encodedStr);
+    String dir = (await getApplicationDocumentsDirectory()).path;
+    File file = File("$dir/" + DateTime.now().millisecondsSinceEpoch.toString() + "." + ext);
+    await file.writeAsBytes(bytes);
+    return file.path;
+  }
+
  setFilterType(FilterType filterType) {
    this.filterType = filterType;
    notifyListeners();
--- a/lib/main.dart
+++ b/lib/main.dart
@ -1,5 +1,7 @@
+import 'dart:async';
 import 'dart:io';

+import 'package:app_links/app_links.dart';
 import 'package:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/core/viewModels/PharmacyPagesViewModel.dart';
 import 'package:diplomaticquarterapp/core/viewModels/dashboard_view_model.dart';
@ -10,12 +12,11 @@ import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
 import 'package:diplomaticquarterapp/services/robo_search/search_provider.dart';
 import 'package:diplomaticquarterapp/theme/theme_notifier.dart';
 import 'package:diplomaticquarterapp/theme/theme_value.dart';
+import 'package:diplomaticquarterapp/uitl/DeepLinkHandler.dart';
 import 'package:diplomaticquarterapp/uitl/PlatformBridge.dart';
 import 'package:diplomaticquarterapp/uitl/navigation_service.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:firebase_core/firebase_core.dart';
-import 'package:firebase_crashlytics/firebase_crashlytics.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:provider/provider.dart';
@ -59,7 +60,7 @@ class MyHttpOverrides extends HttpOverrides {

 class _MyApp extends State<MyApp> {
  // late AppUpdateInfo _updateInfo;
-
+  StreamSubscription<Uri>? _linkSubscription;
  final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();

  //0537503378
@ -92,9 +93,30 @@ class _MyApp extends State<MyApp> {
    // if (Platform.isAndroid) checkForUpdate();

    ThemeNotifier(defaultTheme());
+    initDeepLinks();
    super.initState();
  }

+  void dispose() {
+    _linkSubscription?.cancel();
+
+    super.dispose();
+  }
+
+  Future<void> initDeepLinks() async {
+    // Handle links
+    _linkSubscription = AppLinks().uriLinkStream.listen((uri) {
+      debugPrint('onAppLink: $uri');
+      openAppLink(uri);
+    });
+  }
+
+  void openAppLink(Uri uri) {
+    print("the uri is $uri");
+    DeepLinkHandler.instance.handleDeepLinkAndNavigation(
+        locator<NavigationService>().navigatorKey.currentState, uri, context);
+  }
+
  @override
  Widget build(BuildContext context) {
    PlatformBridge.init(context);
@ -151,7 +173,8 @@ class _MyApp extends State<MyApp> {
              ],
              child: Consumer<ProjectViewModel>(
                builder: (context, projectProvider, child) => MaterialApp(
-                  builder: (_, mchild) {
+                  builder: (context, mchild) {
+                    AppGlobal.projectViewModelContext = context;
                    return MediaQuery(
                        data: MediaQuery.of(context).copyWith(
                          textScaler: TextScaler.linear(1.0),
--- a/lib/models/Appointments/DoctorListResponse.dart
+++ b/lib/models/Appointments/DoctorListResponse.dart
@ -1,3 +1,5 @@
+import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
+
 class DoctorList {
  int? clinicID;
  dynamic appointmentNo;
@ -46,6 +48,11 @@ class DoctorList {
  dynamic decimalDoctorRate;
  String? projectBottomName;
  String? projectTopName;
+  bool? isHMC;
+  String? region;
+  String? regionArabic;
+  String? regionEnglish;
+  String? regionID;

  DoctorList(
      {this.clinicID,
@ -94,9 +101,17 @@ class DoctorList {
      this.workingHours,
      this.decimalDoctorRate,
      this.projectBottomName,
-      this.projectTopName});
+      this.projectTopName,
+      this.isHMC,
+      this.region,
+    this.regionArabic,
+    this.regionEnglish,
+    this.regionID,
+      });

-  DoctorList.fromJson(Map<String, dynamic> json) {
+  DoctorList.fromJson(
+    Map<String, dynamic> json,
+  ) {
    clinicID = json['ClinicID'];
    appointmentNo = json['AppointmentNo'];
    clinicName = json['ClinicName'];
@ -144,6 +159,16 @@ class DoctorList {
    decimalDoctorRate = json['DecimalDoctorRate'];
    projectBottomName = json['ProjectNameBottom'];
    projectTopName = json['ProjectNameTop'];
+    this.isHMC = json["IsHMC"];
+    this.regionArabic = json['RegionNameN'];
+    this.regionEnglish = json['RegionName'];
+  }
+
+  String? getRegionName(bool isArabic) {
+    if (isArabic) {
+      return regionArabic;
+    }
+    return regionEnglish;
  }

  Map<String, dynamic> toJson() {
@ -198,6 +223,13 @@ class DoctorList {
  String getProjectCompleteName(){
    return "${this.projectTopName} ${this.projectBottomName}";
  }
+
+  String getProjectCompleteNameWithLocale({bool isArabic = false}) {
+    if (isArabic) {
+      return "${this.projectBottomName} ${this.projectTopName}";
+    }
+    return "${this.projectTopName} ${this.projectBottomName}";
+  }
 }

 class PatientDoctorAppointmentList {
@ -206,8 +238,188 @@ class PatientDoctorAppointmentList {
  List<DoctorList>? patientDoctorAppointmentList = [];
  String? projectTopName = "";
  String? projectBottomName = "";
+  bool? isHMC;
+  List<HospitalsModel> hospitalList = [];

-  PatientDoctorAppointmentList({this.filterName, this.distanceInKMs, this.projectTopName, this.projectBottomName, DoctorList? patientDoctorAppointment}) {
-    patientDoctorAppointmentList!.add(patientDoctorAppointment!);
+  PatientDoctorAppointmentList(
+      {this.filterName,
+      this.distanceInKMs,
+      this.projectTopName,
+      this.projectBottomName,
+      DoctorList? patientDoctorAppointment,
+      HospitalsModel? model,
+      this.isHMC = false}) {
+    if (model != null) {
+      hospitalList.add(model);
+    }
+    if (patientDoctorAppointment != null) {
+      patientDoctorAppointmentList!.add(patientDoctorAppointment!);
+    }
  }
 }
+
+// class PatientDoctorAppointmentListByRegion {
+//   String? filterName = "";
+//   String? distanceInKMs = "";
+//   List<DoctorList>? hmgDoctorList = [];
+//   List<DoctorList>? hmcDoctorList = [];
+//   String? projectTopName = "";
+//   String? projectBottomName = "";
+//
+//   PatientDoctorAppointmentListByRegion({this.filterName, this.distanceInKMs, this.projectTopName, this.projectBottomName, DoctorList? hmcPatientDoctorAppointment, DoctorList? hmgPatientDoctorAppointment}) {
+//     hmcDoctorList!.add(hmcPatientDoctorAppointment!);
+//     hmgDoctorList!.add(hmgPatientDoctorAppointment!);
+//   }
+// }
+
+class PatientDoctorAppointmentListByRegion {
+  List<PatientDoctorAppointmentList>? hmgDoctorList = [];
+  List<PatientDoctorAppointmentList>? hmcDoctorList = [];
+  int hmcSize = 0;
+  int hmgSize = 0;
+  num distance = double.infinity;
+  num hmgDistance = double.infinity;
+  num hmcDistance = double.infinity;
+}
+
+class RegionList {
+  Map<String, PatientDoctorAppointmentListByRegion?>? registeredDoctorMap = {};
+}
+
+/// dummy data
+///
+///
+
+DoctorList doctor1 = DoctorList(
+  clinicID: 101,
+  appointmentNo: 12345,
+  clinicName: "Downtown Clinic",
+  doctorTitle: "Dr.",
+  iD: 1,
+  name: "John Doe",
+  projectID: 301,
+  projectName: "HealthCare Network",
+  actualDoctorRate: 500,
+  clinicRoomNo: 2,
+  date: "2025-01-10",
+  appointmentDate: "2025-01-15T10:00:00",
+  dayName: "Monday",
+  doctorID: 11,
+  doctorImageURL: "https://example.com/images/johndoe.jpg",
+  doctorProfile: null,
+  doctorProfileInfo: null,
+  doctorRate: 4,
+  gender: 1,
+  genderDescription: "Male",
+  isAppointmentAllowed: true,
+  isDoctorAllowVedioCall: false,
+  isDoctorDummy: false,
+  isLiveCare: true,
+  isLiveCareClinic: false,
+  isDoctorHasPrePostImages: true,
+  latitude: "24.7136",
+  longitude: "46.6753",
+  nationalityFlagURL: "https://example.com/images/flags/sa.png",
+  nationalityID: "SA",
+  nationalityName: "Saudi Arabia",
+  nearestFreeSlot: "2025-01-15T10:00:00",
+  noOfPatientsRate: 50,
+  originalClinicID: 102,
+  personRate: 4.5,
+  projectDistanceInKiloMeters: 5.0,
+  qR: "QR123",
+  qRString: "abcd1234",
+  rateNumber: 120,
+  serviceID: null,
+  setupID: "Setup001",
+  speciality: ["Cardiology", "Internal Medicine"],
+  specialityN: ["Cardiology"],
+  workingHours: "8 AM - 5 PM",
+  decimalDoctorRate: 4.5,
+  projectBottomName: "HealthCare Bottom",
+  projectTopName: "HealthCare Top",
+  isHMC: false,
+  region: "Riyadh",
+);
+
+DoctorList doctor2 = DoctorList(
+  clinicID: 102,
+  appointmentNo: 67890,
+  clinicName: "City Medical Center",
+  doctorTitle: "Dr.",
+  iD: 2,
+  name: "Jane Smith",
+  projectID: 302,
+  projectName: "MedicalGroup Network",
+  actualDoctorRate: 450,
+  clinicRoomNo: 5,
+  date: "2025-01-12",
+  appointmentDate: "2025-01-16T09:00:00",
+  dayName: "Wednesday",
+  doctorID: 12,
+  doctorImageURL: "https://example.com/images/janesmith.jpg",
+  doctorProfile: null,
+  doctorProfileInfo: null,
+  doctorRate: 5,
+  gender: 2,
+  genderDescription: "Female",
+  isAppointmentAllowed: true,
+  isDoctorAllowVedioCall: true,
+  isDoctorDummy: false,
+  isLiveCare: false,
+  isLiveCareClinic: true,
+  isDoctorHasPrePostImages: false,
+  latitude: "24.7742",
+  longitude: "46.7387",
+  nationalityFlagURL: "https://example.com/images/flags/us.png",
+  nationalityID: "US",
+  nationalityName: "United States",
+  nearestFreeSlot: "2025-01-16T09:00:00",
+  noOfPatientsRate: 70,
+  originalClinicID: 103,
+  personRate: 4.8,
+  projectDistanceInKiloMeters: 8.0,
+  qR: "QR567",
+  qRString: "efgh5678",
+  rateNumber: 200,
+  serviceID: null,
+  setupID: "Setup002",
+  speciality: ["Dermatology", "Cosmetic Surgery"],
+  specialityN: ["Dermatology"],
+  workingHours: "9 AM - 6 PM",
+  decimalDoctorRate: 4.8,
+  projectBottomName: "MedicalGroup Bottom",
+  projectTopName: "MedicalGroup Top",
+  isHMC: true,
+  region: "Riyadh",
+);
+
+// Dummy data for PatientDoctorAppointmentList
+PatientDoctorAppointmentList patientList1 = PatientDoctorAppointmentList(
+  filterName: "Aryan",
+  distanceInKMs: "0",
+  projectTopName: "HealthCare",
+  projectBottomName: "Center",
+  patientDoctorAppointment: doctor1,
+);
+
+PatientDoctorAppointmentList patientList2 = PatientDoctorAppointmentList(
+  filterName: "Aryan",
+  distanceInKMs: "0",
+  projectTopName: "MedicalGroup",
+  projectBottomName: "Clinic",
+  patientDoctorAppointment: doctor2,
+);
+
+// Dummy data for PatientDoctorAppointmentListByRegion
+PatientDoctorAppointmentListByRegion region1 =
+    PatientDoctorAppointmentListByRegion()
+      ..hmgDoctorList = [patientList1]
+      ..hmcDoctorList = [patientList2];
+
+// Dummy data for RegionList
+RegionList regionList = RegionList()
+  ..registeredDoctorMap = {
+    "Region1": region1,
+    "Region2": region1,
+  };
--- a/lib/models/Clinics/EROnlineCheckInPaymentDetailsResponse.dart
+++ b/lib/models/Clinics/EROnlineCheckInPaymentDetailsResponse.dart
@ -20,7 +20,9 @@ class EROnlineCheckInPaymentDetailsResponse {
  dynamic setupID;
  int? statusCode;
  String? subPolicyNo;
-
+  bool? isCash;
+  bool? isEligible;
+  bool? isInsured;
  EROnlineCheckInPaymentDetailsResponse(
      {this.cashPrice,
        this.cashPriceTax,
@ -42,7 +44,11 @@ class EROnlineCheckInPaymentDetailsResponse {
        this.procedureName,
        this.setupID,
        this.statusCode,
-        this.subPolicyNo});
+        this.subPolicyNo,
+        this.isCash,
+        this.isEligible,
+        this.isInsured
+      });

  EROnlineCheckInPaymentDetailsResponse.fromJson(Map<String, dynamic> json) {
    cashPrice = json['CashPrice'];
@ -66,6 +72,9 @@ class EROnlineCheckInPaymentDetailsResponse {
    setupID = json['SetupID'];
    statusCode = json['StatusCode'];
    subPolicyNo = json['SubPolicyNo'];
+    isCash = json['IsCash'];
+    isEligible = json['IsEligible'];
+    isInsured = json['IsInsured'];
  }

  Map<String, dynamic> toJson() {
@ -91,6 +100,9 @@ class EROnlineCheckInPaymentDetailsResponse {
    data['SetupID'] = this.setupID;
    data['StatusCode'] = this.statusCode;
    data['SubPolicyNo'] = this.subPolicyNo;
+    data['IsCash'] = this.isCash;
+    data['IsEligible'] = this.isEligible;
+    data['IsInsured'] = this.isInsured;
    return data;
  }
 }
--- a/lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
+++ b/lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
@ -30,6 +30,7 @@ import 'package:diplomaticquarterapp/widgets/dragable_sheet.dart';
 import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:provider/provider.dart';

 class AnicllaryOrdersDetails extends StatefulWidget {
@ -151,7 +152,8 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
              width: MediaQuery.of(context).size.width * 0.75,
              child: getPaymentMethods(),
            ),
-            _amountView(TranslationBase.of(context).patientShareTotalToDo, getTotalValue() + " " + TranslationBase.of(context).sar, isBold: true, isTotal: true),
+            _amountView(TranslationBase.of(context).patientShareTotalToDo, getTotalValue(), isBold: true, isTotal: true),
+            // _amountView(TranslationBase.of(context).patientShareTotalToDo, getTotalValue(), isBold: true, isTotal: true),
            SizedBox(height: 12),
            DefaultButton(
              TranslationBase.of(context).payNow.toUpperCase(),
@ -177,15 +179,14 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
    return Text(
      text,
      style: TextStyle(
-        fontSize: isBold
-            ? isTotal
-                ? 16
-                : 12
-            : 11,
-        letterSpacing: -0.5,
-        color: isBold ? Color(0xff2E303A) : Color(0xff575757),
-        fontWeight: isTotal ? FontWeight.bold : FontWeight.w600,
-      ),
+          fontSize: isBold
+              ? isTotal
+                  ? 16
+                  : 12
+              : 11,
+          letterSpacing: -0.5,
+          color: isBold ? Color(0xff2E303A) : Color(0xff575757),
+          fontWeight: isTotal ? FontWeight.bold : FontWeight.w600),
    );
  }

@ -197,7 +198,15 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
          child: _getNormalText(title),
        ),
        Expanded(
-          child: _getNormalText(value, isBold: isBold, isTotal: isTotal),
+          child: Row(
+            children: [
+              projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
+              mWidth(6),
+              _getNormalText(value, isBold: isBold, isTotal: isTotal),
+              mWidth(6),
+              projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
+            ],
+          ),
        ),
      ]),
    );
@ -319,7 +328,8 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
                        ),
                        mWidth(3),
                        Text(
-                          _ancillaryProcLists[0].ancillaryOrderProcDetailsList![0].orderNo.toString(),
+                          // _ancillaryProcLists[0].ancillaryOrderProcDetailsList![0].orderNo.toString(),
+                          _ancillaryProcLists[0].ancillaryOrderProcDetailsList!.isNotEmpty ? _ancillaryProcLists[0].ancillaryOrderProcDetailsList![0].orderNo.toString() : "0",
                          style: TextStyle(
                            fontWeight: FontWeight.w600,
                            fontSize: 12,
@ -572,9 +582,9 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
              });
            }),
        Utils.tableColumnValue('${value.procedureName}', isLast: true, isCapitable: false, mProjectViewModel: projectViewModel),
-        Utils.tableColumnValue('${value.patientShare.toString() + " " + TranslationBase.of(context).sar.toUpperCase()}', isLast: true, isCapitable: false, mProjectViewModel: projectViewModel),
-        Utils.tableColumnValue('${value.patientTaxAmount.toString() + " " + TranslationBase.of(context).sar.toUpperCase()}', isLast: true, isCapitable: false, mProjectViewModel: projectViewModel),
-        Utils.tableColumnValue('${value.patientShareWithTax.toString() + " " + TranslationBase.of(context).sar.toUpperCase()}', isLast: true, isCapitable: false, mProjectViewModel: projectViewModel),
+        Utils.tableColumnValue('${value.patientShare.toString()}', isLast: true, isCapitable: false, mProjectViewModel: projectViewModel),
+        Utils.tableColumnValue('${value.patientTaxAmount.toString()}', isLast: true, isCapitable: false, mProjectViewModel: projectViewModel),
+        Utils.tableColumnValue('${value.patientShareWithTax.toString()}', isLast: true, isCapitable: false, mProjectViewModel: projectViewModel),
      ]),
    );
    return tableRow;
@ -660,27 +670,27 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
    service.applePayInsertRequest(applePayInsertRequest, context).then((res) async {
      if (res["MessageStatus"] == 1) {
        await context.read<PayfortViewModel>().initiateApplePayWithPayfort(
-          customerName: projectViewModel.user.firstName! + " " + projectViewModel.user.lastName!,
-          // customerEmail: projectViewModel.authenticatedUserObject.user.emailAddress,
-          customerEmail: "CustID_${projectViewModel.user.patientID}@HMG.com",
-          orderDescription: "Ancillary Order Payment",
-          orderAmount: double.parse(getTotalValue()),
-          merchantReference: transID,
-          payfortProjectDetailsRespModel: payfortProjectDetailsRespModel,
-          currency: projectViewModel.user.outSA == 1 ? "AED" : "SAR",
-          onFailed: (failureResult) async {
-            GifLoaderDialogUtils.hideDialog(context);
-            log("failureResult: ${failureResult.toString()}");
-            AppToast.showErrorToast(message: failureResult.toString());
-          },
-          onSuccess: (successResult) async {
-            log("Payfort: ${successResult.responseMessage}");
-            await context.read<PayfortViewModel>().addPayfortApplePayResponse(projectViewModel.user.patientID!, result: successResult);
-            checkPaymentStatus(AppoitmentAllHistoryResultList());
-          },
-          projectId: widget.projectID,
-          serviceTypeEnum: ServiceTypeEnum.ancillaryOrder,
-        );
+              customerName: projectViewModel.user.firstName! + " " + projectViewModel.user.lastName!,
+              // customerEmail: projectViewModel.authenticatedUserObject.user.emailAddress,
+              customerEmail: "CustID_${projectViewModel.user.patientID}@HMG.com",
+              orderDescription: "Ancillary Order Payment",
+              orderAmount: double.parse(getTotalValue()),
+              merchantReference: transID,
+              payfortProjectDetailsRespModel: payfortProjectDetailsRespModel,
+              currency: projectViewModel.user.outSA == 1 ? "AED" : "SAR",
+              onFailed: (failureResult) async {
+                GifLoaderDialogUtils.hideDialog(context);
+                log("failureResult: ${failureResult.message.toString()}");
+                AppToast.showErrorToast(message: failureResult.message.toString());
+              },
+              onSuccess: (successResult) async {
+                log("Payfort: ${successResult.responseMessage}");
+                await context.read<PayfortViewModel>().addPayfortApplePayResponse(projectViewModel.user.patientID!, result: successResult);
+                checkPaymentStatus(AppoitmentAllHistoryResultList());
+              },
+              projectId: widget.projectID,
+              serviceTypeEnum: ServiceTypeEnum.ancillaryOrder,
+            );
      } else {
        GifLoaderDialogUtils.hideDialog(context);
        AppToast.showErrorToast(message: "An error occurred while processing your request");
--- a/lib/pages/Blood/user_agreement_page.dart
+++ b/lib/pages/Blood/user_agreement_page.dart
@ -1,26 +1,523 @@
 import 'package:diplomaticquarterapp/core/viewModels/TermsConditionsViewModel.dart';
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/theme/colors.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
+import 'package:provider/provider.dart';
+
+class UserAgreementPage extends StatefulWidget {
+  @override
+  State<UserAgreementPage> createState() => _UserAgreementPageState();
+}
+
+class _UserAgreementPageState extends State<UserAgreementPage> {
+  late ProjectViewModel projectViewModel;
+
+  bool acceptTerms = false;

-class UserAgreementPage extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
+    projectViewModel = Provider.of(context);
    return BaseView<TermsConditionsViewModel>(
      onModelReady: (model) => model.getUserTermsAndConditions(),
      builder: (_, model, w) => AppScaffold(
-          isShowAppBar: true,
-          showNewAppBarTitle: true,
-          showNewAppBar: true,
-          isShowDecPage: false,
-          appBarTitle: TranslationBase.of(context).userAgreement,
-          body: SingleChildScrollView(
-            child: Html(
-              data: model.userAgreementContent,
+        isShowAppBar: true,
+        showNewAppBarTitle: true,
+        showNewAppBar: true,
+        isShowDecPage: false,
+        appBarTitle: TranslationBase.of(context).termsConditions,
+        body: SingleChildScrollView(
+          child: Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  TranslationBase.of(context).termsHeading,
+                  style: TextStyle(
+                      fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions1,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions2,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions3,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions4,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions5,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsHeading2,
+                  style: TextStyle(
+                      fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions6,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsHeading3,
+                  style: TextStyle(
+                      fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions7,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions8,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions9,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions10,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions11,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions12,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions12a,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions12b,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions12c,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions13,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions14,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions14a,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions14b,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsHeading4,
+                  style: TextStyle(
+                      fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions15,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions16,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions16a,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions16b,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions17,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions18,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions19,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions19a,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions19b,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsHeading5,
+                  style: TextStyle(
+                      fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions20,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions21,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsHeading6,
+                  style: TextStyle(
+                      fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions21,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions22,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions23,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions24,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsHeading7,
+                  style: TextStyle(
+                      fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions25,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions25a,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions25b,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions25c,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions26,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions27,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions28,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions29,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions30,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions31,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions32,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsHeading8,
+                  style: TextStyle(
+                      fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions33,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions33a,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions33b,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions34,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions34a,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions34b,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions34c,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions34d,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions34e,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions35,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions35a,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions35b,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions35c,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions35d,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions35e,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions36,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions37,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions38,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions39,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions39a,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions39b,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions39c,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions39d,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsHeading9,
+                  style: TextStyle(
+                      fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions40,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions41,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsHeading10,
+                  style: TextStyle(
+                      fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions42,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions43,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsHeading11,
+                  style: TextStyle(
+                      fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions44,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsHeading12,
+                  style: TextStyle(
+                      fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(12.0),
+                Text(
+                  TranslationBase.of(context).termsConditions45,
+                  style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                ),
+                mHeight(24.0),
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Checkbox(
+                        value: acceptTerms,
+                        onChanged: (v) {
+                          setState(() => acceptTerms = v!);
+                        }),
+                    Expanded(
+                      child: Text(
+                        TranslationBase.of(context).termsConditionsRead,
+                        style: TextStyle(
+                            fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
+                      ),
+                    ),
+                  ],
+                ),
+                mHeight(75.0),
+              ],
            ),
-          )),
+          ),
+        ),
+        bottomSheet: Container(
+          color: CustomColors.white,
+          padding: EdgeInsets.fromLTRB(12.0, 1.0, 12.0, 25.0),
+          child: DefaultButton(
+            TranslationBase.of(context).acceptLbl.toUpperCase(),
+            acceptTerms
+                ? () {
+                    Navigator.pop(context);
+                  }
+                : null,
+            color: CustomColors.green,
+            disabledColor: CustomColors.grey2,
+          ),
+        ),
+      ),
    );
  }
 }
--- a/lib/pages/BookAppointment/BookConfirm.dart
+++ b/lib/pages/BookAppointment/BookConfirm.dart
@ -459,8 +459,9 @@ class _BookConfirmState extends State<BookConfirm> {
              payfortProjectDetailsRespModel: payfortProjectDetailsRespModel,
              currency: projectViewModel.user.outSA == 1 ? "AED" : "SAR",
              onFailed: (failureResult) async {
-                log("failureResult: ${failureResult.toString()}");
-                AppToast.showErrorToast(message: failureResult.toString());
+                GifLoaderDialogUtils.hideDialog(context);
+                log("failureResult: ${failureResult.message.toString()}");
+                AppToast.showErrorToast(message: failureResult.message.toString());
              },
              onSuccess: (successResult) async {
                log("Payfort: ${successResult.responseMessage}");
--- a/lib/pages/BookAppointment/BookSuccess.dart
+++ b/lib/pages/BookAppointment/BookSuccess.dart
@ -31,6 +31,7 @@ import 'package:diplomaticquarterapp/widgets/new_design/doctor_header.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:provider/provider.dart';

 import '../../config/shared_pref_kay.dart';
@ -41,6 +42,7 @@ class BookSuccess extends StatefulWidget {
  DoctorList docObject;

  late MyInAppBrowser browser;
+
  // final ChromeSafariBrowser chromeBrowser = new MyChromeSafariBrowser(new MyInAppBrowser());

  String appoDateFormatted;
@ -123,8 +125,8 @@ class _BookSuccessState extends State<BookSuccess> {
                  ),
                  TableRow(
                    children: [
-                      TableCell(child: _getHeadingText("SR " + widget.patientShareResponse.patientShare.toString())),
-                      TableCell(child: _getHeadingText("SR " + widget.patientShareResponse.patientShareWithTax.toString())),
+                      TableCell(child: _getHeadingText(widget.patientShareResponse.patientShare.toString())),
+                      TableCell(child: _getHeadingText(widget.patientShareResponse.patientShareWithTax.toString())),
                    ],
                  ),
                ],
@ -712,8 +714,8 @@ class _BookSuccessState extends State<BookSuccess> {
              currency: projectViewModel.user.outSA == 1 ? "AED" : "SAR",
              onFailed: (failureResult) async {
                GifLoaderDialogUtils.hideDialog(context);
-                log("failureResult: ${failureResult.toString()}");
-                AppToast.showErrorToast(message: failureResult.toString());
+                log("failureResult: ${failureResult.message.toString()}");
+                AppToast.showErrorToast(message: failureResult.message.toString());
              },
              onSuccess: (successResult) async {
                log("Payfort: ${successResult.responseMessage}");
@ -1094,15 +1096,23 @@ class _BookSuccessState extends State<BookSuccess> {
  _getHeadingText(text) {
    return Container(
      padding: EdgeInsets.only(bottom: 10.0, left: 20, right: 20),
-      child: Text(
-        text,
-        textAlign: TextAlign.start,
-        style: TextStyle(
-          fontSize: 16.0,
-          letterSpacing: -0.64,
-          color: Colors.white,
-          fontWeight: FontWeight.w600,
-        ),
+      child: Row(
+        children: [
+          projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16, color: Colors.white),
+          mWidth(6),
+          Text(
+            text,
+            textAlign: TextAlign.start,
+            style: TextStyle(
+              fontSize: 16.0,
+              letterSpacing: -0.64,
+              color: Colors.white,
+              fontWeight: FontWeight.w600,
+            ),
+          ),
+          mWidth(6),
+          projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16, color: Colors.white) : Container(),
+        ],
      ),
    );
  }
--- a/lib/pages/BookAppointment/DentalComplaints.dart
+++ b/lib/pages/BookAppointment/DentalComplaints.dart
@ -15,6 +15,7 @@ import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils.dart';
 import 'package:diplomaticquarterapp/uitl/utils_new.dart';
 import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_expandable_notifier.dart';
@ -26,8 +27,9 @@ class DentalComplaints extends StatefulWidget {
  SearchInfo searchInfo;
  Function? onSelectedMethod;
  bool isDoctorNameSearch;
+  bool isFromHospitalSearchPage;

-  DentalComplaints({required this.searchInfo, this.onSelectedMethod, this.isDoctorNameSearch = false});
+  DentalComplaints({required this.searchInfo, this.onSelectedMethod, this.isDoctorNameSearch = false, this.isFromHospitalSearchPage = false});

  @override
  _DentalComplaintsState createState() => _DentalComplaintsState();
@ -48,6 +50,8 @@ class _DentalComplaintsState extends State<DentalComplaints> {

  late ProjectViewModel projectViewModel;

+  bool isDoctorsList = false;
+
  @override
  void initState() {
    WidgetsBinding.instance.addPostFrameCallback((_) => checkIfHasDentalPlan());
@ -66,30 +70,73 @@ class _DentalComplaintsState extends State<DentalComplaints> {
      backgroundColor: CustomColors.appBackgroudGreyColor,
      body: Container(
        child: !hasDentalPlan
-            ? ListView.separated(
-                itemCount: complaintsList.length,
-                itemBuilder: (BuildContext context, int index) {
-                  return Container(
-                    child: DentalComplaintCard(
-                      listDentalChiefComplain: complaintsList[index],
-                      languageID: languageID,
-                      isDoctorNameSearch: widget.isDoctorNameSearch,
-                      onSelectedMethod: widget.onSelectedMethod,
-                    )..logAnalytics = () {
-                        final info = widget.searchInfo;
-                        locator<GAnalytics>()
-                            .appointment
-                            .book_appointment_chief_complaints(appointment_type: 'regular', hospital: info.hospital, clinic: info.clinic, treatment: complaintsList[index]);
-                      },
-                  );
-                },
-                separatorBuilder: (BuildContext context, int index) {
-                  return Padding(
-                    padding: const EdgeInsets.only(left: 14, right: 14),
-                    child: mDivider(CustomColors.devider),
-                  );
-                },
-              )
+            ? isDoctorsList
+                ? Container(
+                    child: SingleChildScrollView(
+                      child: Column(
+                        children: [
+                          ...List.generate(
+                            patientDoctorAppointmentListHospital.length,
+                            (index) => Padding(
+                              padding: const EdgeInsets.all(14.0),
+                              child: AppExpandableNotifier(
+                                  isExpand: true,
+                                  title: patientDoctorAppointmentListHospital[index].filterName! +
+                                      " - " +
+                                      patientDoctorAppointmentListHospital[index].distanceInKMs! +
+                                      " " +
+                                      TranslationBase.of(context).km,
+                                  bodyWidget: Column(
+                                    crossAxisAlignment: CrossAxisAlignment.start,
+                                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                    children: patientDoctorAppointmentListHospital[index].patientDoctorAppointmentList!.map((doctor) {
+                                      return DoctorView(
+                                        doctor: doctor,
+                                        isLiveCareAppointment: false,
+                                        isContinueDentalPlan: hasDentalPlan,
+                                      );
+                                    }).toList(),
+                                  )),
+                            ),
+                          )
+                        ],
+                      ),
+                    ),
+                  )
+                : ListView.separated(
+                    itemCount: complaintsList.length,
+                    itemBuilder: (BuildContext context, int index) {
+                      return Container(
+                        child: DentalComplaintCard(
+                          listDentalChiefComplain: complaintsList[index],
+                          languageID: languageID,
+                          isDoctorNameSearch: widget.isDoctorNameSearch,
+                          onSelectedMethod: widget.onSelectedMethod,
+                          isFromHospitalSearchPage: widget.isFromHospitalSearchPage,
+                          onDoctorFetched: widget.isFromHospitalSearchPage
+                              ? (doctorsList) {
+                                  if (doctorsList.registeredDoctorMap?.isNotEmpty == true) {
+                                    Navigator.pop(context, doctorsList);
+                                  } else {
+                                    Utils.showErrorToast(TranslationBase.of(context).noDataAvailable);
+                                  }
+                                }
+                              : null,
+                        )..logAnalytics = () {
+                            final info = widget.searchInfo;
+                            locator<GAnalytics>()
+                                .appointment
+                                .book_appointment_chief_complaints(appointment_type: 'regular', hospital: info.hospital, clinic: info.clinic, treatment: complaintsList[index]);
+                          },
+                      );
+                    },
+                    separatorBuilder: (BuildContext context, int index) {
+                      return Padding(
+                        padding: const EdgeInsets.only(left: 14, right: 14),
+                        child: mDivider(CustomColors.devider),
+                      );
+                    },
+                  )
            : Container(
                child: SingleChildScrollView(
                  child: Column(
@ -273,9 +320,36 @@ class _DentalComplaintsState extends State<DentalComplaints> {
      GifLoaderDialogUtils.hideDialog(context);
      if (res['MessageStatus'] == 1) {
        setState(() {
-          res['List_DentalChiefComplain'].forEach((v) {
-            complaintsList.add(new ListDentalChiefComplain.fromJson(v));
-          });
+          if (res['DoctorList'].length != 0) {
+            isDoctorsList = true;
+            doctorsList.clear();
+            res['DoctorList'].forEach((v) {
+              doctorsList.add(new DoctorList.fromJson(v));
+            });
+            doctorsList.forEach((element) {
+              List<PatientDoctorAppointmentList> doctorByHospital = patientDoctorAppointmentListHospital
+                  .where(
+                    (elementClinic) => elementClinic.filterName == element.projectName,
+                  )
+                  .toList();
+
+              if (doctorByHospital.length != 0) {
+                patientDoctorAppointmentListHospital[patientDoctorAppointmentListHospital.indexOf(doctorByHospital[0])].patientDoctorAppointmentList!.add(element);
+              } else {
+                patientDoctorAppointmentListHospital.add(PatientDoctorAppointmentList(
+                    filterName: element.projectName,
+                    distanceInKMs: element.projectDistanceInKiloMeters.toString(),
+                    projectTopName: element.projectTopName,
+                    projectBottomName: element.projectBottomName,
+                    patientDoctorAppointment: element));
+              }
+            });
+          } else {
+            isDoctorsList = false;
+            res['List_DentalChiefComplain'].forEach((v) {
+              complaintsList.add(new ListDentalChiefComplain.fromJson(v));
+            });
+          }
        });
      } else {}
    }).catchError((err) {
--- a/lib/pages/BookAppointment/DoctorProfile.dart
+++ b/lib/pages/BookAppointment/DoctorProfile.dart
@ -539,7 +539,8 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
    } else {
      if (DocAvailableAppointments.areSlotsAvailable) {
        if (projectViewModel.isLogin) {
-          if (widget.isDoctorNameSearch && widget.doctor.clinicID == 17 && projectViewModel.user!.age! > 12) {
+          // if (widget.isDoctorNameSearch && widget.doctor.clinicID == 17 && projectViewModel.user!.age! > 12) {
+          if (widget.isDoctorNameSearch && widget.doctor.clinicID == 17) {
            navigateToDentalComplaints(context);
          } else if (widget.isDoctorNameSearch && widget.doctor.clinicID == 253) {
            navigateToLaserClinic(context);
--- a/lib/pages/BookAppointment/QRCode.dart
+++ b/lib/pages/BookAppointment/QRCode.dart
@ -389,7 +389,6 @@ class _QRCodeState extends State<QRCode> {

    service.sendCheckinNfcRequest(widget!.patientShareResponse!.appointmentNo!, nfcId, widget.patientShareResponse!.projectID!, checkInBy, widget.patientShareResponse!.clinicID!, context).then((res) {
      print(res);
-
      GifLoaderDialogUtils.hideDialog(context);
      _showMyDialog(res["SuccessMsg"], this.context);
    }).catchError((err) {
--- a/lib/pages/BookAppointment/Search.dart
+++ b/lib/pages/BookAppointment/Search.dart
@ -1,18 +1,14 @@
-import 'package:diplomaticquarterapp/analytics/flows/appointments.dart';
 import 'package:diplomaticquarterapp/analytics/google-analytics.dart';
 import 'package:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/pages/BookAppointment/components/SearchByClinic.dart';
 import 'package:diplomaticquarterapp/pages/BookAppointment/components/SearchByDoctor.dart';
 import 'package:diplomaticquarterapp/pages/BookAppointment/components/search_by_hospital_name.dart';
-import 'package:diplomaticquarterapp/uitl/location_util.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

-import 'components/SearchByClinic.dart';
-
 class Search extends StatefulWidget {
  final int type;
  final List? clnicIds;
--- a/lib/pages/BookAppointment/SearchResults.dart
+++ b/lib/pages/BookAppointment/SearchResults.dart
@ -61,6 +61,9 @@ class SearchResults extends StatelessWidget {
                          TranslationBase.of(context).km
                      : patientDoctorAppointmentListHospital[index].projectBottomName.toString(),
                  isTitleSingleLine: false,
+                  isHMC: patientDoctorAppointmentListHospital[index].isHMC ??
+                      false,
+                  isForAppointmentSearch: true,
                  isDoctorSearchResult: isDoctorSearchResult,
                  isExpand: patientDoctorAppointmentListHospital.length == 1 ? true : false,
                  bodyWidget: ListView.separated(
--- a/lib/pages/BookAppointment/SearchResultsByRegion.dart
+++ b/lib/pages/BookAppointment/SearchResultsByRegion.dart
@ -0,0 +1,380 @@
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
+import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
+import 'package:diplomaticquarterapp/models/Appointments/OBGyneProcedureListResponse.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/DoctorView.dart';
+import 'package:diplomaticquarterapp/theme/colors.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
+import 'package:diplomaticquarterapp/widgets/others/app_expandable_notifier.dart';
+import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:provider/provider.dart';
+
+class SearchResultsByRegion extends StatelessWidget {
+  List<DoctorList> doctorsList = [];
+  RegionList patientDoctorAppointmentListHospital;
+  bool isLiveCareAppointment;
+  bool isObGyneAppointment;
+  bool isDoctorNameSearch;
+  OBGyneProcedureListResponse? obGyneProcedureListResponse;
+  bool isDoctorSearchResult;
+
+  SearchResultsByRegion(
+      {required this.doctorsList,
+      required this.patientDoctorAppointmentListHospital,
+      this.isObGyneAppointment = false,
+      this.isDoctorNameSearch = false,
+      required this.isLiveCareAppointment,
+      required this.isDoctorSearchResult,
+      this.obGyneProcedureListResponse});
+
+  @override
+  Widget build(BuildContext context) {
+    return AppScaffold(
+      appBarTitle: TranslationBase.of(context).bookAppo,
+      isShowDecPage: false,
+      isShowAppBar: true,
+      showNewAppBarTitle: true,
+      showNewAppBar: true,
+      backgroundColor: CustomColors.appBackgroudGrey2Color,
+      body: patientDoctorAppointmentListHospital
+                  .registeredDoctorMap?.isNotEmpty ==
+              true
+          ? ListView.separated(
+              addAutomaticKeepAlives: true,
+              physics: BouncingScrollPhysics(),
+              separatorBuilder: (context, index) {
+                return Material(
+                  color: Color(0xFFf5f5f5),
+                  child: SizedBox(
+                    height: 12,
+                  ),
+                );
+              },
+              itemBuilder: (context, index) {
+                String key = patientDoctorAppointmentListHospital
+                        .registeredDoctorMap?.keys
+                        .toList()[index] ??
+                    '';
+
+                return AppExpandableNotifier(
+                    paddingValue: 10,
+                    applyBackgroundToOnlyHeader: true,
+                    completeHeaderColor: CustomColors.appBackgroudGrey2Color,
+                    headerWidget: RegionTitle(
+                      title: key,
+                      hmcCount:
+                          "${patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmcSize ?? 0}",
+                      hmgCount:
+                          "${patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmgSize ?? 0}",
+                    ),
+                    showDropDownIconWithCustomHeader: true,
+                    isTitleSingleLine: false,
+                    isDoctorSearchResult: isDoctorSearchResult,
+                    widgetColor: Color(0xFFF8F8F8),
+                    bodyWidget: Column(
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: AppExpandableNotifier(
+                            paddingValue: 8,
+                            applyBackgroundColor: false,
+                            applyBackgroundToOnlyHeader: true,
+                            completeHeaderColor: Colors.white,
+                            headerRadius: BorderRadius.circular(16),
+                            headerWidget: HospitalTitle(
+                              iconUrl: 'assets/images/svg/HMG.svg',
+                              title: TranslationBase.of(context).hmgHospital,
+                              isHMC: false,
+                              itemCount:
+                                  "${patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmgSize ?? 0}",
+                            ),
+                            showDropDownIconWithCustomHeader: true,
+                            bodyWidget: HospitalBodyWidget(
+                              patientDoctorAppointmentListHospital:
+                                  patientDoctorAppointmentListHospital
+                                      .registeredDoctorMap?[key]?.hmgDoctorList,
+                              isLiveCareAppointment: isLiveCareAppointment,
+                              isObGyneAppointment: isObGyneAppointment,
+                              isDoctorNameSearch: isDoctorNameSearch,
+                              isDoctorSearchResult: isDoctorSearchResult,
+                            ),
+                          ),
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.only(
+                              bottom: 8.0, left: 8, right: 8),
+                          child: AppExpandableNotifier(
+                            paddingValue: 8,
+                            applyBackgroundColor: false,
+                            applyBackgroundToOnlyHeader: true,
+                            completeHeaderColor: Colors.white,
+                            headerRadius: BorderRadius.circular(16),
+                            headerWidget: HospitalTitle(
+                              iconUrl: 'assets/images/svg/HMC.svg',
+                              title: TranslationBase.of(context).hmcHospital,
+                              isHMC: true,
+                              itemCount:
+                                  "${patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmcSize ?? 0}",
+                            ),
+                            showDropDownIconWithCustomHeader: true,
+                            bodyWidget: HospitalBodyWidget(
+                              patientDoctorAppointmentListHospital:
+                                  patientDoctorAppointmentListHospital
+                                      .registeredDoctorMap?[key]?.hmcDoctorList,
+                              isLiveCareAppointment: isLiveCareAppointment,
+                              isObGyneAppointment: isObGyneAppointment,
+                              isDoctorNameSearch: isDoctorNameSearch,
+                              isDoctorSearchResult: isDoctorSearchResult,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ));
+                // return AppExpandableNotifier(
+                //   title: (patientDoctorAppointmentListHospital[index].distanceInKMs != "0")
+                //       ? patientDoctorAppointmentListHospital[index].filterName! + " - " + patientDoctorAppointmentListHospital[index].distanceInKMs! + " " + TranslationBase.of(context).km
+                //       : patientDoctorAppointmentListHospital[index].filterName,
+                //   projectTitleTop: patientDoctorAppointmentListHospital[index].projectTopName,
+                //   projectTitleBottom: (patientDoctorAppointmentListHospital[index].distanceInKMs != "0")
+                //       ? patientDoctorAppointmentListHospital[index].projectBottomName.toString() +
+                //           " - " +
+                //           patientDoctorAppointmentListHospital[index].distanceInKMs! +
+                //           " " +
+                //           TranslationBase.of(context).km
+                //       : patientDoctorAppointmentListHospital[index].projectBottomName.toString(),
+                //   isTitleSingleLine: false,
+                //   isDoctorSearchResult: isDoctorSearchResult,
+                //   isExpand: patientDoctorAppointmentListHospital.length == 1 ? true : false,
+                //   bodyWidget: ListView.separated(
+                //       shrinkWrap: true,
+                //       physics: NeverScrollableScrollPhysics(),
+                //       padding: EdgeInsets.only(bottom: 10, top: 10, left: 21, right: 21),
+                //       itemBuilder: (context, _index) {
+                //         final doctor = patientDoctorAppointmentListHospital[index].patientDoctorAppointmentList![_index];
+                //         return DoctorView(
+                //             doctor: doctor,
+                //             isLiveCareAppointment: isLiveCareAppointment,
+                //             isObGyneAppointment: isObGyneAppointment,
+                //             isDoctorNameSearch: isDoctorNameSearch,
+                //             obGyneProcedureListResponse: obGyneProcedureListResponse,
+                //             isShowDate: false,
+                //             onTap: () {
+                //               context.read<ProjectViewModel>().analytics.appointment.book_appointment_select_doctor(appointment_type: 'regular', doctor: doctor);
+                //             });
+                //       },
+                //       separatorBuilder: (context, index) => SizedBox(height: 14),
+                //       itemCount: patientDoctorAppointmentListHospital[index].patientDoctorAppointmentList!.length),
+                // );
+              },
+              itemCount: patientDoctorAppointmentListHospital
+                      .registeredDoctorMap?.length ??
+                  0,
+            )
+          : getNoDataWidget(context),
+    );
+  }
+}
+
+class HospitalBodyWidget extends StatelessWidget {
+  final List<PatientDoctorAppointmentList>?
+      patientDoctorAppointmentListHospital;
+  final bool isLiveCareAppointment;
+  final bool isObGyneAppointment;
+  final bool isDoctorNameSearch;
+  final bool isDoctorSearchResult;
+  final OBGyneProcedureListResponse? obGyneProcedureListResponse;
+
+  const HospitalBodyWidget({
+    super.key,
+    this.patientDoctorAppointmentListHospital,
+    required this.isLiveCareAppointment,
+    required this.isObGyneAppointment,
+    required this.isDoctorNameSearch,
+    required this.isDoctorSearchResult,
+    this.obGyneProcedureListResponse,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.separated(
+      addAutomaticKeepAlives: true,
+      shrinkWrap: true,
+      physics: NeverScrollableScrollPhysics(),
+      itemCount: patientDoctorAppointmentListHospital?.length ?? 0,
+      separatorBuilder: (context, index) {
+        return Container(
+          height: 12,
+          margin: EdgeInsets.only(left: 21, right: 21),
+        );
+      },
+      itemBuilder: (context, index) {
+        return AppExpandableNotifier(
+          applyBackgroundColor: false,
+          widgetColor: CustomColors.appBackgroudGrey2Color,
+          title: (patientDoctorAppointmentListHospital?[index].distanceInKMs !=
+                  "0")
+              ? patientDoctorAppointmentListHospital![index].filterName! +
+                  " - " +
+                  patientDoctorAppointmentListHospital![index].distanceInKMs! +
+                  " " +
+                  TranslationBase.of(context).km
+              : patientDoctorAppointmentListHospital![index].filterName,
+          projectTitleTop:
+              patientDoctorAppointmentListHospital![index].projectTopName,
+          projectTitleBottom: (patientDoctorAppointmentListHospital![index]
+                      .distanceInKMs !=
+                  "0")
+              ? patientDoctorAppointmentListHospital![index]
+                      .projectBottomName
+                      .toString() +
+                  " - " +
+                  patientDoctorAppointmentListHospital![index].distanceInKMs! +
+                  " " +
+                  TranslationBase.of(context).km
+              : patientDoctorAppointmentListHospital![index]
+                  .projectBottomName
+                  .toString(),
+          isTitleSingleLine: false,
+          isDoctorSearchResult: isDoctorSearchResult,
+          isExpand:
+              patientDoctorAppointmentListHospital?.length == 1 ? true : false,
+          bodyWidget: ListView.separated(
+              shrinkWrap: true,
+              physics: NeverScrollableScrollPhysics(),
+              padding:
+                  EdgeInsets.only(bottom: 10, top: 10, left: 21, right: 21),
+              itemBuilder: (context, _index) {
+                // print("the index of patientDoctorAppointmentList is ${_index}");
+                // print("the index of parent is  ${index}");
+                final doctor = patientDoctorAppointmentListHospital![index]
+                    .patientDoctorAppointmentList![_index];
+                // print('the doctor is ${doctor.toJson()}');
+                return DoctorView(
+                    doctor: doctor,
+                    isLiveCareAppointment: isLiveCareAppointment,
+                    isObGyneAppointment: isObGyneAppointment,
+                    isDoctorNameSearch: isDoctorNameSearch,
+                    obGyneProcedureListResponse: obGyneProcedureListResponse,
+                    isShowDate: false,
+                    onTap: () {
+                      context
+                          .read<ProjectViewModel>()
+                          .analytics
+                          .appointment
+                          .book_appointment_select_doctor(
+                              appointment_type: 'regular', doctor: doctor);
+                    });
+              },
+              separatorBuilder: (context, index) => SizedBox(height: 14),
+              itemCount: patientDoctorAppointmentListHospital?[index].patientDoctorAppointmentList?.length ?? 0),
+        );
+      },
+    );
+  }
+}
+
+class RegionTitle extends StatelessWidget {
+  final String title;
+  final String hmcCount;
+  final String hmgCount;
+
+  const RegionTitle(
+      {super.key,
+      required this.title,
+      required this.hmcCount,
+      required this.hmgCount});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            title,
+            style: TextStyle(
+                fontSize: 22, color: Colors.black, fontWeight: FontWeight.w700),
+          ),
+          SizedBox(
+            height: 8,
+          ),
+          Row(
+            children: [
+              Text(
+                "${TranslationBase.of(context).HospitalString(num.parse(hmgCount)).replaceAll("@", hmgCount)} ,",
+                style: TextStyle(
+                    fontSize: 14,
+                    color: Color(0xFFD02127),
+                    fontWeight: FontWeight.w600),
+              ),
+              SizedBox(
+                width: 8,
+              ),
+              Text(
+                "${TranslationBase.of(context).MedicalCenterString(num.parse(hmcCount)).replaceAll("@", hmcCount)}",
+                style: TextStyle(
+                    fontSize: 14,
+                    color: Color(0xFF40ACC9),
+                    fontWeight: FontWeight.w600),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class HospitalTitle extends StatelessWidget {
+  final String title;
+  final String iconUrl;
+  final bool isHMC;
+  final String itemCount;
+
+  const HospitalTitle(
+      {super.key,
+      required this.title,
+      required this.iconUrl,
+      required this.isHMC,
+      required this.itemCount});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              SvgPicture.asset(iconUrl),
+              SizedBox(
+                width: 8,
+              ),
+              Text(
+                title,
+                style: TextStyle(
+                    fontSize: 18,
+                    color: isHMC ? Color(0xFF40ACC9) : Color(0xFFD02127),
+                    fontWeight: FontWeight.w600),
+              ),
+            ],
+          ),
+          SizedBox(
+            height: 6,
+          ),
+          Text(
+            isHMC
+                ? "${TranslationBase.of(context).MedicalCenterString(num.parse(itemCount)).replaceAll("@", itemCount)}"
+                : "${TranslationBase.of(context).HospitalString(num.parse(itemCount)).replaceAll("@", itemCount)}",
+            style: TextStyle(
+                fontSize: 12, color: Colors.black, fontWeight: FontWeight.w600),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
+++ b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils.dart';
 import 'package:diplomaticquarterapp/uitl/utils_new.dart';
 import 'package:diplomaticquarterapp/widgets/buttons/custom_text_button.dart';
 import 'package:flutter/cupertino.dart';
@ -45,16 +46,18 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
  AppSharedPreferences sharedPref = new AppSharedPreferences();

  var selectedDate = "";
+  var selectedNextDate = "";
  dynamic selectedDateJSON;
  dynamic jsonFreeSlots;
-
+  final DateFormat dateFormatter = DateFormat('yyyy-MM-dd');
  List<TimeSlot> docFreeSlots = [];
  List<TimeSlot> dayEvents = [];
-
+  List<TimeSlot> nextDayEvents = [];
  int selectedButtonIndex = 0;
-
+  int selectedNextDayButtonIndex = -1;
  dynamic freeSlotsResponse;

+  // String nextDayAppointmentDate ="";
  late ScrollController _scrollController;

  var language;
@ -115,9 +118,11 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
    final DateFormat formatter = DateFormat('yyyy-MM-dd');
    setState(() {
      this.selectedDate = DateUtil.getWeekDayMonthDayYearDateFormatted(day, language);
+      this.selectedNextDate = DateUtil.getWeekDayMonthDayYearDateFormatted(day.add(Duration(days: 1)), language);
+      _calendarController.selectedDate = day;
      openTimeSlotsPickerForDate(day, docFreeSlots);
      DocAvailableAppointments.selectedDate = formatter.format(day);
-      _calendarController.selectedDate = day;
+      selectedNextDayButtonIndex = -1;
      print(_calendarController.selectedDate);
    });
  }
@ -139,19 +144,51 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
              child: Text(selectedDate, style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.w600, letterSpacing: -0.64)),
            ),
            DocAvailableAppointments.areSlotsAvailable
-                ? Container(
-                    height: 40,
-                    child: ListView.builder(
-                      controller: _scrollController,
-                      scrollDirection: Axis.horizontal,
-                      itemCount: dayEvents.length,
-                      itemBuilder: (context, index) {
-                        return Container(
-                          margin: EdgeInsets.only(right: (index == dayEvents.length - 1) ? 16 : 5.0, left: index == 0 ? 16 : 5),
-                          child: index == selectedButtonIndex ? getSelectedButton(index) : getNormalButton(index),
-                        );
-                      },
-                    ),
+                ? Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Container(
+                        height: 40,
+                        child: ListView.builder(
+                          controller: _scrollController,
+                          scrollDirection: Axis.horizontal,
+                          itemCount: dayEvents.length,
+                          itemBuilder: (context, index) {
+                            return Container(
+                              margin: EdgeInsets.only(right: (index == dayEvents.length - 1) ? 16 : 5.0, left: index == 0 ? 16 : 5),
+                              child: index == selectedButtonIndex ? getSelectedButton(index) : getNormalButton(index),
+                            );
+                          },
+                        ),
+                      ),
+                      SizedBox(
+                        height: 20,
+                      ),
+                      nextDayEvents.isNotEmpty && projectViewModel.havePrivilege(110)
+                          ? Container(
+                              padding: EdgeInsets.only(left: 20, right: 20, bottom: 20),
+                              child: Text(
+                                selectedNextDate,
+                                style: TextStyle(fontSize: 14.0, fontWeight: FontWeight.w600, letterSpacing: -0.46, color: CustomColors.black),
+                              ),
+                            )
+                          : SizedBox(),
+                      Container(
+                        height: 40,
+                        padding: EdgeInsets.only(left: 0, right: 0),
+                        child: ListView.builder(
+                          controller: _scrollController,
+                          scrollDirection: Axis.horizontal,
+                          itemCount: nextDayEvents.length,
+                          itemBuilder: (context, index) {
+                            return Container(
+                              margin: EdgeInsets.only(right: (index == nextDayEvents.length - 1) ? 16 : 5.0, left: index == 0 ? 16 : 5),
+                              child: index == selectedNextDayButtonIndex ? getSelectedNextDayButton(index) : getNormalNextDayButton(index),
+                            );
+                          },
+                        ),
+                      )
+                    ],
                  )
                : Center(
                    child: Padding(
@ -225,7 +262,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
          Map<String, dynamic> timeSlot = {"isoTime": dayEvents[i].isoTime, "start": dayEvents[i].start.toString(), "end": dayEvents[i].end.toString(), "vidaDate": dayEvents[i].vidaDate};
          timeList.add(timeSlot);
        }
-
+        filterNextDayAppo(freeSlots, timeList.last);
        AppSharedPreferences sharedPref = new AppSharedPreferences();
        sharedPref.setString('selectedLogSlots', json.encode(timeList));
        DocAvailableAppointments.selectedTime = dayEvents[selectedButtonIndex].isoTime;
@ -234,12 +271,27 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
    });
  }

+  filterNextDayAppo(List<TimeSlot> freeSlots, Map<String, dynamic> listList) {
+    DateTime dateStart = DateTime.parse(listList['end']).add(Duration(days: 1));
+
+    DateTime dateStartObj = new DateTime(dateStart.year, dateStart.month, dateStart.day, 0, 0, 0, 0, 0);
+    nextDayEvents = [];
+    DateTime beforeHour = new DateTime(dateStart.year, dateStart.month, dateStart.day, 6, 0, 0, 0, 0);
+    if (projectViewModel.havePrivilege(110)) {
+      freeSlots.forEach((v) {
+        if (v.start == dateStartObj && v.end!.isBefore(beforeHour)) nextDayEvents.add(v);
+      });
+    } else {
+      nextDayEvents = [];
+    }
+    // print(nextDayEvents);
+  }
+
  Future<Map<DateTime, List>> _getJSONSlots() async {
    Map<DateTime, List> _eventsParsed;
    List<FreeSlot> slotsList = [];
    DateTime date;
    final DateFormat formatter = DateFormat('HH:mm');
-    final DateFormat dateFormatter = DateFormat('yyyy-MM-dd');
    for (var i = 0; i < freeSlotsResponse.length; i++) {
      date = (isLiveCareSchedule != null && isLiveCareSchedule)
          ? DateUtil.convertStringToDate(freeSlotsResponse[i])
@ -259,6 +311,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
                ),
              ),
      );
+
      DocAvailableAppointments.selectedAppoDateTime = (isLiveCareSchedule != null && isLiveCareSchedule)
          ? DateUtil.convertStringToDate(freeSlotsResponse[0])
          : DateUtil.convertStringToDateSaudiTimezone(
@ -277,6 +330,16 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
                  ),
                ),
          language);
+      selectedNextDate = DateUtil.getWeekDayMonthDayYearDateFormatted(
+          (isLiveCareSchedule != null && isLiveCareSchedule)
+              ? DateUtil.convertStringToDate(freeSlotsResponse[0]).add(Duration(days: 1))
+              : DateUtil.convertStringToDateSaudiTimezone(
+                  freeSlotsResponse[0],
+                  int.parse(
+                    widget.doctor.projectID.toString(),
+                  ),
+                ).add(Duration(days: 1)),
+          language);
      selectedDateJSON = freeSlotsResponse[0];
    });
    openTimeSlotsPickerForDate(
@ -320,8 +383,10 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit

        setState(() {
          selectedButtonIndex = index;
+          selectedNextDayButtonIndex = -1;
          DocAvailableAppointments.selectedTime = dayEvents[index].isoTime;
          print(DocAvailableAppointments.selectedTime);
+          DocAvailableAppointments.selectedDate = dateFormatter.format(_calendarController.selectedDate!);
        });
        projectViewModel.analytics.appointment.book_appointment_time_selection(appointment_type: 'regular', dateTime: timeslot.end, doctor: widget.doctor);
      },
@ -342,6 +407,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
        setState(() {
          selectedButtonIndex = index;
          DocAvailableAppointments.selectedTime = dayEvents[index].isoTime;
+          DocAvailableAppointments.selectedDate = dateFormatter.format(_calendarController.selectedDate!);
          print(DocAvailableAppointments.selectedTime);
        });
      },
@ -349,6 +415,54 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
    );
  }

+  Widget getNormalNextDayButton(int index) {
+    return CustomTextButton(
+      backgroundColor: Colors.white,
+      elevation: 0,
+      side: BorderSide(
+          color: Colors.black, //Color of the border
+          style: BorderStyle.solid, //Style of the border
+          width: 1.5 //width of the border
+          ),
+      onPressed: () {
+        final timeslot = nextDayEvents[index];
+        DocAvailableAppointments.selectedAppoDateTime = timeslot.end;
+
+        setState(() {
+          selectedButtonIndex = -1;
+          selectedNextDayButtonIndex = index;
+          DocAvailableAppointments.selectedTime = nextDayEvents[index].isoTime;
+          DocAvailableAppointments.selectedDate = dateFormatter.format(_calendarController.selectedDate!.add(Duration(days: 1)));
+          print(DocAvailableAppointments.selectedTime);
+        });
+        projectViewModel.analytics.appointment.book_appointment_time_selection(appointment_type: 'regular', dateTime: timeslot.end, doctor: widget.doctor);
+      },
+      child: Text(nextDayEvents[index].isoTime!, style: TextStyle(fontSize: 12.0, color: Color(0xFF60686b))),
+    );
+  }
+
+  Widget getSelectedNextDayButton(int index) {
+    return CustomTextButton(
+      backgroundColor: nextDayEvents[index].isoTime == TranslationBase.of(context).waitingAppointment ? CustomColors.darkOrange : CustomColors.green,
+      elevation: 0,
+      side: BorderSide(
+          color: nextDayEvents[index].isoTime == TranslationBase.of(context).waitingAppointment ? CustomColors.darkOrange : CustomColors.green, //Color of the border
+          style: BorderStyle.solid, //Style of the border
+          width: 1.5 //width of the border
+          ),
+      onPressed: () {
+        setState(() {
+          selectedButtonIndex = -1;
+          selectedNextDayButtonIndex = index;
+          DocAvailableAppointments.selectedTime = nextDayEvents[index].isoTime;
+          DocAvailableAppointments.selectedDate = dateFormatter.format(_calendarController.selectedDate!.add(Duration(days: 1)));
+          print(DocAvailableAppointments.selectedTime);
+        });
+      },
+      child: Text(nextDayEvents[index].isoTime!, style: TextStyle(fontSize: 12.0, color: Colors.white)),
+    );
+  }
+
  getDoctorFreeSlots(context, DoctorList docObject) {
    print(DocAvailableAppointments.initialSlotDuration);
    GifLoaderDialogUtils.showMyDialog(context);
--- a/lib/pages/BookAppointment/components/LiveCareBookAppointment.dart
+++ b/lib/pages/BookAppointment/components/LiveCareBookAppointment.dart
@ -63,142 +63,141 @@ class _LiveCareBookAppointmentState extends State<LiveCareBookAppointment> {
                  child: Row(
                    crossAxisAlignment: CrossAxisAlignment.start,
                    children: [
-                      Container(
-                        child: SvgPicture.asset(
+                      SvgPicture.asset(
                            "assets/images/new-design/liveCare_mobile_care.svg",
-                            width: 150.0),
-                      ),
-                      Container(
-                        margin: EdgeInsets.only(left: 10.0, right: 8.0),
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Container(
-                              margin: EdgeInsets.only(bottom: 7.0),
-                              child: Text(
-                                  TranslationBase.of(context).whyLivecare,
-                                  style: TextStyle(
-                                      fontSize: 20.0,
-                                      fontWeight: FontWeight.w600,
-                                      letterSpacing: 1.0,
-                                      color: Colors.black)),
-                            ),
-                            Row(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Container(
-                                  child: SvgPicture.asset(
-                                      "assets/images/new-design/ionic-ios-checkmark-circle.svg"),
-                                ),
-                                Container(
-                                  width:
-                                      MediaQuery.of(context).size.width * 0.4,
-                                  margin: EdgeInsets.only(
-                                      left: 5.0, right: 5.0, bottom: 10.0),
-                                  child: Text(
-                                      TranslationBase.of(context)
-                                          .livecarePoint1,
-                                      overflow: TextOverflow.clip,
-                                      style: TextStyle(
-                                          fontSize: 12.0,
-                                          letterSpacing: 0.5,
-                                          color: Colors.black)),
-                                ),
-                              ],
-                            ),
-                            Row(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Container(
-                                  child: SvgPicture.asset(
-                                      "assets/images/new-design/ionic-ios-checkmark-circle.svg"),
-                                ),
-                                Container(
-                                  width:
-                                      MediaQuery.of(context).size.width * 0.4,
-                                  margin: EdgeInsets.only(
-                                      left: 5.0, right: 5.0, bottom: 10.0),
-                                  child: Text(
-                                      TranslationBase.of(context)
-                                          .livecarePoint5,
-                                      overflow: TextOverflow.clip,
-                                      style: TextStyle(
-                                          fontSize: 12.0,
-                                          letterSpacing: 0.5,
-                                          color: Colors.black)),
-                                ),
-                              ],
-                            ),
-                            Row(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Container(
-                                  child: SvgPicture.asset(
-                                      "assets/images/new-design/ionic-ios-checkmark-circle.svg"),
-                                ),
-                                Container(
-                                  width:
-                                      MediaQuery.of(context).size.width * 0.4,
-                                  margin: EdgeInsets.only(
-                                      left: 5.0, right: 5.0, bottom: 10.0),
-                                  child: Text(
-                                      TranslationBase.of(context)
-                                          .livecarePoint2,
-                                      overflow: TextOverflow.clip,
-                                      style: TextStyle(
-                                          fontSize: 12.0,
-                                          letterSpacing: 0.5,
-                                          color: Colors.black)),
-                                ),
-                              ],
-                            ),
-                            Row(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Container(
-                                  child: SvgPicture.asset(
-                                      "assets/images/new-design/ionic-ios-checkmark-circle.svg"),
-                                ),
-                                Container(
-                                  width:
-                                      MediaQuery.of(context).size.width * 0.4,
-                                  margin: EdgeInsets.only(
-                                      left: 5.0, right: 5.0, bottom: 10.0),
-                                  child: Text(
-                                      TranslationBase.of(context)
-                                          .livecarePoint3,
-                                      overflow: TextOverflow.clip,
-                                      style: TextStyle(
-                                          fontSize: 12.0,
-                                          letterSpacing: 0.5,
-                                          color: Colors.black)),
-                                ),
-                              ],
                            ),
-                            Row(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Container(
-                                  child: SvgPicture.asset(
-                                      "assets/images/new-design/ionic-ios-checkmark-circle.svg"),
-                                ),
-                                Container(
-                                  width:
-                                      MediaQuery.of(context).size.width * 0.4,
-                                  margin:
-                                      EdgeInsets.only(left: 5.0, right: 5.0),
-                                  child: Text(
-                                      TranslationBase.of(context)
-                                          .livecarePoint4,
-                                      overflow: TextOverflow.clip,
-                                      style: TextStyle(
-                                          fontSize: 12.0,
-                                          letterSpacing: 0.5,
-                                          color: Colors.black)),
-                                ),
-                              ],
-                            ),
-                          ],
+                      Flexible(
+                        child: Container(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Container(
+                                margin: EdgeInsets.only(bottom: 7.0),
+                                child: Text(
+                                    TranslationBase.of(context).whyLivecare,
+                                    style: TextStyle(
+                                        fontSize: 20.0,
+                                        fontWeight: FontWeight.w600,
+                                        letterSpacing: 1.0,
+                                        color: Colors.black)),
+                              ),
+                              Row(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Container(
+                                    child: SvgPicture.asset(
+                                        "assets/images/new-design/ionic-ios-checkmark-circle.svg"),
+                                  ),
+                                  Container(
+                                    width:
+                                        MediaQuery.of(context).size.width * 0.4,
+                                    margin: EdgeInsets.only(
+                                        left: 5.0, right: 5.0, bottom: 10.0),
+                                    child: Text(
+                                        TranslationBase.of(context)
+                                            .livecarePoint1,
+                                        overflow: TextOverflow.clip,
+                                        style: TextStyle(
+                                            fontSize: 12.0,
+                                            letterSpacing: 0.5,
+                                            color: Colors.black)),
+                                  ),
+                                ],
+                              ),
+                              Row(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Container(
+                                    child: SvgPicture.asset(
+                                        "assets/images/new-design/ionic-ios-checkmark-circle.svg"),
+                                  ),
+                                  Container(
+                                    width:
+                                        MediaQuery.of(context).size.width * 0.4,
+                                    margin: EdgeInsets.only(
+                                        left: 5.0, right: 5.0, bottom: 10.0),
+                                    child: Text(
+                                        TranslationBase.of(context)
+                                            .livecarePoint5,
+                                        overflow: TextOverflow.clip,
+                                        style: TextStyle(
+                                            fontSize: 12.0,
+                                            letterSpacing: 0.5,
+                                            color: Colors.black)),
+                                  ),
+                                ],
+                              ),
+                              Row(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Container(
+                                    child: SvgPicture.asset(
+                                        "assets/images/new-design/ionic-ios-checkmark-circle.svg"),
+                                  ),
+                                  Container(
+                                    width:
+                                        MediaQuery.of(context).size.width * 0.4,
+                                    margin: EdgeInsets.only(
+                                        left: 5.0, right: 5.0, bottom: 10.0),
+                                    child: Text(
+                                        TranslationBase.of(context)
+                                            .livecarePoint2,
+                                        overflow: TextOverflow.clip,
+                                        style: TextStyle(
+                                            fontSize: 12.0,
+                                            letterSpacing: 0.5,
+                                            color: Colors.black)),
+                                  ),
+                                ],
+                              ),
+                              Row(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Container(
+                                    child: SvgPicture.asset(
+                                        "assets/images/new-design/ionic-ios-checkmark-circle.svg"),
+                                  ),
+                                  Container(
+                                    width:
+                                        MediaQuery.of(context).size.width * 0.4,
+                                    margin: EdgeInsets.only(
+                                        left: 5.0, right: 5.0, bottom: 10.0),
+                                    child: Text(
+                                        TranslationBase.of(context)
+                                            .livecarePoint3,
+                                        overflow: TextOverflow.clip,
+                                        style: TextStyle(
+                                            fontSize: 12.0,
+                                            letterSpacing: 0.5,
+                                            color: Colors.black)),
+                                  ),
+                                ],
+                              ),
+                              Row(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Container(
+                                    child: SvgPicture.asset(
+                                        "assets/images/new-design/ionic-ios-checkmark-circle.svg"),
+                                  ),
+                                  Container(
+                                    width:
+                                        MediaQuery.of(context).size.width * 0.4,
+                                    margin:
+                                        EdgeInsets.only(left: 5.0, right: 5.0),
+                                    child: Text(
+                                        TranslationBase.of(context)
+                                            .livecarePoint4,
+                                        overflow: TextOverflow.clip,
+                                        style: TextStyle(
+                                            fontSize: 12.0,
+                                            letterSpacing: 0.5,
+                                            color: Colors.black)),
+                                  ),
+                                ],
+                              ),
+                            ],
+                          ),
                        ),
                      )
                    ],
--- a/lib/pages/BookAppointment/components/SearchByClinic.dart
+++ b/lib/pages/BookAppointment/components/SearchByClinic.dart
@ -1,5 +1,3 @@
-import "dart:collection";
-
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
@ -14,8 +12,10 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/DentalComplaints.dart
 import 'package:diplomaticquarterapp/pages/BookAppointment/LaserBooking.dart';
 import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart';
 import 'package:diplomaticquarterapp/pages/BookAppointment/dialog/clinic_list_dialog.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/search_result/SearchResultWithTab.dart';
 import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
 import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
+import 'package:diplomaticquarterapp/services/appointment_services/doctor_response_mapper.dart';
 import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
 import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart';
 import 'package:diplomaticquarterapp/theme/colors.dart';
@ -70,7 +70,7 @@ class _SearchByClinicState extends State<SearchByClinic> {

  @override
  void initState() {
-    locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context);
+    locationUtils = new LocationUtils(isShowConfirmDialog: true, isShowLocationTimeoutDialog: false, context: context);
    WidgetsBinding.instance.addPostFrameCallback((_) => getClinicsList());
    checkPVM();
    super.initState();
@ -522,6 +522,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
  }

  getClinicsList() async {
+    AppGlobal.context = context;
    if (await sharedPref.getObject(CLINICS_LIST) != null) {
      dynamic res = await sharedPref.getObject(CLINICS_LIST);
      setState(() {
@ -628,6 +629,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
  }

  callDoctorsSearchAPI(int clinicID) {
+    bool isArabic = context.read<ProjectViewModel>().isArabic;
    int languageID = context.read<ProjectViewModel>().isArabic ? 1 : 2;
    GifLoaderDialogUtils.showMyDialog(context);
    List<DoctorList> doctorsList = [];
@ -638,42 +640,57 @@ class _SearchByClinicState extends State<SearchByClinic> {
    List<PatientDoctorAppointmentList> _patientDoctorAppointmentListHospital = [];

    DoctorsListService service = new DoctorsListService();
-    service.getDoctorsList(clinicID, projectDropdownValue != "" ? int.parse(projectDropdownValue!) : 0, nearestAppo, languageID, context).then((res) {
+    service.getDoctorsList(clinicID, projectDropdownValue != "" ? int.parse(projectDropdownValue!) : 0, nearestAppo, languageID, context).then((res) async {
      GifLoaderDialogUtils.hideDialog(context);
+      RegionList regionHospitalList = RegionList();
+
      if (res['MessageStatus'] == 1) {
-        setState(() {
-          if (res['DoctorList'].length != 0) {
-            doctorsList.clear();
-            res['DoctorList'].forEach((v) {
-              doctorsList.add(new DoctorList.fromJson(v));
-            });
+        if (res['DoctorList'].length != 0) {
+          res['DoctorList'].forEach((v) {
+            doctorsList.add(new DoctorList.fromJson(
+              v,
+            ));
+          });
+          if (nearestAppo) {
            doctorsList.forEach((element) {
-              List<PatientDoctorAppointmentList> doctorByHospital = _patientDoctorAppointmentListHospital
-                  .where(
-                    (elementClinic) => elementClinic.filterName == element.getProjectCompleteName(),
-                  )
-                  .toList();
+              List<PatientDoctorAppointmentList> doctorByHospital =
+                  _patientDoctorAppointmentListHospital.where((elementClinic) => elementClinic.filterName == element.getProjectCompleteName()).toList();

              if (doctorByHospital.length != 0) {
                _patientDoctorAppointmentListHospital[_patientDoctorAppointmentListHospital.indexOf(doctorByHospital[0])].patientDoctorAppointmentList!.add(element);
              } else {
                _patientDoctorAppointmentListHospital.add(PatientDoctorAppointmentList(
-                    filterName: element.getProjectCompleteName(),
-                    distanceInKMs: element.projectDistanceInKiloMeters.toString(),
-                    projectTopName: element.projectTopName ?? "",
-                    projectBottomName: element.projectBottomName ?? "",
-                    patientDoctorAppointment: element));
+                  filterName: element.getProjectCompleteName(),
+                  distanceInKMs: element.projectDistanceInKiloMeters.toString(),
+                  projectTopName: element.projectTopName,
+                  projectBottomName: element.projectBottomName,
+                  patientDoctorAppointment: element,
+                  isHMC: element.isHMC,
+                ));
              }
            });
-          } else {}
-        });
+            navigateToSearchResultsForNearestAppointment(context, doctorsList, _patientDoctorAppointmentListHospital);
+            return;
+          }
+
+          regionHospitalList = await DoctorMapper.getMappedDoctor(doctorsList, isArabic: isArabic);
+          var lat = await sharedPref.getDouble(USER_LAT);
+
+          var lng = await sharedPref.getDouble(USER_LONG);
+          var isLocationEnabled = (lat != null && lat != 0.0) && (lng != null && lng != 0.0);
+          regionHospitalList = await DoctorMapper.sortList(isLocationEnabled, regionHospitalList);
+
+          setState(() {});
+        } else {
+          GifLoaderDialogUtils.hideDialog(context);
+          AppToast.showErrorToast(message: res['ErrorSearchMsg']);
+        }

-        result = LinkedHashSet<String>.from(arr).toList();
-        numAll = result.length;
-        nearestAppo = false;
-        isProjectLoaded = false;
-        navigateToSearchResults(context, doctorsList, _patientDoctorAppointmentListHospital);
+        GifLoaderDialogUtils.hideDialog(context);
+        // navigateToSearchResults(context, doctorsList, _patientDoctorAppointmentListHospital);
+        navigateToSearchResults(context, regionHospitalList);
      } else {
+        GifLoaderDialogUtils.hideDialog(context);
        AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
      }
    }).catchError((err) {
@ -696,6 +713,19 @@ class _SearchByClinicState extends State<SearchByClinic> {
    });
  }

+  navigateToSearchResultsForNearestAppointment(context, List<DoctorList> docList, List<PatientDoctorAppointmentList> patientDoctorAppointmentListHospital) {
+    Navigator.push(
+        context,
+        FadePage(
+            page: SearchResults(
+          isLiveCareAppointment: false,
+          isDoctorNameSearch: true,
+          doctorsList: docList,
+          patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital,
+          isDoctorSearchResult: true,
+        )));
+  }
+
  Future navigateToLaserClinic(BuildContext context) async {
    Navigator.push(
      context,
@ -709,16 +739,18 @@ class _SearchByClinicState extends State<SearchByClinic> {
    });
  }

-  Future navigateToSearchResults(context, List<DoctorList> docList, List<PatientDoctorAppointmentList> patientDoctorAppointmentListHospital) async {
-    isProjectLoaded = false;
-    Navigator.push(context, FadePage(page: SearchResults(isLiveCareAppointment: false, doctorsList: docList, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital, isDoctorSearchResult: true,)))
-        .then((value) {
-      setState(() {
-        dropdownValue = "null";
-        dropdownTitle = "";
-      });
-      getProjectsList();
-    });
+  navigateToSearchResults(context, RegionList regionHospitalList) {
+    // Navigator.push(context,
+    //     FadePage(page: SearchResults(isLiveCareAppointment: false, isDoctorNameSearch: true, doctorsList: docList, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital, isDoctorSearchResult: true,)));
+    Navigator.push(
+        context,
+        FadePage(
+            page: SearchResultWithTab(
+          doctorsList: [],
+          patientDoctorAppointmentListHospital: regionHospitalList,
+          isLiveCareAppointment: false,
+          isDoctorSearchResult: true,
+        )));
  }

  filterClinic() {
--- a/lib/pages/BookAppointment/components/SearchByDoctor.dart
+++ b/lib/pages/BookAppointment/components/SearchByDoctor.dart
@ -1,17 +1,17 @@
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart';
 import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
 import 'package:diplomaticquarterapp/theme/colors.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
+import 'package:diplomaticquarterapp/uitl/location_util.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/buttons/custom_text_button.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

-import '../SearchResults.dart';
-
 class SearchByDoctor extends StatefulWidget {
  @override
  _SearchByDoctorState createState() => _SearchByDoctorState();
@ -20,10 +20,14 @@ class SearchByDoctor extends StatefulWidget {
 class _SearchByDoctorState extends State<SearchByDoctor> {
  TextEditingController doctorNameController = new TextEditingController();
  late bool _isButtonDisabled;
+  late LocationUtils locationUtils;

  @override
  void initState() {
    super.initState();
+    locationUtils =
+        new LocationUtils(isShowConfirmDialog: true, context: context);
+    locationUtils.getCurrentLocation();
    _isButtonDisabled = true;
  }

@ -49,7 +53,8 @@ class _SearchByDoctorState extends State<SearchByDoctor> {
                    ),
                  ),
                ),
-                inputWidget(TranslationBase.of(context).enterDocName, '', doctorNameController),
+                inputWidget(TranslationBase.of(context).enterDocName, '',
+                    doctorNameController),
              ],
            ),
          ),
@ -78,10 +83,12 @@ class _SearchByDoctorState extends State<SearchByDoctor> {
          ),
          onPressed: () {
            if (_isButtonDisabled == false) {
+              FocusManager.instance.primaryFocus?.unfocus();
              _searchDoctor(context);
            }
          },
-          child: Text(TranslationBase.of(context).search, style: TextStyle(fontSize: 18.0, color: Colors.white)),
+          child: Text(TranslationBase.of(context).search,
+              style: TextStyle(fontSize: 18.0, color: Colors.white)),
        ),
      ),
    );
@ -93,9 +100,12 @@ class _SearchByDoctorState extends State<SearchByDoctor> {
    List<DoctorList> doctorsList = [];
    DoctorsListService service = new DoctorsListService();

-    List<PatientDoctorAppointmentList> _patientDoctorAppointmentListHospital = [];
+    List<PatientDoctorAppointmentList> _patientDoctorAppointmentListHospital =
+        [];

-    service.getDoctorsListByName(doctorNameController.text, languageID, context).then((res) {
+    service
+        .getDoctorsListByName(doctorNameController.text, languageID, context)
+        .then((res) {
      //   GifLoaderDialogUtils.hideDialog(context);
      if (res['MessageStatus'] == 1) {
        setState(() {
@ -106,17 +116,29 @@ class _SearchByDoctorState extends State<SearchByDoctor> {

            doctorsList.forEach((element) {
              List<PatientDoctorAppointmentList> doctorByHospital =
-                  _patientDoctorAppointmentListHospital.where((elementClinic) => elementClinic.filterName == element.getProjectCompleteName()).toList();
+                  _patientDoctorAppointmentListHospital
+                      .where((elementClinic) =>
+                          elementClinic.filterName ==
+                          element.getProjectCompleteName())
+                      .toList();

              if (doctorByHospital.length != 0) {
-                _patientDoctorAppointmentListHospital[_patientDoctorAppointmentListHospital.indexOf(doctorByHospital[0])].patientDoctorAppointmentList!.add(element);
+                _patientDoctorAppointmentListHospital[
+                        _patientDoctorAppointmentListHospital
+                            .indexOf(doctorByHospital[0])]
+                    .patientDoctorAppointmentList!
+                    .add(element);
              } else {
-                _patientDoctorAppointmentListHospital.add(PatientDoctorAppointmentList(
-                    filterName: element.getProjectCompleteName(),
-                    distanceInKMs: element.projectDistanceInKiloMeters.toString(),
-                    projectTopName: element.projectTopName,
-                    projectBottomName: element.projectBottomName,
-                    patientDoctorAppointment: element));
+                _patientDoctorAppointmentListHospital.add(
+                    PatientDoctorAppointmentList(
+                        filterName: element.getProjectCompleteName(),
+                        distanceInKMs:
+                            element.projectDistanceInKiloMeters.toString(),
+                        projectTopName: element.projectTopName,
+                        projectBottomName: element.projectBottomName,
+                  patientDoctorAppointment: element,
+                  isHMC: element.isHMC,
+                ));
              }
            });
          } else {
@ -125,7 +147,8 @@ class _SearchByDoctorState extends State<SearchByDoctor> {
          }
        });
        GifLoaderDialogUtils.hideDialog(context);
-        navigateToSearchResults(context, doctorsList, _patientDoctorAppointmentListHospital);
+        navigateToSearchResults(
+            context, doctorsList, _patientDoctorAppointmentListHospital);
      } else {
        GifLoaderDialogUtils.hideDialog(context);
        AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
@ -153,15 +176,31 @@ class _SearchByDoctorState extends State<SearchByDoctor> {

  _searchDoctor(BuildContext context) {
    getDoctorsList(context);
-    context.read<ProjectViewModel>().analytics.appointment.book_appointment_doctor_search(query: doctorNameController.text);
+    context
+        .read<ProjectViewModel>()
+        .analytics
+        .appointment
+        .book_appointment_doctor_search(query: doctorNameController.text);
  }

-  navigateToSearchResults(context, List<DoctorList> docList, List<PatientDoctorAppointmentList> patientDoctorAppointmentListHospital) {
-    Navigator.push(context,
-        FadePage(page: SearchResults(isLiveCareAppointment: false, isDoctorNameSearch: true, doctorsList: docList, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital, isDoctorSearchResult: true,)));
+  navigateToSearchResults(context, List<DoctorList> docList,
+      List<PatientDoctorAppointmentList> patientDoctorAppointmentListHospital) {
+    Navigator.push(
+        context,
+        FadePage(
+            page: SearchResults(
+          isLiveCareAppointment: false,
+          isDoctorNameSearch: true,
+          doctorsList: docList,
+          patientDoctorAppointmentListHospital:
+              patientDoctorAppointmentListHospital,
+          isDoctorSearchResult: true,
+        )));
  }

-  Widget inputWidget(String _labelText, String _hintText, TextEditingController _controller, {String? prefix, bool isEnable = true, bool hasSelection = false}) {
+  Widget inputWidget(
+      String _labelText, String _hintText, TextEditingController _controller,
+      {String? prefix, bool isEnable = true, bool hasSelection = false}) {
    return Container(
      padding: EdgeInsets.only(left: 16, right: 16, bottom: 15, top: 15),
      alignment: Alignment.center,
--- a/lib/pages/BookAppointment/components/search_by_hospital_name.dart
+++ b/lib/pages/BookAppointment/components/search_by_hospital_name.dart
@ -1,15 +1,13 @@
-import 'dart:collection';
-
-import 'package:auto_size_text/auto_size_text.dart';
 import 'package:diplomaticquarterapp/config/config.dart';
+import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/pages/BookAppointment/components/LaserClinic.dart';
-import 'package:diplomaticquarterapp/theme/colors.dart';
-import 'package:diplomaticquarterapp/uitl/utils_new.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/search_result/SearchResultWithTab.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/search_result/SearchResultWithTabForHospital.dart';
+import 'package:diplomaticquarterapp/services/appointment_services/doctor_response_mapper.dart';
+import 'package:diplomaticquarterapp/uitl/location_util.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

-import '../../../config/shared_pref_kay.dart';
-import '../../../config/size_config.dart';
 import '../../../core/model/hospitals/hospitals_model.dart';
 import '../../../core/viewModels/project_view_model.dart';
 import '../../../models/Appointments/DoctorListResponse.dart';
@ -24,9 +22,6 @@ import '../../../uitl/translations_delegate_base.dart';
 import '../../../widgets/transitions/fade_page.dart';
 import '../../livecare/livecare_home.dart';
 import '../DentalComplaints.dart';
-import '../LaserBooking.dart';
-import '../SearchResults.dart';
-import '../dialog/clinic_list_dialog.dart';
 import 'LiveCareBookAppointment.dart';

 class SearchByHospital extends StatefulWidget {
@ -37,6 +32,7 @@ class SearchByHospital extends StatefulWidget {
 class _SearchByHospitalState extends State<SearchByHospital> {
  HospitalsModel? selectedHospital;
  bool nearestAppo = false;
+  RegionList? hospitalList;

  String? selectedClinicName;
  List<HospitalsModel> projectsList = [];
@ -50,170 +46,204 @@ class _SearchByHospitalState extends State<SearchByHospital> {

  String? dropdownValue;
  String dropdownTitle = "";
+  late LocationUtils locationUtils;

  @override
  void initState() {
-    WidgetsBinding.instance.addPostFrameCallback((_) => getProjectsList());
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context);
+      locationUtils.getCurrentLocation();
+      getProjectsList();
+    });
+  }
+
+  @override
+  void deactivate() {
+    super.deactivate();
  }

+  @override
+  void reassemble() {
+    super.reassemble();
+  } // @override
+  // void didChangeDependencies() {
+  //   WidgetsBinding.instance.addPostFrameCallback((_) {
+  //     getProjectsList();
+  //   });
+  // }
+
+  // @override
+  // void didUpdateWidget(SearchByHospital oldWidget) {
+  //   WidgetsBinding.instance.addPostFrameCallback((_) {
+  //     getProjectsList();
+  //   });
+  // }
+
  @override
  Widget build(BuildContext context) {
    AppGlobal.context = context;
-
-    return Column(
-      children: [
-        Padding(
-          padding: const EdgeInsets.only(left: 6, right: 6, top: 16),
-          child: Row(
-            children: <Widget>[
-              Checkbox(
-                activeColor: CustomColors.accentColor,
-                value: nearestAppo,
-                onChanged: (bool? value) {
-                  nearestAppo = value ?? false;
-                  setState(() {});
-                },
-              ),
-              AutoSizeText(
-                TranslationBase.of(context).nearestAppo.trim(),
-                maxLines: 1,
-                minFontSize: 10,
-                style: TextStyle(
-                  fontSize: SizeConfig.textMultiplier! * 1.4,
-                  fontWeight: FontWeight.w600,
-                  letterSpacing: -0.39,
-                  height: 0.8,
-                ),
-              ),
-              // Text(TranslationBase.of(context).nearestAppo, style: TextStyle(fontSize: 14.0, letterSpacing: -0.56)),
-            ],
-          ),
-        ),
-        mHeight(8),
-        InkWell(
-          onTap: () {
-            openDropdown(projectDropdownKey);
-          },
-          child: Container(
-              width: double.infinity,
-              decoration: containerRadius(Colors.white, 12),
-              margin: EdgeInsets.only(left: 20, right: 20),
-              padding: EdgeInsets.only(left: 10, right: 10, top: 12, bottom: 12),
-              child: Row(
-                children: [
-                  Flexible(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          TranslationBase.of(context).selectHospital,
-                          style: TextStyle(
-                            fontSize: 11,
-                            letterSpacing: -0.44,
-                            fontWeight: FontWeight.w600,
-                          ),
-                        ),
-                        Container(
-                          height: 18,
-                          width: double.infinity,
-                          child: DropdownButtonHideUnderline(
-                            child: DropdownButton<HospitalsModel>(
-                              key: projectDropdownKey,
-                              hint: Text(TranslationBase.of(context).selectHospital),
-                              value: selectedHospital,
-                              iconSize: 0,
-                              isExpanded: true,
-                              style: TextStyle(fontSize: 14, letterSpacing: -0.56, color: Colors.black),
-                              items: projectsList.map((HospitalsModel item) {
-                                return DropdownMenuItem<HospitalsModel>(
-                                  value: item,
-                                  child: AutoSizeText(
-                                    item.name!,
-                                    maxLines: 1,
-                                    minFontSize: 10,
-                                    style: TextStyle(
-                                      fontSize: SizeConfig.textMultiplier! * 1.6,
-                                      fontWeight: FontWeight.w600,
-                                      letterSpacing: -0.39,
-                                      height: 0.8,
-                                    ),
-                                  ),
-                                  // Text('${item.name!}'),
-                                );
-                              }).toList(),
-                              onChanged: (HospitalsModel? newValue) {
-                                getClinicWrtHospital(newValue);
-                                setState(() {
-                                  selectedHospital = newValue;
-                                });
-                              },
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                  Icon(Icons.keyboard_arrow_down),
-                ],
-              )),
-        ),
-        if (clinicIds?.isNotEmpty == true) ...[
-          mHeight(8),
-          InkWell(
-            onTap: () {
-              showClickListDialog(context, clinicIds ?? List.empty(), onSelection: (ListClinicCentralized clincs) {
-                selectedClinic = clincs;
-                Navigator.pop(context);
-                setState(() {
-                  dropdownTitle = clincs.clinicDescription!;
-                  dropdownValue = clincs.clinicID.toString() + "-" + clincs.isLiveCareClinicAndOnline.toString() + "-" + clincs.liveCareClinicID.toString() + "-" + clincs.liveCareServiceID.toString();
-                });
-                getDoctorsList(context);
-
-                context.read<ProjectViewModel>().analytics.appointment.book_appointment_select_clinic(appointment_type: 'regular', clinic: clincs.clinicDescription);
-              });
-            },
-            child: Container(
-              width: double.infinity,
-              decoration: containerRadius(Colors.white, 12),
-              margin: EdgeInsets.only(left: 20, right: 20),
-              padding: EdgeInsets.only(left: 10, right: 10, top: 12, bottom: 8),
-              child: Row(
-                children: [
-                  Expanded(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          TranslationBase.of(context).selectClinic,
-                          style: TextStyle(
-                            fontSize: 11,
-                            letterSpacing: -0.44,
-                            fontWeight: FontWeight.w600,
-                          ),
-                        ),
-                        Padding(
-                          padding: const EdgeInsets.only(top: 4, bottom: 2),
-                          child: Text(
-                            dropdownTitle,
-                            style: TextStyle(
-                              fontSize: 13,
-                              letterSpacing: -0.44,
-                              fontWeight: FontWeight.w600,
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                  Icon(Icons.keyboard_arrow_down),
-                ],
-              ),
-            ),
+    return (hospitalList != null)
+        ? SearchResultWithTabForHospital(
+            patientDoctorAppointmentListHospital: hospitalList!,
+            doctorsList: [],
+            isDoctorSearchResult: false,
+            isLiveCareAppointment: false,
          )
-        ]
-      ],
-    );
+        : SizedBox.shrink();
+    // return Column(
+    //   children: [
+    //     Padding(
+    //       padding: const EdgeInsets.only(left: 6, right: 6, top: 16),
+    //       child: Row(
+    //         children: <Widget>[
+    //           Checkbox(
+    //             activeColor: CustomColors.accentColor,
+    //             value: nearestAppo,
+    //             onChanged: (bool? value) {
+    //               nearestAppo = value ?? false;
+    //               setState(() {});
+    //             },
+    //           ),
+    //           AutoSizeText(
+    //             TranslationBase.of(context).nearestAppo.trim(),
+    //             maxLines: 1,
+    //             minFontSize: 10,
+    //             style: TextStyle(
+    //               fontSize: SizeConfig.textMultiplier! * 1.4,
+    //               fontWeight: FontWeight.w600,
+    //               letterSpacing: -0.39,
+    //               height: 0.8,
+    //             ),
+    //           ),
+    //           // Text(TranslationBase.of(context).nearestAppo, style: TextStyle(fontSize: 14.0, letterSpacing: -0.56)),
+    //         ],
+    //       ),
+    //     ),
+    //     mHeight(8),
+    //     InkWell(
+    //       onTap: () {
+    //         openDropdown(projectDropdownKey);
+    //       },
+    //       child: Container(
+    //           width: double.infinity,
+    //           decoration: containerRadius(Colors.white, 12),
+    //           margin: EdgeInsets.only(left: 20, right: 20),
+    //           padding: EdgeInsets.only(left: 10, right: 10, top: 12, bottom: 12),
+    //           child: Row(
+    //             children: [
+    //               Flexible(
+    //                 child: Column(
+    //                   crossAxisAlignment: CrossAxisAlignment.start,
+    //                   children: [
+    //                     Text(
+    //                       TranslationBase.of(context).selectHospital,
+    //                       style: TextStyle(
+    //                         fontSize: 11,
+    //                         letterSpacing: -0.44,
+    //                         fontWeight: FontWeight.w600,
+    //                       ),
+    //                     ),
+    //                     Container(
+    //                       height: 18,
+    //                       width: double.infinity,
+    //                       child: DropdownButtonHideUnderline(
+    //                         child: DropdownButton<HospitalsModel>(
+    //                           key: projectDropdownKey,
+    //                           hint: Text(TranslationBase.of(context).selectHospital),
+    //                           value: selectedHospital,
+    //                           iconSize: 0,
+    //                           isExpanded: true,
+    //                           style: TextStyle(fontSize: 14, letterSpacing: -0.56, color: Colors.black),
+    //                           items: projectsList.map((HospitalsModel item) {
+    //                             return DropdownMenuItem<HospitalsModel>(
+    //                               value: item,
+    //                               child: AutoSizeText(
+    //                                 item.name!,
+    //                                 maxLines: 1,
+    //                                 minFontSize: 10,
+    //                                 style: TextStyle(
+    //                                   fontSize: SizeConfig.textMultiplier! * 1.6,
+    //                                   fontWeight: FontWeight.w600,
+    //                                   letterSpacing: -0.39,
+    //                                   height: 0.8,
+    //                                 ),
+    //                               ),
+    //                               // Text('${item.name!}'),
+    //                             );
+    //                           }).toList(),
+    //                           onChanged: (HospitalsModel? newValue) {
+    //                             getClinicWrtHospital(newValue);
+    //                             setState(() {
+    //                               selectedHospital = newValue;
+    //                             });
+    //                           },
+    //                         ),
+    //                       ),
+    //                     ),
+    //                   ],
+    //                 ),
+    //               ),
+    //               Icon(Icons.keyboard_arrow_down),
+    //             ],
+    //           )),
+    //     ),
+    //     if (clinicIds?.isNotEmpty == true) ...[
+    //       mHeight(8),
+    //       InkWell(
+    //         onTap: () {
+    //           showClickListDialog(context, clinicIds ?? List.empty(), onSelection: (ListClinicCentralized clincs) {
+    //             selectedClinic = clincs;
+    //             Navigator.pop(context);
+    //             setState(() {
+    //               dropdownTitle = clincs.clinicDescription!;
+    //               dropdownValue = clincs.clinicID.toString() + "-" + clincs.isLiveCareClinicAndOnline.toString() + "-" + clincs.liveCareClinicID.toString() + "-" + clincs.liveCareServiceID.toString();
+    //             });
+    //             getDoctorsList(context);
+    //
+    //             context.read<ProjectViewModel>().analytics.appointment.book_appointment_select_clinic(appointment_type: 'regular', clinic: clincs.clinicDescription);
+    //           });
+    //         },
+    //         child: Container(
+    //           width: double.infinity,
+    //           decoration: containerRadius(Colors.white, 12),
+    //           margin: EdgeInsets.only(left: 20, right: 20),
+    //           padding: EdgeInsets.only(left: 10, right: 10, top: 12, bottom: 8),
+    //           child: Row(
+    //             children: [
+    //               Expanded(
+    //                 child: Column(
+    //                   crossAxisAlignment: CrossAxisAlignment.start,
+    //                   children: [
+    //                     Text(
+    //                       TranslationBase.of(context).selectClinic,
+    //                       style: TextStyle(
+    //                         fontSize: 11,
+    //                         letterSpacing: -0.44,
+    //                         fontWeight: FontWeight.w600,
+    //                       ),
+    //                     ),
+    //                     Padding(
+    //                       padding: const EdgeInsets.only(top: 4, bottom: 2),
+    //                       child: Text(
+    //                         dropdownTitle,
+    //                         style: TextStyle(
+    //                           fontSize: 13,
+    //                           letterSpacing: -0.44,
+    //                           fontWeight: FontWeight.w600,
+    //                         ),
+    //                       ),
+    //                     ),
+    //                   ],
+    //                 ),
+    //               ),
+    //               Icon(Icons.keyboard_arrow_down),
+    //             ],
+    //           ),
+    //         ),
+    //       )
+    //     ]
+    //   ],
+    // );
  }

  void openDropdown(GlobalKey key) {
@ -252,27 +282,34 @@ class _SearchByHospitalState extends State<SearchByHospital> {
  }

  getProjectsList() {
+    AppGlobal.context = context;
    GifLoaderDialogUtils.showMyDialog(context);
-
    int languageID = context.read<ProjectViewModel>().isArabic ? 1 : 2;
    ClinicListService service = new ClinicListService();
    List<HospitalsModel> projectsListLocal = [];
-    service.getProjectsList(languageID, context).then((res) {
-      GifLoaderDialogUtils.hideDialog(context);
-
+    service.getProjectsList(languageID, context).then((res) async {
      if (res['MessageStatus'] == 1) {
-        setState(() {
-          res['ListProject'].forEach((v) {
-            projectsListLocal.add(new HospitalsModel.fromJson(v));
-          });
-          projectsList = projectsListLocal;
+        res['ListProject'].forEach((v) {
+          projectsListLocal.add(new HospitalsModel.fromJson(v));
        });
+        projectsList = projectsListLocal;
+        hospitalList = await DoctorMapper.getMappedHospitals(projectsList, isArabic: context.read<ProjectViewModel>().isArabic);
+        var lat = await sharedPref.getDouble(USER_LAT);
+
+        var lng = await sharedPref.getDouble(USER_LONG);
+        var isLocationEnabled = (lat != null && lat != 0.0) && (lng != null && lng != 0.0);
+        hospitalList = await DoctorMapper.sortList(isLocationEnabled, hospitalList!);
+        setState(() {});
+        GifLoaderDialogUtils.hideDialog(context);
      } else {}
+      GifLoaderDialogUtils.hideDialog(context);
+      locationUtils.getCurrentLocation();
    }).catchError((err) {
      GifLoaderDialogUtils.hideDialog(context);
+      locationUtils.getCurrentLocation();
    }).catchError((err) {
      GifLoaderDialogUtils.hideDialog(context);
-
+      locationUtils.getCurrentLocation();
      print(err);
    });
  }
@ -376,7 +413,8 @@ class _SearchByHospitalState extends State<SearchByHospital> {
  }

  callDoctorsSearchAPI(int clinicID) {
-    int languageID = context.read<ProjectViewModel>().isArabic ? 1 : 2;
+    var isArabic = context.read<ProjectViewModel>().isArabic;
+    int languageID = isArabic ? 1 : 2;
    GifLoaderDialogUtils.showMyDialog(context);
    List<DoctorList> doctorsList = [];
    List<String> arr = [];
@ -386,36 +424,38 @@ class _SearchByHospitalState extends State<SearchByHospital> {
    List<PatientDoctorAppointmentList> _patientDoctorAppointmentListHospital = [];

    DoctorsListService service = new DoctorsListService();
-    service.getDoctorsList(clinicID, selectedHospital?.mainProjectID.toString() != "" ? int.parse(selectedHospital?.mainProjectID.toString() ?? "-1") : 0, nearestAppo, languageID, null).then((res) {
+    service
+        .getDoctorsList(clinicID, selectedHospital?.mainProjectID.toString() != "" ? int.parse(selectedHospital?.mainProjectID.toString() ?? "-1") : 0, nearestAppo, languageID, null)
+        .then((res) async {
      GifLoaderDialogUtils.hideDialog(context);
      if (res['MessageStatus'] == 1) {
-        setState(() {
-          if (res['DoctorList'].length != 0) {
-            doctorsList.clear();
-            res['DoctorList'].forEach((v) {
-              doctorsList.add(DoctorList.fromJson(v));
-            });
-            doctorsList.forEach((element) {
-              List<PatientDoctorAppointmentList> doctorByHospital = _patientDoctorAppointmentListHospital
-                  .where(
-                    (elementClinic) => elementClinic.filterName == element.getProjectCompleteName(),
-                  )
-                  .toList();
-
-              if (doctorByHospital.length != 0) {
-                _patientDoctorAppointmentListHospital[_patientDoctorAppointmentListHospital.indexOf(doctorByHospital[0])].patientDoctorAppointmentList!.add(element);
-              } else {
-                _patientDoctorAppointmentListHospital
-                    .add(PatientDoctorAppointmentList(filterName: element.getProjectCompleteName(), distanceInKMs: element.projectDistanceInKiloMeters.toString(), patientDoctorAppointment: element));
-              }
-            });
-          } else {}
-        });
+        RegionList regionHospitalList = RegionList();
+
+        if (res['DoctorList'].length != 0) {
+          res['DoctorList'].forEach((v) {
+            doctorsList.add(new DoctorList.fromJson(
+              v,
+            ));
+          });
+
+          regionHospitalList = await DoctorMapper.getMappedDoctor(doctorsList, isArabic: isArabic);
+          var lat = await sharedPref.getDouble(USER_LAT);
+
+          var lng = await sharedPref.getDouble(USER_LONG);
+          var isLocationEnabled = (lat != null && lat != 0.0) && (lng != null && lng != 0.0);
+          regionHospitalList = await DoctorMapper.sortList(isLocationEnabled, regionHospitalList);
+
+          setState(() {});
+        } else {
+          GifLoaderDialogUtils.hideDialog(context);
+          AppToast.showErrorToast(message: res['ErrorSearchMsg']);
+        }

-        result = LinkedHashSet<String>.from(arr).toList();
-        numAll = result.length;
-        navigateToSearchResults(context, doctorsList, _patientDoctorAppointmentListHospital);
+        GifLoaderDialogUtils.hideDialog(context);
+        // navigateToSearchResults(context, doctorsList, _patientDoctorAppointmentListHospital);
+        navigateToSearchResults(context, regionHospitalList);
      } else {
+        GifLoaderDialogUtils.hideDialog(context);
        AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
      }
    }).catchError((err) {
@ -425,18 +465,20 @@ class _SearchByHospitalState extends State<SearchByHospital> {
    });
  }

-  Future navigateToSearchResults(context, List<DoctorList> docList, List<PatientDoctorAppointmentList> patientDoctorAppointmentListHospital) async {
-    Navigator.push(context,
-            FadePage(page: SearchResults(isLiveCareAppointment: false, doctorsList: docList, isDoctorSearchResult: false, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital)))
-        .then((value) {
-      print("navigation return ");
-      dropdownValue = null;
-      dropdownTitle = "";
-      selectedHospital = null;
-      clinicIds = List.empty();
-      setState(() {});
-      // getProjectsList();
-    });
+  navigateToSearchResults(context, RegionList regionHospitalList) {
+    // Navigator.push(context,
+    //     FadePage(page: SearchResults(isLiveCareAppointment: false, isDoctorNameSearch: true, doctorsList: docList, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital, isDoctorSearchResult: true,)));
+    Navigator.push(
+      context,
+      FadePage(
+        page: SearchResultWithTab(
+          doctorsList: [],
+          patientDoctorAppointmentListHospital: regionHospitalList,
+          isLiveCareAppointment: false,
+          isDoctorSearchResult: true,
+        ),
+      ),
+    );
  }

  Future navigateToLaserClinic(BuildContext context) async {
--- a/lib/pages/BookAppointment/search_result/ResultByClinic.dart
+++ b/lib/pages/BookAppointment/search_result/ResultByClinic.dart
@ -0,0 +1,261 @@
+import 'package:diplomaticquarterapp/config/config.dart';
+import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
+import 'package:diplomaticquarterapp/models/Appointments/SearchInfoModel.dart';
+import 'package:diplomaticquarterapp/models/Clinics/ClinicListResponse.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/DentalComplaints.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/components/LaserClinic.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/components/LiveCareBookAppointment.dart';
+import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
+import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
+import 'package:diplomaticquarterapp/services/appointment_services/doctor_response_mapper.dart';
+import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart';
+import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
+import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../../config/shared_pref_kay.dart';
+import '../../../models/Appointments/DoctorListResponse.dart';
+import '../../../services/authentication/auth_provider.dart';
+import '../../../theme/colors.dart';
+import '../../../uitl/gif_loader_dialog_utils.dart';
+
+class ResultByClinic extends StatefulWidget {
+  HospitalsModel? selectedValue;
+  Function(RegionList, int?) onClinicSelected;
+
+  ResultByClinic({super.key, this.selectedValue, required this.onClinicSelected});
+
+  @override
+  State<ResultByClinic> createState() => _ResultByClinicState();
+}
+
+class _ResultByClinicState extends State<ResultByClinic> {
+  List<ListClinicCentralized>? clinicIds = List.empty();
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) => getClinicWrtHospital(widget.selectedValue));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Expanded(
+            child: clinicIds?.isNotEmpty == true
+                ? ListView.builder(
+                    itemBuilder: (_, index) => InkWell(
+                      onTap: () {
+                        getDoctorsList(
+                            context,
+                            "${clinicIds?[index].clinicID.toString() ?? ''}-${clinicIds?[index].isLiveCareClinicAndOnline!.toString()}-${clinicIds?[index].liveCareClinicID.toString()}-${clinicIds?[index].liveCareServiceID.toString()}",
+                            clinicIds?[index].clinicDescription!,
+                            widget.selectedValue,
+                            clinicIds?[index]);
+                      },
+                      child: Material(
+                        color: CustomColors.white,
+                        child: Padding(
+                            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24),
+                            child: Row(
+                              children: [
+                                Expanded(
+                                  child: Column(
+                                    crossAxisAlignment: CrossAxisAlignment.start,
+                                    children: [
+                                      Text(
+                                        clinicIds?[index].clinicDescription ?? '',
+                                        style: TextStyle(fontSize: 22, color: Colors.black, fontWeight: FontWeight.w700),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                                Padding(
+                                  padding: EdgeInsets.all(8),
+                                  child: Center(
+                                    child: Icon(
+                                      Icons.arrow_forward_ios,
+                                      color: CustomColors.black,
+                                      size: 16,
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            )),
+                      ),
+                    ),
+                    itemCount: clinicIds?.length ?? 0,
+                  )
+                : getNoDataWidget(context)),
+      ],
+    );
+  }
+
+  getDoctorsList(BuildContext context, String? dropdownValue, String? dropdownTitle, HospitalsModel? selectedHospital, ListClinicCentralized? selectedClinic) {
+    SearchInfo searchInfo = new SearchInfo();
+    if (dropdownValue != null) if (dropdownValue!.split("-")[0] == "17") {
+      searchInfo.ProjectID = int.parse(selectedHospital?.mainProjectID.toString() ?? "");
+      searchInfo.ClinicID = int.parse(dropdownValue!.split("-")[0]);
+      searchInfo.hospital = selectedHospital;
+      searchInfo.clinic = selectedClinic;
+      searchInfo.date = DateTime.now();
+
+      if (context.read<ProjectViewModel>().isLogin) {
+        if (context.read<ProjectViewModel>().user.age! > 12) {
+          navigateToDentalComplaints(context, searchInfo);
+        } else {
+          callDoctorsSearchAPI(17);
+        }
+      } else {
+        navigateToDentalComplaints(context, searchInfo);
+      }
+    } else if (dropdownValue!.split("-")[0] == "253") {
+      navigateToLaserClinic(context);
+      // callDoctorsSearchAPI();
+    } else if (dropdownValue!.split("-")[1] == "true"
+        // && authProvider.isLogin &&
+        // authUser.patientType == 1
+        ) {
+      Navigator.push(
+        context,
+        FadePage(
+          page: LiveCareBookAppointment(clinicName: dropdownTitle, liveCareClinicID: dropdownValue!.split("-")[2], liveCareServiceID: dropdownValue!.split("-")[3]),
+        ),
+      ).then((value) {
+        print("navigation return ");
+        if (value == "false") return;
+
+        // setState(() {
+        // });
+        if (value == "livecare") {
+          Navigator.push(context, FadePage(page: LiveCareHome()));
+        }
+        if (value == "schedule") {
+          callDoctorsSearchAPI(int.parse(dropdownValue!.split("-")[0]));
+        }
+      });
+      setState(() {});
+    } else {
+      callDoctorsSearchAPI(int.parse(dropdownValue!.split("-")[0]));
+    }
+  }
+
+  Future navigateToLaserClinic(BuildContext context) async {
+    Navigator.push(
+      context,
+      FadePage(
+        page: LaserClinic(selectedHospital: widget.selectedValue!),
+      ),
+    ).then((value) {});
+  }
+
+  Future navigateToDentalComplaints(BuildContext context, SearchInfo searchInfo) async {
+    Navigator.push(
+      context,
+      FadePage(
+        page: DentalComplaints(
+          searchInfo: searchInfo,
+          isFromHospitalSearchPage: true,
+        ),
+      ),
+    ).then((value) {
+      if (value is RegionList) {
+        widget.onClinicSelected(value,null);
+      }
+    });
+  }
+
+  callDoctorsSearchAPI(int clinicID) {
+    var isArabic = context.read<ProjectViewModel>().isArabic;
+    int languageID = isArabic ? 1 : 2;
+    GifLoaderDialogUtils.showMyDialog(context);
+    List<DoctorList> doctorsList = [];
+    List<String> arr = [];
+    List<String> arrDistance = [];
+    List<String> result;
+    int numAll;
+    List<PatientDoctorAppointmentList> _patientDoctorAppointmentListHospital = [];
+
+    DoctorsListService service = new DoctorsListService();
+    service
+        .getDoctorsList(clinicID, widget.selectedValue?.mainProjectID.toString() != "" ? int.parse(widget.selectedValue?.mainProjectID.toString() ?? "-1") : 0, false, languageID, null)
+        .then((res) async {
+      GifLoaderDialogUtils.hideDialog(context);
+      if (res['MessageStatus'] == 1) {
+        RegionList regionHospitalList = RegionList();
+
+        if (res['DoctorList'].length != 0) {
+          res['DoctorList'].forEach((v) {
+            doctorsList.add(new DoctorList.fromJson(
+              v,
+            ));
+          });
+
+          regionHospitalList = await DoctorMapper.getMappedDoctor(doctorsList, isArabic: isArabic);
+          var lat = await sharedPref.getDouble(USER_LAT);
+
+          var lng = await sharedPref.getDouble(USER_LONG);
+          var isLocationEnabled = (lat != null && lat != 0.0) && (lng != null && lng != 0.0);
+          regionHospitalList = await DoctorMapper.sortList(isLocationEnabled, regionHospitalList);
+          widget.onClinicSelected(regionHospitalList,  clinicID);
+          setState(() {});
+        } else {
+          GifLoaderDialogUtils.hideDialog(context);
+          AppToast.showErrorToast(message: res['ErrorSearchMsg']);
+        }
+
+        GifLoaderDialogUtils.hideDialog(context);
+        // navigateToSearchResults(context, doctorsList, _patientDoctorAppointmentListHospital);
+      } else {
+        GifLoaderDialogUtils.hideDialog(context);
+        AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
+      }
+    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      print(err);
+      AppToast.showErrorToast(message: err, localContext: context);
+    });
+  }
+
+  void getClinicWrtHospital(HospitalsModel? newValue) async {
+    AppGlobal.context = context;
+    GifLoaderDialogUtils.showMyDialog(context);
+    ClinicListService service = new ClinicListService();
+    List<HospitalsModel> projectsListLocal = [];
+    clinicIds = List.empty();
+    List<ListClinicCentralized> clinicId = [];
+    try {
+      Map res = await service.getClinicByHospital(projectID: newValue?.mainProjectID.toString() ?? "");
+      GifLoaderDialogUtils.hideDialog(context);
+      if (res['MessageStatus'] == 1) {
+        List list = res['ListClinic'];
+
+        if (list.isEmpty) {
+          AppToast.showErrorToast(
+            message: TranslationBase.of(context).NoClinicFound,
+          );
+        }
+        res['ListClinic'].forEach((v) {
+          clinicId.add(ListClinicCentralized.fromJson(v));
+        });
+        clinicIds = clinicId;
+        setState(() {});
+      } else {
+        AppToast.showErrorToast(
+          message: TranslationBase.of(context).NoClinicFound,
+        );
+      }
+    } catch (e) {
+      print("the error is $e");
+      AppToast.showErrorToast(
+        message: TranslationBase.of(context).NoClinicFound,
+      );
+      GifLoaderDialogUtils.hideDialog(context);
+    }
+  }
+}
--- a/lib/pages/BookAppointment/search_result/ResultByDoctors.dart
+++ b/lib/pages/BookAppointment/search_result/ResultByDoctors.dart
@ -0,0 +1,130 @@
+import 'package:auto_size_text/auto_size_text.dart';
+import 'package:diplomaticquarterapp/config/size_config.dart';
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
+import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
+import 'package:diplomaticquarterapp/models/Appointments/OBGyneProcedureListResponse.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/DoctorView.dart';
+import 'package:diplomaticquarterapp/theme/colors.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class ResultByDoctor extends StatefulWidget {
+  List<DoctorList> doctorsList = [];
+  List<DoctorList>? patientDoctorAppointmentListHospital;
+  final bool isLiveCareAppointment;
+  final bool isObGyneAppointment;
+  final bool isDoctorNameSearch;
+  final bool isDoctorSearchResult;
+  final bool showNearestAppointment;
+  final bool nearestAppointmentDoctors;
+  final OBGyneProcedureListResponse? obGyneProcedureListResponse;
+  final Function(bool)? refreshDoctorList;
+
+  ResultByDoctor({
+    required this.doctorsList,
+    required this.patientDoctorAppointmentListHospital,
+    required this.isLiveCareAppointment,
+    required this.isObGyneAppointment,
+    required this.isDoctorNameSearch,
+    required this.isDoctorSearchResult,
+    this.showNearestAppointment = false,
+    this.nearestAppointmentDoctors = false,
+    this.obGyneProcedureListResponse,
+    this.refreshDoctorList
+  });
+
+  @override
+  State<ResultByDoctor> createState() => _ResultByDoctorState();
+}
+
+class _ResultByDoctorState extends State<ResultByDoctor> {
+
+  bool nearestAppo = false;
+
+  @override
+  void initState() {
+    nearestAppo = widget.nearestAppointmentDoctors;
+    super.initState();
+  }
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+
+        Visibility(
+          visible: widget.showNearestAppointment,
+          child: Padding(
+            padding: const EdgeInsets.only(left: 6, right: 6,),
+            child: Row(
+              children: <Widget>[
+                Checkbox(
+                  activeColor: CustomColors.accentColor,
+                  value: nearestAppo,
+                  onChanged: (bool? value) {
+                    setState(() {
+                     nearestAppo = value ?? false;
+                    });
+                    widget.refreshDoctorList?.call(nearestAppo);
+                  },
+                ),
+                AutoSizeText(
+                  TranslationBase.of(context).nearestAppo.trim(),
+                  maxLines: 1,
+                  minFontSize: 10,
+                  style: TextStyle(
+                    fontSize: SizeConfig.textMultiplier! * 1.4,
+                    fontWeight: FontWeight.w600,
+                    letterSpacing: -0.39,
+                    height: 0.8,
+                  ),
+                ),
+                // Text(TranslationBase.of(context).nearestAppo, style: TextStyle(fontSize: 14.0, letterSpacing: -0.56)),
+              ],
+            ),
+          ),
+        ),
+        widget.patientDoctorAppointmentListHospital?.isNotEmpty == true
+            ? Expanded(
+              child: ListView.separated(
+                addAutomaticKeepAlives: true,
+                physics: BouncingScrollPhysics(),
+                separatorBuilder: (context, index) {
+                  return Material(
+                    color: Color(0xFFf5f5f5),
+                    child: SizedBox(
+                      height: 12,
+                    ),
+                  );
+                },
+                itemBuilder: (context, index) {
+                  final doctor = widget.patientDoctorAppointmentListHospital![index];
+
+                  return Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 12.0),
+                    child: DoctorView(
+                        doctor: doctor,
+                        isLiveCareAppointment: widget.isLiveCareAppointment,
+                        isObGyneAppointment: widget.isObGyneAppointment,
+                        isDoctorNameSearch: widget.isDoctorNameSearch,
+                        obGyneProcedureListResponse: widget.obGyneProcedureListResponse,
+                        isShowDate: false,
+                        onTap: () {
+                          context.read<ProjectViewModel>().analytics.appointment.book_appointment_select_doctor(appointment_type: 'regular', doctor: doctor);
+                        }),
+                  );
+                },
+                itemCount: widget.patientDoctorAppointmentListHospital?.length ?? 0,
+              ),
+            )
+            : getNoDataWidget(context),
+      ],
+    );
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+}
--- a/lib/pages/BookAppointment/search_result/ResultByFacility.dart
+++ b/lib/pages/BookAppointment/search_result/ResultByFacility.dart
@ -0,0 +1,173 @@
+import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
+import 'package:diplomaticquarterapp/theme/colors.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+typedef OnFacilitySelected = Function(bool);
+
+class ResultByFacility extends StatelessWidget {
+  List<DoctorList> doctorsList = [];
+  String selectedRegion = '';
+  RegionList patientDoctorAppointmentListHospital;
+  OnFacilitySelected onFacilitySelected;
+
+  ResultByFacility(
+      {required this.doctorsList,
+      required this.patientDoctorAppointmentListHospital,
+      required this.onFacilitySelected,
+      required this.selectedRegion});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+        children: [
+      Visibility(
+        visible: patientDoctorAppointmentListHospital
+                .registeredDoctorMap?[selectedRegion]?.hmgSize !=
+            0,
+        child: InkWell(
+          onTap: () {
+            if (patientDoctorAppointmentListHospital
+                    .registeredDoctorMap?[selectedRegion]?.hmgSize ==
+                0) return;
+            onFacilitySelected(false);
+          },
+          child: HospitalTitle(
+              iconUrl: 'assets/images/svg/HMG.svg',
+              title: TranslationBase.of(context).hmgHospital,
+              isHMC: false,
+              itemCount:
+                  "${patientDoctorAppointmentListHospital.registeredDoctorMap?[selectedRegion]?.hmgSize ?? 0}",
+              nearest: patientDoctorAppointmentListHospital
+                  .registeredDoctorMap?[selectedRegion]?.hmgDistance),
+        ),
+      ),
+      SizedBox(height: 16,),
+      Visibility(
+        visible: patientDoctorAppointmentListHospital
+                .registeredDoctorMap?[selectedRegion]?.hmcSize !=
+            0,
+        child: InkWell(
+          onTap: () {
+            if (patientDoctorAppointmentListHospital
+                    .registeredDoctorMap?[selectedRegion]?.hmcSize ==
+                0) return;
+            onFacilitySelected(true);
+          },
+          child: HospitalTitle(
+              iconUrl: 'assets/images/svg/HMC.svg',
+              title: TranslationBase.of(context).hmcHospital,
+              isHMC: true,
+              itemCount:
+                  "${patientDoctorAppointmentListHospital.registeredDoctorMap?[selectedRegion]?.hmcSize ?? 0}",
+              nearest: patientDoctorAppointmentListHospital
+                  .registeredDoctorMap?[selectedRegion]?.hmcDistance),
+        ),
+      )
+    ]);
+  }
+}
+
+class HospitalTitle extends StatelessWidget {
+  final String title;
+  final String iconUrl;
+  final bool isHMC;
+  final num? nearest;
+  final String itemCount;
+
+  const HospitalTitle(
+      {super.key,
+      required this.title,
+      required this.iconUrl,
+      required this.isHMC,
+      required this.itemCount,this.nearest});
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      color: Colors.white,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24),
+        child: Row(
+          children: [
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    children: [
+                      SvgPicture.asset(iconUrl),
+                      SizedBox(
+                        width: 8,
+                      ),
+                      Text(
+                        title,
+                        style: TextStyle(
+                            fontSize: 18,
+                            color:
+                                isHMC ? Color(0xFF40ACC9) : Color(0xFFD02127),
+                            fontWeight: FontWeight.w600),
+                      ),
+                    ],
+                  ),
+                  SizedBox(
+                    height: 6,
+                  ),
+                  Row(
+                    children: [
+                      Text(
+                        isHMC
+                            ? "${TranslationBase.of(context).MedicalCenterString(num.parse(itemCount)).replaceAll("@", itemCount)}"
+                            : "${TranslationBase.of(context).HospitalString(num.parse(itemCount)).replaceAll("@", itemCount)}",
+                        style: TextStyle(
+                            fontSize: 12,
+                            color: Colors.black,
+                            fontWeight: FontWeight.w600),
+                      ),
+                      Visibility(
+                        visible: nearest != double.infinity &&
+                            nearest != "0" &&
+                            nearest != 0,
+                        child: Row(
+                          children: [
+                            SizedBox(
+                              width: 8,
+                            ),
+                            SvgPicture.asset(
+                              'assets/images/svg/location.svg',
+                            ),
+                            SizedBox(
+                              width: 8,
+                            ),
+                            Text(
+                              "${TranslationBase.of(context).nearest}: $nearest  ${TranslationBase.of(context).kilometerUnit}",
+                              style: TextStyle(
+                                  fontSize: 12,
+                                  color: Colors.black,
+                                  fontWeight: FontWeight.w600),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+            Padding(
+              padding: EdgeInsets.all(8),
+              child: Center(
+                child: Icon(
+                  Icons.arrow_forward_ios,
+                  color: CustomColors.black,
+                  size: 16,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/pages/BookAppointment/search_result/ResultByHospital.dart
+++ b/lib/pages/BookAppointment/search_result/ResultByHospital.dart
@ -0,0 +1,248 @@
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
+import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
+import 'package:diplomaticquarterapp/models/Appointments/OBGyneProcedureListResponse.dart';
+import 'package:diplomaticquarterapp/theme/colors.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:provider/provider.dart';
+
+typedef OnHospitalSelected = Function(String, int);
+
+class ResultByHospital extends StatelessWidget {
+  List<DoctorList> doctorsList = [];
+  List<PatientDoctorAppointmentList>? paitientDoctorAppointmentList;
+  bool isHMCSelected;
+
+  bool isLiveCareAppointment;
+  bool isObGyneAppointment;
+  bool isDoctorNameSearch;
+  OBGyneProcedureListResponse? obGyneProcedureListResponse;
+  bool isDoctorSearchResult;
+  OnHospitalSelected onHospitalSelected;
+
+  ResultByHospital(
+      {required this.doctorsList,
+      required this.paitientDoctorAppointmentList,
+      required this.isHMCSelected,
+      this.isObGyneAppointment = false,
+      this.isDoctorNameSearch = false,
+      required this.isLiveCareAppointment,
+      required this.isDoctorSearchResult,
+      this.obGyneProcedureListResponse,
+      required this.onHospitalSelected});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Expanded(
+          child: HospitalBodyWidget(
+            patientDoctorAppointmentListHospital: paitientDoctorAppointmentList,
+            isLiveCareAppointment: isLiveCareAppointment,
+            isObGyneAppointment: isObGyneAppointment,
+            isDoctorNameSearch: isDoctorNameSearch,
+            isDoctorSearchResult: isDoctorSearchResult,
+            onHospitalSelected: onHospitalSelected,
+              isHMC: isHMCSelected),
+        ),
+      ],
+    );
+  }
+}
+
+class HospitalBodyWidget extends StatelessWidget {
+  final List<PatientDoctorAppointmentList>?
+      patientDoctorAppointmentListHospital;
+  final bool isLiveCareAppointment;
+  final bool isObGyneAppointment;
+  final bool isDoctorNameSearch;
+  final bool isDoctorSearchResult;
+  final OBGyneProcedureListResponse? obGyneProcedureListResponse;
+  final OnHospitalSelected onHospitalSelected;
+  final bool isHMC;
+
+  const HospitalBodyWidget(
+      {super.key,
+      this.patientDoctorAppointmentListHospital,
+      required this.isLiveCareAppointment,
+      required this.isObGyneAppointment,
+      required this.isDoctorNameSearch,
+      required this.isDoctorSearchResult,
+      this.obGyneProcedureListResponse,
+      required this.onHospitalSelected,
+      required this.isHMC});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.separated(
+      addAutomaticKeepAlives: true,
+      shrinkWrap: true,
+      physics: BouncingScrollPhysics(),
+      itemCount: patientDoctorAppointmentListHospital?.length ?? 0,
+      separatorBuilder: (context, index) {
+        return Container(
+          height: 12,
+          margin: EdgeInsets.only(left: 21, right: 21),
+        );
+      },
+      itemBuilder: (context, index) {
+        return InkWell(
+          onTap: () {
+            onHospitalSelected(
+                patientDoctorAppointmentListHospital![index].filterName ?? '',
+                index);
+          },
+          child: Material(
+            color: CustomColors.white,
+            child: Padding(
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 16, vertical: 24),
+                child: Row(
+                  children: [
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Row(
+                            children: [
+                              Padding(
+                                padding: const EdgeInsets.all(6.0),
+                                child: SvgPicture.asset(
+                                  isHMC
+                                      ? 'assets/images/svg/HMC.svg'
+                                      : 'assets/images/svg/HMG.svg',
+                                ),
+                              ),
+                              Expanded(
+                                child: Directionality(
+                                  textDirection: (context
+                                              .read<ProjectViewModel>()
+                                              .isArabic ==
+                                          true)
+                                      ? TextDirection.rtl
+                                      : TextDirection.ltr,
+                                  child: Text(
+                                    patientDoctorAppointmentListHospital![index]
+                                            .filterName ??
+                                        '',
+                                    style: TextStyle(
+                                        fontSize: 22,
+                                        color: isHMC
+                                            ? Color(0xFF40ACC9)
+                                            : Color(0xFFD02127),
+                                        fontWeight: FontWeight.w700),
+                                  ),
+                                ),
+                              ),
+                            ],
+                          ),
+                          SizedBox(
+                            height: 8,
+                          ),
+                          Visibility(
+                            visible:
+                                (patientDoctorAppointmentListHospital?[index]
+                                        .distanceInKMs !=
+                                    "0"),
+                            child: Row(
+                              children: [
+                                SvgPicture.asset(
+                                  'assets/images/svg/location.svg',
+                                ),
+                                SizedBox(
+                                  width: 8,
+                                ),
+                                Text(
+                                  // "${TranslationBase.of(context).nearest}: ${patientDoctorAppointmentListHospital?[index].distanceInKMs} ${TranslationBase.of(context).kilometerUnit}",
+                                  "${patientDoctorAppointmentListHospital?[index].distanceInKMs} ${TranslationBase.of(context).kilometerUnit}",
+                                  style: TextStyle(
+                                      fontSize: 14,
+                                      color: Colors.black,
+                                      fontWeight: FontWeight.w600),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    Padding(
+                      padding: EdgeInsets.all(8),
+                      child: Center(
+                        child: Icon(
+                          Icons.arrow_forward_ios,
+                          color: CustomColors.black,
+                          size: 16,
+                        ),
+                      ),
+                    ),
+                  ],
+                )),
+          ),
+        );
+        // return AppExpandableNotifier(
+        //   applyBackgroundColor: false,
+        //   widgetColor: CustomColors.appBackgroudGrey2Color,
+        //   title: (patientDoctorAppointmentListHospital?[index].distanceInKMs !=
+        //       "0")
+        //       ? patientDoctorAppointmentListHospital![index].filterName! +
+        //       " - " +
+        //       patientDoctorAppointmentListHospital![index].distanceInKMs! +
+        //       " " +
+        //       TranslationBase.of(context).km
+        //       : patientDoctorAppointmentListHospital![index].filterName,
+        //   projectTitleTop:
+        //   patientDoctorAppointmentListHospital![index].projectTopName,
+        //   projectTitleBottom: (patientDoctorAppointmentListHospital![index]
+        //       .distanceInKMs !=
+        //       "0")
+        //       ? patientDoctorAppointmentListHospital![index]
+        //       .projectBottomName
+        //       .toString() +
+        //       " - " +
+        //       patientDoctorAppointmentListHospital![index].distanceInKMs! +
+        //       " " +
+        //       TranslationBase.of(context).km
+        //       : patientDoctorAppointmentListHospital![index]
+        //       .projectBottomName
+        //       .toString(),
+        //   isTitleSingleLine: false,
+        //   isDoctorSearchResult: isDoctorSearchResult,
+        //   isDisabled: true,
+        //   isExpand:
+        //   patientDoctorAppointmentListHospital?.length == 1 ? true : false,
+        // //   bodyWidget: ListView.separated(
+        // //       shrinkWrap: true,
+        // //       physics: NeverScrollableScrollPhysics(),
+        // //       padding:
+        // //       EdgeInsets.only(bottom: 10, top: 10, left: 21, right: 21),
+        // //       itemBuilder: (context, _index) {
+        // //         // print("the index of patientDoctorAppointmentList is ${_index}");
+        // //         // print("the index of parent is  ${index}");
+        // //         final doctor = patientDoctorAppointmentListHospital![index]
+        // //             .patientDoctorAppointmentList![_index];
+        // //         // print('the doctor is ${doctor.toJson()}');
+        // //         return DoctorView(
+        // //             doctor: doctor,
+        // //             isLiveCareAppointment: isLiveCareAppointment,
+        // //             isObGyneAppointment: isObGyneAppointment,
+        // //             isDoctorNameSearch: isDoctorNameSearch,
+        // //             obGyneProcedureListResponse: obGyneProcedureListResponse,
+        // //             isShowDate: false,
+        // //             onTap: () {
+        // //               context
+        // //                   .read<ProjectViewModel>()
+        // //                   .analytics
+        // //                   .appointment
+        // //                   .book_appointment_select_doctor(
+        // //                   appointment_type: 'regular', doctor: doctor);
+        // //             });
+        // //       },
+        // //       separatorBuilder: (context, index) => SizedBox(height: 14),
+        // //       itemCount: patientDoctorAppointmentListHospital?[index].patientDoctorAppointmentList?.length ?? 0),
+        // );
+      },
+    );
+  }
+}
--- a/lib/pages/BookAppointment/search_result/ResultByRegion.dart
+++ b/lib/pages/BookAppointment/search_result/ResultByRegion.dart
@ -0,0 +1,170 @@
+import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
+import 'package:diplomaticquarterapp/theme/colors.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+typedef OnRegionSelected = Function(String);
+class ResultByRegion extends StatelessWidget {
+  List<DoctorList> doctorsList = [];
+  RegionList patientDoctorAppointmentListHospital;
+  OnRegionSelected onRegionSelected;
+  ResultByRegion(
+      {required this.doctorsList,
+        required this.patientDoctorAppointmentListHospital,
+        required this.onRegionSelected
+      });
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Expanded(
+         child: patientDoctorAppointmentListHospital
+              .registeredDoctorMap?.isNotEmpty ==
+              true
+              ? ListView.separated(
+            addAutomaticKeepAlives: true,
+            physics: BouncingScrollPhysics(),
+            separatorBuilder: (context, index) {
+              return Material(
+                color: Color(0xFFf5f5f5),
+                child: SizedBox(
+                  height: 12,
+                ),
+              );
+            },
+            itemBuilder: (context, index) {
+              String key = patientDoctorAppointmentListHospital
+                  .registeredDoctorMap?.keys
+                  .toList()[index] ??
+                  '';
+
+              return InkWell(
+                onTap: (){
+                  onRegionSelected(key);
+                },
+                child: RegionTitle(
+                  title: key,
+                  hmcCount:
+                  "${patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmcSize ?? 0}",
+                  hmgCount:
+                  "${patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmgSize ?? 0}",
+                ),
+              );
+
+            },
+            itemCount: patientDoctorAppointmentListHospital
+                .registeredDoctorMap?.length ??
+                0,
+          )
+              : getNoDataWidget(context),
+        ),
+      ],
+    );
+  }
+}
+
+
+class RegionTitle extends StatelessWidget {
+  final String title;
+  final String hmcCount;
+  final String hmgCount;
+
+  const RegionTitle(
+      {super.key,
+        required this.title,
+        required this.hmcCount,
+        required this.hmgCount});
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      color: CustomColors.white,
+      child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24),
+          child: Row(
+          children: [
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    title,
+                    style: TextStyle(
+                        fontSize: 22, color: Colors.black, fontWeight: FontWeight.w700),
+                  ),
+                  SizedBox(
+                    height: 8,
+                  ),
+                  Row(
+                    children: [
+                        Visibility(
+                          visible: hmgCount != "0",
+                          child: Row(
+                            children: [
+                              SvgPicture.asset(
+                                'assets/images/svg/HMG.svg',
+                                width: 10,
+                                height: 10,
+                              ),
+                              SizedBox(
+                                width: 8,
+                              ),
+                              Text(
+                                "${TranslationBase.of(context).HospitalString(num.parse(hmgCount)).replaceAll("@", hmgCount)}",
+                                style: TextStyle(
+                                    fontSize: 14,
+                                    color: Color(0xFFD02127),
+                                    fontWeight: FontWeight.w600),
+                              ),
+                            ],
+                          ),
+                        ),
+                        Visibility(
+                            visible: hmcCount != "0" && hmgCount != "0",
+                            child: Text(", ")),
+                        Visibility(
+                          visible: hmcCount != "0",
+                          child: Row(
+                            children: [
+                              SvgPicture.asset(
+                                'assets/images/svg/HMC.svg',
+                                width: 10,
+                                height: 10,
+                              ),
+                              SizedBox(
+                                width: 8,
+                              ),
+                              Text(
+                                "${TranslationBase.of(context).MedicalCenterString(num.parse(hmcCount)).replaceAll("@", hmcCount)}",
+                                style: TextStyle(
+                                    fontSize: 14,
+                                    color: Color(0xFF40ACC9),
+                                    fontWeight: FontWeight.w600),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ],
+                  ),
+                ],
+              ),
+            ),
+            Padding(
+              padding: EdgeInsets.all(8),
+              child: Center(
+                child: Icon(
+                  Icons.arrow_forward_ios,
+                  color: CustomColors.black,
+                  size: 16,
+                ),
+              ),
+            ),
+          ],
+        )
+      ),
+    );
+  }
+}
--- a/lib/pages/BookAppointment/search_result/SearchResultWithTab.dart
+++ b/lib/pages/BookAppointment/search_result/SearchResultWithTab.dart
@ -0,0 +1,725 @@
+import 'package:diplomaticquarterapp/config/size_config.dart';
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
+import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
+import 'package:diplomaticquarterapp/models/Appointments/OBGyneProcedureListResponse.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/search_result/ResultByDoctors.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/search_result/ResultByFacility.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/search_result/ResultByHospital.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/search_result/ResultByRegion.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/DoctorView.dart';
+import 'package:diplomaticquarterapp/theme/colors.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
+import 'package:diplomaticquarterapp/widgets/others/app_expandable_notifier.dart';
+import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:provider/provider.dart';
+
+class SearchResultWithTab extends StatefulWidget {
+  List<DoctorList> doctorsList = [];
+  RegionList patientDoctorAppointmentListHospital;
+  bool isLiveCareAppointment;
+  bool isObGyneAppointment;
+  bool isDoctorNameSearch;
+  OBGyneProcedureListResponse? obGyneProcedureListResponse;
+  bool isDoctorSearchResult;
+
+  bool isForHospital;
+
+  SearchResultWithTab({required this.doctorsList,
+    required this.patientDoctorAppointmentListHospital,
+    this.isObGyneAppointment = false,
+    this.isDoctorNameSearch = false,
+    required this.isLiveCareAppointment,
+    required this.isDoctorSearchResult,
+    this.obGyneProcedureListResponse,
+    this.isForHospital = false,
+  });
+
+  @override
+  State<SearchResultWithTab> createState() => _SearchResultWithTabState();
+}
+
+class _SearchResultWithTabState extends State<SearchResultWithTab> {
+  int _currentIndex = 0;
+  late PageController _controller;
+  String selectedRegion = "";
+  bool isHMCSelected = false;
+  int selectedHospitalIndex = -1;
+  ScrollController scrollController = ScrollController();
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = new PageController();
+  }
+
+  changePageViewIndex(pageIndex) {
+    _controller.jumpToPage(pageIndex);
+    // scrollController.jumpTo(pageIndex);
+  }
+
+
+  @override
+  Widget build(BuildContext context) {
+    return AppScaffold(
+      appBarTitle: TranslationBase.of(context).bookAppo,
+      isShowDecPage: false,
+      isShowAppBar: true,
+      showNewAppBarTitle: true,
+      showNewAppBar: true,
+      backgroundColor: CustomColors.appBackgroudGrey2Color,
+      body: widget.patientDoctorAppointmentListHospital
+          .registeredDoctorMap?.isNotEmpty ==
+          true
+          ? SizedBox(
+              height: SizeConfig.realScreenHeight! * .9,
+              width: SizeConfig.realScreenWidth,
+              child: Column(children: <Widget>[
+                Container(
+                  width: double.infinity,
+                  padding: EdgeInsets.only(left: 20, right: 20, top: 12),
+                  child: SizedBox(
+                    height: 100,
+                    child: ListView(
+                      scrollDirection: Axis.horizontal,
+                      controller: scrollController,
+                      children: [
+                        SizedBox(
+                          width: MediaQuery.of(context).size.width / 4,
+                          child: showProgress(
+                            title: TranslationBase.of(context).selectRegion,
+                            status: _currentIndex == 0
+                                ? TranslationBase.of(context).inPrgress
+                                : _currentIndex > 0
+                                    ? TranslationBase.of(context).completed
+                                    : TranslationBase.of(context).locked,
+                            color: _currentIndex == 0
+                                ? CustomColors.orange
+                                : CustomColors.green,
+                            onTap: () {
+                              setState(() {
+                                selectedHospitalIndex = -1;
+                                selectedRegion = "";
+                                _currentIndex = 0;
+                                changePageViewIndex(0);
+                              });
+                            },
+                          ),
+                        ),
+                        SizedBox(
+                          width: MediaQuery.of(context).size.width / 4,
+                          child: showProgress(
+                            title: TranslationBase.of(context).selectFacitlity,
+                            status: _currentIndex == 1
+                                ? TranslationBase.of(context).inPrgress
+                                : _currentIndex > 1
+                                    ? TranslationBase.of(context).completed
+                                    : TranslationBase.of(context).locked,
+                            color: _currentIndex == 1
+                                ? CustomColors.orange
+                                : _currentIndex > 1
+                                    ? CustomColors.green
+                                    : CustomColors.grey2,
+                            onTap: () {
+                              setState(() {
+                                selectedHospitalIndex = -1;
+                                _currentIndex = 1;
+                                changePageViewIndex(1);
+                              });
+                            },
+                          ),
+                        ),
+                        SizedBox(
+                          width: MediaQuery.of(context).size.width / 4,
+                          child: showProgress(
+                            title: TranslationBase.of(context).selectBranch,
+                            status: _currentIndex == 2
+                                ? TranslationBase.of(context).inPrgress
+                                : _currentIndex > 1
+                                    ? TranslationBase.of(context).completed
+                                    : TranslationBase.of(context).locked,
+                            color: _currentIndex == 2
+                                ? CustomColors.orange
+                                : _currentIndex > 2
+                                    ? CustomColors.green
+                                    : CustomColors.grey2,
+                            onTap: () {
+                              setState(() {
+                                selectedHospitalIndex = -1;
+                                _currentIndex = 2;
+                                changePageViewIndex(2);
+                              });
+                            },
+                          ),
+                        ),
+                        (widget.isForHospital)
+                            ? SizedBox(
+                                width: MediaQuery.of(context).size.width / 4,
+                                child: showProgress(
+                                  title:
+                                      TranslationBase.of(context).selectClinic,
+                                  status: _currentIndex == 3
+                                      ? TranslationBase.of(context).inPrgress
+                                      : TranslationBase.of(context).locked,
+                                  color: _currentIndex == 3
+                                      ? CustomColors.orange
+                                      : _currentIndex > 4
+                                          ? CustomColors.green
+                                          : CustomColors.grey2,
+                                  isNeedBorder: false,
+                                  onTap: () {
+                                    setState(() {
+                                      _currentIndex = 3;
+                                      changePageViewIndex(3);
+                                    });
+                                  },
+                                ),
+                              )
+                            : SizedBox.shrink(),
+                        SizedBox(
+                          width: MediaQuery.of(context).size.width / 4,
+                          child: showProgress(
+                            title: TranslationBase.of(context).selectDoctor,
+                            status: _currentIndex ==
+                                    ((widget.isForHospital) ? 4 : 3)
+                                ? TranslationBase.of(context).inPrgress
+                                : TranslationBase.of(context).locked,
+                            color: _currentIndex ==
+                                    ((widget.isForHospital) ? 4 : 3)
+                                ? CustomColors.orange
+                                : _currentIndex ==
+                                        ((widget.isForHospital) ? 5 : 4)
+                                    ? CustomColors.green
+                                    : CustomColors.grey2,
+                            isNeedBorder: false,
+                            onTap: () {
+                              setState(() {
+                                _currentIndex =
+                                    ((widget.isForHospital) ? 4 : 3);
+                                changePageViewIndex(_currentIndex);
+                              });
+                            },
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+                Padding(
+                  padding:
+                      const EdgeInsetsDirectional.fromSTEB(10.0, 18, 0, 24),
+                  child: Row(
+                    children: [
+                      (_currentIndex != 0)
+                          ? InkWell(
+                              onTap: () {
+                                handleBackClick();
+                              },
+                              child: Padding(
+                                padding: const EdgeInsetsDirectional.fromSTEB(
+                                    0, 0, 04, 0),
+                                child: Icon(
+                                  Icons.arrow_back,
+                                  color: Theme.of(context).primaryColor,
+                                ),
+                              ),
+                            )
+                          : mWidth(24),
+                      Text(
+                        getTitle(),
+                        style: TextStyle(
+                            fontSize: 18,
+                            fontWeight: FontWeight.w600,
+                            color: Colors.black),
+                      )
+                    ],
+                  ),
+                ),
+                // mHeight(24),
+                Expanded(
+                  child: PageView(
+                    physics: NeverScrollableScrollPhysics(),
+                    controller: _controller,
+                    onPageChanged: (index) {
+                      setState(() {
+                        _currentIndex = index;
+                      });
+                    },
+                    scrollDirection: Axis.horizontal,
+                    children: <Widget>[
+                      ResultByRegion(
+                          doctorsList: widget.doctorsList,
+                          patientDoctorAppointmentListHospital:
+                              widget.patientDoctorAppointmentListHospital,
+                          onRegionSelected: (key) {
+                            setState(() {
+                              selectedRegion = key;
+                              _currentIndex = 1;
+                              changePageViewIndex(1);
+                            });
+                          }),
+                      (selectedRegion != "")
+                          ? ResultByFacility(
+                              doctorsList: widget.doctorsList,
+                              patientDoctorAppointmentListHospital:
+                                  widget.patientDoctorAppointmentListHospital,
+                              selectedRegion: selectedRegion,
+                              onFacilitySelected: (isHMCSelected) {
+                                setState(() {
+                                  this.isHMCSelected = isHMCSelected;
+                                  _currentIndex = 2;
+                                  changePageViewIndex(2);
+                                });
+                              },
+                            ) : SizedBox.shrink(),
+                (selectedRegion != '') ?
+                ResultByHospital(doctorsList: widget.doctorsList,
+                    paitientDoctorAppointmentList: (isHMCSelected) ?
+                    widget.patientDoctorAppointmentListHospital
+                        .registeredDoctorMap![selectedRegion]!
+                                          .hmcDoctorList ??
+                                      []
+                                  : widget
+                                          .patientDoctorAppointmentListHospital
+                                          .registeredDoctorMap?[selectedRegion]
+                                          ?.hmgDoctorList ??
+                                      [],
+                              isHMCSelected: isHMCSelected,
+                              isLiveCareAppointment: widget.isLiveCareAppointment,
+                    isDoctorSearchResult: widget.isDoctorSearchResult,
+                    onHospitalSelected: (hospital, index) {
+                          setState(() {
+                            selectedHospitalIndex = index;
+                                  _currentIndex = 3;
+                                  changePageViewIndex(3);
+                                });
+                              })
+                          : SizedBox.shrink(),
+                      (selectedRegion != '' && selectedHospitalIndex != -1)
+                          ? ResultByDoctor(
+                              doctorsList: widget.doctorsList,
+                              patientDoctorAppointmentListHospital: (!isHMCSelected)
+                                  ? widget
+                                          .patientDoctorAppointmentListHospital
+                                          .registeredDoctorMap![selectedRegion]!
+                                          .hmgDoctorList![selectedHospitalIndex]
+                                          .patientDoctorAppointmentList ??
+                                      []
+                                  : widget
+                                          .patientDoctorAppointmentListHospital
+                                          .registeredDoctorMap?[selectedRegion]
+                                          ?.hmcDoctorList?[
+                                              selectedHospitalIndex]
+                                          .patientDoctorAppointmentList ??
+                                      [],
+                              isLiveCareAppointment:
+                                  widget.isLiveCareAppointment,
+                              isDoctorSearchResult: widget.isDoctorSearchResult,
+                              isObGyneAppointment: widget.isObGyneAppointment,
+                              isDoctorNameSearch: widget.isDoctorNameSearch)
+                          : SizedBox.shrink(),
+                    ],
+            ),
+          ),
+        ]),
+      )
+          : getNoDataWidget(context),);
+  }
+
+  String getTitle() {
+    switch (_currentIndex) {
+      case 0:
+        return TranslationBase
+            .of(context)
+            .selectRegion;
+      case 1:
+        return TranslationBase
+            .of(context)
+            .selectFacitlity;
+      case 2:
+        return TranslationBase
+            .of(context)
+            .selectBranch;
+      case 3:
+        return TranslationBase
+            .of(context)
+            .selectDoctor;
+    }
+    return "";
+  }
+
+  void handleBackClick() {
+    switch (_currentIndex) {
+      case 1:
+        selectedHospitalIndex = -1;
+        selectedRegion = "";
+        _currentIndex = 0;
+        changePageViewIndex(0);
+        break;
+      case 2:
+        selectedHospitalIndex = -1;
+        _currentIndex = 1;
+        changePageViewIndex(1);
+        break;
+      case 3:
+        selectedHospitalIndex = -1;
+        _currentIndex = 2;
+        changePageViewIndex(2);
+        break;
+    }
+  }
+
+  Widget showProgress(
+      {String? title,
+      String? status,
+      Color? color,
+      bool isNeedBorder = true,
+      Function()? onTap}) {
+    return InkWell(
+      onTap: () {
+        if (status == TranslationBase
+            .of(context)
+            .completed) {
+          onTap?.call();
+        }
+      },
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  Container(
+                    width: 26,
+                    height: 26,
+                    decoration: containerRadius(color!, 200),
+                    child: Icon(
+                      Icons.done,
+                      color: Colors.white,
+                      size: 16,
+                    ),
+                  ),
+                  if (isNeedBorder)
+                    Expanded(
+                        child: Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: mDivider(Colors.grey),
+                        )),
+                ],
+              ),
+              mHeight(8),
+              Text(
+                title!,
+                style: TextStyle(
+                  fontSize: 11,
+                  fontWeight: FontWeight.w600,
+                  letterSpacing: -0.44,
+                ),
+              ),
+              mHeight(2),
+              Container(
+                padding: EdgeInsets.all(5),
+                decoration: containerRadius(color!.withOpacity(0.2), 4),
+                child: Text(
+                  status!,
+                  style: TextStyle(
+                    fontSize: 8,
+                    fontWeight: FontWeight.w600,
+                    letterSpacing: -0.32,
+                    color: color,
+                  ),
+                ),
+              ),
+            ],
+          )
+        ],
+      ),
+    );
+  }
+}
+
+class HospitalBodyWidget extends StatelessWidget {
+  final List<PatientDoctorAppointmentList>?
+  patientDoctorAppointmentListHospital;
+  final bool isLiveCareAppointment;
+  final bool isObGyneAppointment;
+  final bool isDoctorNameSearch;
+  final bool isDoctorSearchResult;
+  final OBGyneProcedureListResponse? obGyneProcedureListResponse;
+
+  const HospitalBodyWidget({
+    super.key,
+    this.patientDoctorAppointmentListHospital,
+    required this.isLiveCareAppointment,
+    required this.isObGyneAppointment,
+    required this.isDoctorNameSearch,
+    required this.isDoctorSearchResult,
+    this.obGyneProcedureListResponse,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.separated(
+      addAutomaticKeepAlives: true,
+      shrinkWrap: true,
+      physics: NeverScrollableScrollPhysics(),
+      itemCount: patientDoctorAppointmentListHospital?.length ?? 0,
+      separatorBuilder: (context, index) {
+        return Container(
+          height: 12,
+          margin: EdgeInsets.only(left: 21, right: 21),
+        );
+      },
+      itemBuilder: (context, index) {
+        return AppExpandableNotifier(
+          applyBackgroundColor: false,
+          widgetColor: CustomColors.appBackgroudGrey2Color,
+          title: (patientDoctorAppointmentListHospital?[index].distanceInKMs !=
+              "0")
+              ? patientDoctorAppointmentListHospital![index].filterName! +
+              " - " +
+              patientDoctorAppointmentListHospital![index].distanceInKMs! +
+              " " +
+              TranslationBase
+                  .of(context)
+                  .km
+              : patientDoctorAppointmentListHospital![index].filterName,
+          projectTitleTop:
+          patientDoctorAppointmentListHospital![index].projectTopName,
+          projectTitleBottom: (patientDoctorAppointmentListHospital![index]
+              .distanceInKMs !=
+              "0")
+              ? patientDoctorAppointmentListHospital![index]
+              .projectBottomName
+              .toString() +
+              " - " +
+              patientDoctorAppointmentListHospital![index].distanceInKMs! +
+              " " +
+              TranslationBase
+                  .of(context)
+                  .km
+              : patientDoctorAppointmentListHospital![index]
+              .projectBottomName
+              .toString(),
+          isTitleSingleLine: false,
+          isDoctorSearchResult: isDoctorSearchResult,
+          isExpand:
+          patientDoctorAppointmentListHospital?.length == 1 ? true : false,
+          bodyWidget: ListView.separated(
+              shrinkWrap: true,
+              physics: NeverScrollableScrollPhysics(),
+              padding:
+              EdgeInsets.only(bottom: 10, top: 10, left: 21, right: 21),
+              itemBuilder: (context, _index) {
+                // print("the index of patientDoctorAppointmentList is ${_index}");
+                // print("the index of parent is  ${index}");
+                final doctor = patientDoctorAppointmentListHospital![index]
+                    .patientDoctorAppointmentList![_index];
+                // print('the doctor is ${doctor.toJson()}');
+                return DoctorView(
+                    doctor: doctor,
+                    isLiveCareAppointment: isLiveCareAppointment,
+                    isObGyneAppointment: isObGyneAppointment,
+                    isDoctorNameSearch: isDoctorNameSearch,
+                    obGyneProcedureListResponse: obGyneProcedureListResponse,
+                    isShowDate: false,
+                    onTap: () {
+                      context
+                          .read<ProjectViewModel>()
+                          .analytics
+                          .appointment
+                          .book_appointment_select_doctor(
+                          appointment_type: 'regular', doctor: doctor);
+                    });
+              },
+              separatorBuilder: (context, index) => SizedBox(height: 14),
+              itemCount: patientDoctorAppointmentListHospital?[index]
+                  .patientDoctorAppointmentList?.length ?? 0),
+        );
+      },
+    );
+  }
+}
+
+class RegionTitle extends StatelessWidget {
+  final String title;
+  final String hmcCount;
+  final String hmgCount;
+
+  const RegionTitle({super.key,
+    required this.title,
+    required this.hmcCount,
+    required this.hmgCount});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            title,
+            style: TextStyle(
+                fontSize: 22, color: Colors.black, fontWeight: FontWeight.w700),
+          ),
+          SizedBox(
+            height: 8,
+          ),
+          Row(
+            children: [
+              Text(
+                "${TranslationBase.of(context).HospitalString(num.parse(hmgCount)).replaceAll("@", hmgCount)} ,",
+                style: TextStyle(
+                    fontSize: 14,
+                    color: Color(0xFFD02127),
+                    fontWeight: FontWeight.w600),
+              ),
+              SizedBox(
+                width: 8,
+              ),
+              Text(
+                "${TranslationBase.of(context).MedicalCenterString(num.parse(hmcCount)).replaceAll("@", hmcCount)}",
+                style: TextStyle(
+                    fontSize: 14,
+                    color: Color(0xFF40ACC9),
+                    fontWeight: FontWeight.w600),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class HospitalTitle extends StatelessWidget {
+  final String title;
+  final String iconUrl;
+  final bool isHMC;
+  final String itemCount;
+
+  const HospitalTitle({super.key,
+    required this.title,
+    required this.iconUrl,
+    required this.isHMC,
+    required this.itemCount});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              SvgPicture.asset(iconUrl),
+              SizedBox(
+                width: 8,
+              ),
+              Text(
+                title,
+                style: TextStyle(
+                    fontSize: 18,
+                    color: isHMC ? Color(0xFF40ACC9) : Color(0xFFD02127),
+                    fontWeight: FontWeight.w600),
+              ),
+            ],
+          ),
+          SizedBox(
+            height: 6,
+          ),
+          Text(
+            isHMC
+                ? "${TranslationBase.of(context).MedicalCenterString(num.parse(itemCount)).replaceAll("@", itemCount)}"
+                : "${TranslationBase.of(context).HospitalString(num.parse(itemCount)).replaceAll("@", itemCount)}",
+            style: TextStyle(
+                fontSize: 12, color: Colors.black, fontWeight: FontWeight.w600),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+
+///todo the current content of the application
+///  return AppExpandableNotifier(
+//               paddingValue: 10,
+//               applyBackgroundToOnlyHeader: true,
+//               completeHeaderColor: CustomColors.appBackgroudGrey2Color,
+//               headerWidget: RegionTitle(
+//                 title: key,
+//                 hmcCount:
+//                 "${widget.patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmcSize ?? 0}",
+//                 hmgCount:
+//                 "${widget.patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmgSize ?? 0}",
+//               ),
+//               showDropDownIconWithCustomHeader: true,
+//               isTitleSingleLine: false,
+//               isDoctorSearchResult: widget.isDoctorSearchResult,
+//               widgetColor: Color(0xFFF8F8F8),
+//               bodyWidget: Column(
+//                 children: [
+//                   Padding(
+//                     padding: const EdgeInsets.all(8.0),
+//                     child: AppExpandableNotifier(
+//                       paddingValue: 8,
+//                       applyBackgroundColor: false,
+//                       applyBackgroundToOnlyHeader: true,
+//                       completeHeaderColor: Colors.white,
+//                       headerRadius: BorderRadius.circular(16),
+//                       headerWidget: HospitalTitle(
+//                         iconUrl: 'assets/images/svg/HMG.svg',
+//                         title: TranslationBase.of(context).hmgHospital,
+//                         isHMC: false,
+//                         itemCount:
+//                         "${widget.patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmgSize ?? 0}",
+//                       ),
+//                       showDropDownIconWithCustomHeader: true,
+//                       bodyWidget: HospitalBodyWidget(
+//                         patientDoctorAppointmentListHospital:
+//                         widget.patientDoctorAppointmentListHospital
+//                             .registeredDoctorMap?[key]?.hmgDoctorList,
+//                         isLiveCareAppointment: widget.isLiveCareAppointment,
+//                         isObGyneAppointment: widget.isObGyneAppointment,
+//                         isDoctorNameSearch: widget.isDoctorNameSearch,
+//                         isDoctorSearchResult: widget.isDoctorSearchResult,
+//                       ),
+//                     ),
+//                   ),
+//                   Padding(
+//                     padding: const EdgeInsets.only(
+//                         bottom: 8.0, left: 8, right: 8),
+//                     child: AppExpandableNotifier(
+//                       paddingValue: 8,
+//                       applyBackgroundColor: false,
+//                       applyBackgroundToOnlyHeader: true,
+//                       completeHeaderColor: Colors.white,
+//                       headerRadius: BorderRadius.circular(16),
+//                       headerWidget: HospitalTitle(
+//                         iconUrl: 'assets/images/svg/HMC.svg',
+//                         title: TranslationBase.of(context).hmcHospital,
+//                         isHMC: true,
+//                         itemCount:
+//                         "${widget.patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmcSize ?? 0}",
+//                       ),
+//                       showDropDownIconWithCustomHeader: true,
+//                       bodyWidget: HospitalBodyWidget(
+//                         patientDoctorAppointmentListHospital:
+//                         widget.patientDoctorAppointmentListHospital
+//                             .registeredDoctorMap?[key]?.hmcDoctorList,
+//                         isLiveCareAppointment: widget.isLiveCareAppointment,
+//                         isObGyneAppointment: widget.isObGyneAppointment,
+//                         isDoctorNameSearch: widget.isDoctorNameSearch,
+//                         isDoctorSearchResult: widget.isDoctorSearchResult,
+//                       ),
+//                     ),
+//                   ),
+//                 ],
+//               ));
--- a/lib/pages/BookAppointment/search_result/SearchResultWithTabForHospital.dart
+++ b/lib/pages/BookAppointment/search_result/SearchResultWithTabForHospital.dart
@ -0,0 +1,853 @@
+import 'package:diplomaticquarterapp/config/size_config.dart';
+import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
+import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
+import 'package:diplomaticquarterapp/models/Appointments/OBGyneProcedureListResponse.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/search_result/ResultByClinic.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/search_result/ResultByDoctors.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/search_result/ResultByFacility.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/search_result/ResultByHospital.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/search_result/ResultByRegion.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/DoctorView.dart';
+import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
+import 'package:diplomaticquarterapp/services/appointment_services/doctor_response_mapper.dart';
+import 'package:diplomaticquarterapp/theme/colors.dart';
+import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
+import 'package:diplomaticquarterapp/widgets/others/app_expandable_notifier.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:provider/provider.dart';
+
+import '../../../config/shared_pref_kay.dart';
+import '../../../core/service/client/base_app_client.dart';
+
+class SearchResultWithTabForHospital extends StatefulWidget {
+  List<DoctorList> doctorsList = [];
+  RegionList patientDoctorAppointmentListHospital;
+  bool isLiveCareAppointment;
+  bool isObGyneAppointment;
+  bool isDoctorNameSearch;
+  OBGyneProcedureListResponse? obGyneProcedureListResponse;
+  bool isDoctorSearchResult;
+
+  bool isForHospital;
+
+  SearchResultWithTabForHospital({
+    required this.doctorsList,
+    required this.patientDoctorAppointmentListHospital,
+    this.isObGyneAppointment = false,
+    this.isDoctorNameSearch = false,
+    required this.isLiveCareAppointment,
+    required this.isDoctorSearchResult,
+    this.obGyneProcedureListResponse,
+    this.isForHospital = true,
+  });
+
+  @override
+  State<SearchResultWithTabForHospital> createState() =>
+      _SearchResultWithTabForHospitalState();
+}
+
+class _SearchResultWithTabForHospitalState
+    extends State<SearchResultWithTabForHospital> {
+  int _currentIndex = 0;
+  late PageController _controller;
+  String selectedRegion = "";
+  HospitalsModel? selectedHospital;
+  bool isHMCSelected = false;
+  int selectedHospitalIndex = -1;
+  ScrollController scrollController = ScrollController();
+  RegionList? doctorList;
+  bool nearestAppointment= false;
+  int clinicId = -1;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = new PageController();
+  }
+
+  changePageViewIndex(pageIndex) {
+    _controller.jumpToPage(pageIndex);
+    // if (scrollController.hasClients) {
+    //   print("it has clients");
+    // scrollController.animateTo(pageIndex.toDouble(),curve: Curves.easeOut,
+    //   duration: const Duration(milliseconds: 300),);}
+  }
+
+  void handleBackClick() {
+    switch (_currentIndex) {
+      case 1:
+        selectedHospitalIndex = -1;
+        selectedRegion = "";
+        doctorList = null;
+        _currentIndex = 0;
+        changePageViewIndex(0);
+        break;
+      case 2:
+        selectedHospitalIndex = -1;
+        doctorList = null;
+        _currentIndex = 1;
+        changePageViewIndex(1);
+        break;
+      case 3:
+        selectedHospitalIndex = -1;
+        doctorList = null;
+        _currentIndex = 2;
+        changePageViewIndex(2);
+        break;
+      case 4:
+        _currentIndex = 3;
+        doctorList = null;
+        changePageViewIndex(3);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      child: widget.patientDoctorAppointmentListHospital.registeredDoctorMap
+                  ?.isNotEmpty ==
+              true
+          ? SizedBox(
+              height: SizeConfig.realScreenHeight! * .9,
+              width: SizeConfig.realScreenWidth,
+              child: Column(children: <Widget>[
+                Container(
+                  width: double.infinity,
+                  padding: EdgeInsets.only(left: 20, right: 20, top: 12),
+                  child: SizedBox(
+                    height: 100,
+                    child: ListView(
+                      scrollDirection: Axis.horizontal,
+                      controller: scrollController,
+                      children: [
+                        SizedBox(
+                          width: MediaQuery.of(context).size.width / 5.2,
+                          child: showProgress(
+                            title: TranslationBase.of(context).selectRegion,
+                            status: _currentIndex == 0
+                                ? TranslationBase.of(context).inPrgress
+                                : _currentIndex > 0
+                                    ? TranslationBase.of(context).completed
+                                    : TranslationBase.of(context).locked,
+                            color: _currentIndex == 0
+                                ? CustomColors.orange
+                                : CustomColors.green,
+                            onTap: () {
+                              setState(() {
+                                selectedHospitalIndex = -1;
+                                selectedRegion = "";
+                                doctorList = null;
+                                _currentIndex = 0;
+                                changePageViewIndex(0);
+                                nearestAppointment = false;
+                                clinicId = -1;
+                              });
+                            },
+                          ),
+                        ),
+                        SizedBox(
+                          width: MediaQuery.of(context).size.width / 5.2,
+                          child: showProgress(
+                            title: TranslationBase.of(context).selectFacitlity,
+                            status: _currentIndex == 1
+                                ? TranslationBase.of(context).inPrgress
+                                : _currentIndex > 1
+                                    ? TranslationBase.of(context).completed
+                                    : TranslationBase.of(context).locked,
+                            color: _currentIndex == 1
+                                ? CustomColors.orange
+                                : _currentIndex > 1
+                                    ? CustomColors.green
+                                    : CustomColors.grey2,
+                            onTap: () {
+                              setState(() {
+                                selectedHospitalIndex = -1;
+                                doctorList = null;
+                                _currentIndex = 1;
+                                changePageViewIndex(1);
+                                nearestAppointment = false;
+                                clinicId = -1;
+
+                              });
+                            },
+                          ),
+                        ),
+                        SizedBox(
+                          width: MediaQuery.of(context).size.width / 5.2,
+                          child: showProgress(
+                            title: TranslationBase.of(context).selectBranch,
+                            status: _currentIndex == 2
+                                ? TranslationBase.of(context).inPrgress
+                                : _currentIndex > 1
+                                    ? TranslationBase.of(context).completed
+                                    : TranslationBase.of(context).locked,
+                            color: _currentIndex == 2
+                                ? CustomColors.orange
+                                : _currentIndex > 2
+                                    ? CustomColors.green
+                                    : CustomColors.grey2,
+                            onTap: () {
+                              setState(() {
+                                selectedHospitalIndex = -1;
+                                doctorList = null;
+                                _currentIndex = 2;
+                                changePageViewIndex(2);
+                                nearestAppointment = false;
+                                clinicId = -1;
+
+                              });
+                            },
+                          ),
+                        ),
+                        SizedBox(
+                          width: MediaQuery.of(context).size.width / 5.2,
+                          child: showProgress(
+                            title: TranslationBase.of(context).selectClinic,
+                            status: _currentIndex == 3
+                                ? TranslationBase.of(context).inPrgress
+                                : _currentIndex > 3
+                                    ? TranslationBase.of(context).completed
+                                    : TranslationBase.of(context).locked,
+                            color: _currentIndex == 3
+                                ? CustomColors.orange
+                                : _currentIndex > 3
+                                    ? CustomColors.green
+                                    : CustomColors.grey2,
+                            onTap: () {
+                              setState(() {
+                                doctorList = null;
+                                changePageViewIndex(3);
+                                _currentIndex = 3;
+                                nearestAppointment= false;
+                                clinicId = -1;
+
+                              });
+                            },
+                          ),
+                        ),
+                        SizedBox(
+                          width: MediaQuery.of(context).size.width / 5.2,
+                          child: showProgress(
+                            title: TranslationBase.of(context).selectDoctor,
+                            status: _currentIndex ==
+                                    ((widget.isForHospital) ? 4 : 3)
+                                ? TranslationBase.of(context).inPrgress
+                                : TranslationBase.of(context).locked,
+                            color: _currentIndex ==
+                                    ((widget.isForHospital) ? 4 : 3)
+                                ? CustomColors.orange
+                                : _currentIndex ==
+                                        ((widget.isForHospital) ? 5 : 4)
+                                    ? CustomColors.green
+                                    : CustomColors.grey2,
+                            isNeedBorder: false,
+                            onTap: () {
+                              setState(() {
+                                _currentIndex =
+                                    ((widget.isForHospital) ? 4 : 3);
+                                changePageViewIndex(_currentIndex);
+                              });
+                            },
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+                Padding(
+                  padding:
+                      const EdgeInsetsDirectional.fromSTEB(10.0, 18, 0, 24),
+                  child: Row(
+                    children: [
+                      (_currentIndex != 0)
+                          ? InkWell(
+                              onTap: () {
+                                handleBackClick();
+                              },
+                              child: Padding(
+                                padding: const EdgeInsetsDirectional.fromSTEB(
+                                    0, 0, 04, 0),
+                                child: Icon(
+                                  Icons.arrow_back,
+                                  color: Theme.of(context).primaryColor,
+                                ),
+                              ),
+                            )
+                          : mWidth(24),
+                      Text(
+                        getTitle(),
+                        style: TextStyle(
+                            fontSize: 18,
+                            fontWeight: FontWeight.w600,
+                            color: Colors.black),
+                      )
+                    ],
+                  ),
+                ),
+                // mHeight(24),
+                Expanded(
+                  child: PageView(
+                    physics: NeverScrollableScrollPhysics(),
+                    controller: _controller,
+                    onPageChanged: (index) {
+                      setState(() {
+                        _currentIndex = index;
+                      });
+                    },
+                    scrollDirection: Axis.horizontal,
+                    children: <Widget>[
+                      ResultByRegion(
+                          doctorsList: widget.doctorsList,
+                          patientDoctorAppointmentListHospital:
+                              widget.patientDoctorAppointmentListHospital,
+                          onRegionSelected: (key) {
+                            setState(() {
+                              selectedRegion = key;
+                              _currentIndex = 1;
+                              changePageViewIndex(1);
+                            });
+                          }),
+                      (selectedRegion != "")
+                          ? ResultByFacility(
+                              doctorsList: widget.doctorsList,
+                              patientDoctorAppointmentListHospital:
+                                  widget.patientDoctorAppointmentListHospital,
+                              selectedRegion: selectedRegion,
+                              onFacilitySelected: (isHMCSelected) {
+                                setState(() {
+                                  this.isHMCSelected = isHMCSelected;
+                                  _currentIndex = 2;
+                                  changePageViewIndex(2);
+                                });
+                              },
+                            )
+                          : SizedBox.shrink(),
+                      (selectedRegion != '')
+                          ? ResultByHospital(
+                              doctorsList: widget.doctorsList,
+                              paitientDoctorAppointmentList: (isHMCSelected)
+                                  ? widget
+                                          .patientDoctorAppointmentListHospital
+                                          .registeredDoctorMap![selectedRegion]!
+                                          .hmcDoctorList ??
+                                      []
+                                  : widget
+                                          .patientDoctorAppointmentListHospital
+                                          .registeredDoctorMap?[selectedRegion]
+                                          ?.hmgDoctorList ??
+                                      [],
+                              isHMCSelected: isHMCSelected,
+                              isLiveCareAppointment:
+                                  widget.isLiveCareAppointment,
+                              isDoctorSearchResult: widget.isDoctorSearchResult,
+                              onHospitalSelected: (hospitalName, index) {
+                                setState(() {
+                                  selectedHospitalIndex = index;
+                                  selectedHospital = (!isHMCSelected)
+                                      ? widget
+                                          .patientDoctorAppointmentListHospital
+                                          .registeredDoctorMap![selectedRegion]!
+                                          .hmgDoctorList![selectedHospitalIndex]
+                                          .hospitalList
+                                          .first
+                                      : widget
+                                          .patientDoctorAppointmentListHospital
+                                          .registeredDoctorMap![selectedRegion]!
+                                          .hmcDoctorList![selectedHospitalIndex]
+                                          .hospitalList
+                                          .first;
+                                  _currentIndex = 3;
+                                  changePageViewIndex(3);
+                                });
+                              })
+                          : SizedBox.shrink(),
+                      (selectedHospital != null &&
+                              selectedRegion != '' &&
+                              selectedHospitalIndex != -1)
+                          ? ResultByClinic(
+                              onClinicSelected: (doctorList, clinicId) {
+                                setState(() {
+                                  this.nearestAppointment = false;
+                                  this.doctorList = doctorList;
+                                  _currentIndex = 4;
+                                  changePageViewIndex(4);
+                                  if(clinicId !=  null)
+                                    this.clinicId = clinicId;
+                                });
+                              },
+                              selectedValue: selectedHospital)
+                          : SizedBox.shrink(),
+                      (selectedRegion != '' &&
+                              selectedHospitalIndex != -1 &&
+                              doctorList != null)
+                          ? ResultByDoctor(
+                              doctorsList: widget.doctorsList,
+                              patientDoctorAppointmentListHospital:
+                                  (!isHMCSelected)
+                                      ? doctorList!
+                                              .registeredDoctorMap![
+                                                  selectedRegion]!
+                                              .hmgDoctorList!
+                                              .first
+                                              .patientDoctorAppointmentList ??
+                                          []
+                                      : doctorList!
+                                              .registeredDoctorMap?[
+                                                  selectedRegion]
+                                              ?.hmcDoctorList!
+                                              .first
+                                              .patientDoctorAppointmentList ??
+                                          [],
+                              isLiveCareAppointment:
+                                  widget.isLiveCareAppointment,
+                              isDoctorSearchResult: widget.isDoctorSearchResult,
+                              isObGyneAppointment: widget.isObGyneAppointment,
+                              isDoctorNameSearch: widget.isDoctorNameSearch,
+                              showNearestAppointment: clinicId != -1 ,
+                              nearestAppointmentDoctors:  nearestAppointment,
+                              refreshDoctorList: (isNearestAppointmentChecked){
+                                setState(() {
+                                  // changePageViewIndex(3);
+                                  // _currentIndex = 3;
+                                  nearestAppointment= false;
+                                });
+                                callDoctorsSearchAPI(clinicId, isNearestAppointmentChecked);
+                              },
+
+                      )
+                          : SizedBox.shrink(),
+                    ],
+                  ),
+                ),
+              ]),
+            )
+          : getNoDataWidget(context),
+    );
+  }
+
+  callDoctorsSearchAPI(int clinicID, bool nearestAppointment) {
+    var isArabic = context.read<ProjectViewModel>().isArabic;
+    int languageID = isArabic ? 1 : 2;
+    GifLoaderDialogUtils.showMyDialog(context);
+    List<DoctorList> doctorsList = [];
+    List<String> arr = [];
+    List<String> arrDistance = [];
+    List<String> result;
+    int numAll;
+    List<PatientDoctorAppointmentList> _patientDoctorAppointmentListHospital = [];
+
+    DoctorsListService service = new DoctorsListService();
+    service
+        .getDoctorsList(clinicID, selectedHospital?.mainProjectID.toString() != "" ? int.parse(selectedHospital?.mainProjectID.toString() ?? "-1") : 0, nearestAppointment, languageID, null)
+        .then((res) async {
+      GifLoaderDialogUtils.hideDialog(context);
+      if (res['MessageStatus'] == 1) {
+        RegionList regionHospitalList = RegionList();
+
+        if (res['DoctorList'].length != 0) {
+          res['DoctorList'].forEach((v) {
+            doctorsList.add(new DoctorList.fromJson(
+              v,
+            ));
+          });
+
+          regionHospitalList = await DoctorMapper.getMappedDoctor(doctorsList, isArabic: isArabic);
+          var lat = await sharedPref.getDouble(USER_LAT);
+
+          var lng = await sharedPref.getDouble(USER_LONG);
+          var isLocationEnabled = (lat != null && lat != 0.0) && (lng != null && lng != 0.0);
+          regionHospitalList = await DoctorMapper.sortList(isLocationEnabled, regionHospitalList);
+
+          setState(() {
+            this.doctorList = regionHospitalList;
+            _currentIndex = 4;
+            changePageViewIndex(4);
+            this.nearestAppointment = nearestAppointment;
+          });
+        } else {
+          GifLoaderDialogUtils.hideDialog(context);
+          AppToast.showErrorToast(message: res['ErrorSearchMsg']);
+        }
+
+        GifLoaderDialogUtils.hideDialog(context);
+        // navigateToSearchResults(context, doctorsList, _patientDoctorAppointmentListHospital);
+      } else {
+        GifLoaderDialogUtils.hideDialog(context);
+        AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
+      }
+    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      print(err);
+      AppToast.showErrorToast(message: err, localContext: context);
+    });
+  }
+  String getTitle() {
+    switch (_currentIndex) {
+      case 0:
+        return TranslationBase.of(context).selectRegion;
+      case 1:
+        return TranslationBase.of(context).selectFacitlity;
+      case 2:
+        return TranslationBase.of(context).selectBranch;
+      case 3:
+        return TranslationBase.of(context).selectClinic;
+      case 4:
+        return TranslationBase.of(context).selectDoctor;
+    }
+    return "";
+  }
+
+  Widget showProgress(
+      {String? title,
+      String? status,
+      Color? color,
+      bool isNeedBorder = true,
+      Function()? onTap}) {
+    return InkWell(
+      onTap: () {
+        if (status == TranslationBase.of(context).completed) {
+          onTap?.call();
+        }
+      },
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  Container(
+                    width: 26,
+                    height: 26,
+                    decoration: containerRadius(color!, 200),
+                    child: Icon(
+                      Icons.done,
+                      color: Colors.white,
+                      size: 16,
+                    ),
+                  ),
+                  if (isNeedBorder)
+                    Expanded(
+                        child: Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: mDivider(Colors.grey),
+                    )),
+                ],
+              ),
+              mHeight(8),
+              Text(
+                title!,
+                style: TextStyle(
+                  fontSize: 10,
+                  fontWeight: FontWeight.w500,
+                  letterSpacing: -0.44,
+                ),
+              ),
+              mHeight(2),
+              Container(
+                padding: EdgeInsets.all(5),
+                decoration: containerRadius(color!.withOpacity(0.2), 4),
+                child: Text(
+                  status!,
+                  style: TextStyle(
+                    fontSize: 8,
+                    fontWeight: FontWeight.w600,
+                    letterSpacing: -0.32,
+                    color: color,
+                  ),
+                ),
+              ),
+            ],
+          )
+        ],
+      ),
+    );
+  }
+}
+
+class HospitalBodyWidget extends StatelessWidget {
+  final List<PatientDoctorAppointmentList>?
+      patientDoctorAppointmentListHospital;
+  final bool isLiveCareAppointment;
+  final bool isObGyneAppointment;
+  final bool isDoctorNameSearch;
+  final bool isDoctorSearchResult;
+  final OBGyneProcedureListResponse? obGyneProcedureListResponse;
+
+  const HospitalBodyWidget({
+    super.key,
+    this.patientDoctorAppointmentListHospital,
+    required this.isLiveCareAppointment,
+    required this.isObGyneAppointment,
+    required this.isDoctorNameSearch,
+    required this.isDoctorSearchResult,
+    this.obGyneProcedureListResponse,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.separated(
+      addAutomaticKeepAlives: true,
+      shrinkWrap: true,
+      physics: NeverScrollableScrollPhysics(),
+      itemCount: patientDoctorAppointmentListHospital?.length ?? 0,
+      separatorBuilder: (context, index) {
+        return Container(
+          height: 12,
+          margin: EdgeInsets.only(left: 21, right: 21),
+        );
+      },
+      itemBuilder: (context, index) {
+        return AppExpandableNotifier(
+          applyBackgroundColor: false,
+          widgetColor: CustomColors.appBackgroudGrey2Color,
+          title: (patientDoctorAppointmentListHospital?[index].distanceInKMs !=
+                  "0")
+              ? patientDoctorAppointmentListHospital![index].filterName! +
+                  " - " +
+                  patientDoctorAppointmentListHospital![index].distanceInKMs! +
+                  " " +
+                  TranslationBase.of(context).km
+              : patientDoctorAppointmentListHospital![index].filterName,
+          projectTitleTop:
+              patientDoctorAppointmentListHospital![index].projectTopName,
+          projectTitleBottom: (patientDoctorAppointmentListHospital![index]
+                      .distanceInKMs !=
+                  "0")
+              ? patientDoctorAppointmentListHospital![index]
+                      .projectBottomName
+                      .toString() +
+                  " - " +
+                  patientDoctorAppointmentListHospital![index].distanceInKMs! +
+                  " " +
+                  TranslationBase.of(context).km
+              : patientDoctorAppointmentListHospital![index]
+                  .projectBottomName
+                  .toString(),
+          isTitleSingleLine: false,
+          isDoctorSearchResult: isDoctorSearchResult,
+          isExpand:
+              patientDoctorAppointmentListHospital?.length == 1 ? true : false,
+          bodyWidget: ListView.separated(
+              shrinkWrap: true,
+              physics: NeverScrollableScrollPhysics(),
+              padding:
+                  EdgeInsets.only(bottom: 10, top: 10, left: 21, right: 21),
+              itemBuilder: (context, _index) {
+                // print("the index of patientDoctorAppointmentList is ${_index}");
+                // print("the index of parent is  ${index}");
+                final doctor = patientDoctorAppointmentListHospital![index]
+                    .patientDoctorAppointmentList![_index];
+                // print('the doctor is ${doctor.toJson()}');
+                return DoctorView(
+                    doctor: doctor,
+                    isLiveCareAppointment: isLiveCareAppointment,
+                    isObGyneAppointment: isObGyneAppointment,
+                    isDoctorNameSearch: isDoctorNameSearch,
+                    obGyneProcedureListResponse: obGyneProcedureListResponse,
+                    isShowDate: false,
+                    onTap: () {
+                      context
+                          .read<ProjectViewModel>()
+                          .analytics
+                          .appointment
+                          .book_appointment_select_doctor(
+                              appointment_type: 'regular', doctor: doctor);
+                    });
+              },
+              separatorBuilder: (context, index) => SizedBox(height: 14),
+              itemCount: patientDoctorAppointmentListHospital?[index]
+                      .patientDoctorAppointmentList
+                      ?.length ??
+                  0),
+        );
+      },
+    );
+  }
+}
+
+class RegionTitle extends StatelessWidget {
+  final String title;
+  final String hmcCount;
+  final String hmgCount;
+
+  const RegionTitle(
+      {super.key,
+      required this.title,
+      required this.hmcCount,
+      required this.hmgCount});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            title,
+            style: TextStyle(
+                fontSize: 22, color: Colors.black, fontWeight: FontWeight.w700),
+          ),
+          SizedBox(
+            height: 8,
+          ),
+          Row(
+            children: [
+              Text(
+                "${TranslationBase.of(context).HospitalString(num.parse(hmgCount)).replaceAll("@", hmgCount)} ,",
+                style: TextStyle(
+                    fontSize: 14,
+                    color: Color(0xFFD02127),
+                    fontWeight: FontWeight.w600),
+              ),
+              SizedBox(
+                width: 8,
+              ),
+              Text(
+                "${TranslationBase.of(context).MedicalCenterString(num.parse(hmcCount)).replaceAll("@", hmcCount)}",
+                style: TextStyle(
+                    fontSize: 14,
+                    color: Color(0xFF40ACC9),
+                    fontWeight: FontWeight.w600),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class HospitalTitle extends StatelessWidget {
+  final String title;
+  final String iconUrl;
+  final bool isHMC;
+  final String itemCount;
+
+  const HospitalTitle(
+      {super.key,
+      required this.title,
+      required this.iconUrl,
+      required this.isHMC,
+      required this.itemCount});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              SvgPicture.asset(iconUrl),
+              SizedBox(
+                width: 8,
+              ),
+              Text(
+                title,
+                style: TextStyle(
+                    fontSize: 18,
+                    color: isHMC ? Color(0xFF40ACC9) : Color(0xFFD02127),
+                    fontWeight: FontWeight.w600),
+              ),
+            ],
+          ),
+          SizedBox(
+            height: 6,
+          ),
+          Text(
+            isHMC
+                ? "${TranslationBase.of(context).MedicalCenterString(num.parse(itemCount)).replaceAll("@", itemCount)}"
+                : "${TranslationBase.of(context).HospitalString(num.parse(itemCount)).replaceAll("@", itemCount)}",
+            style: TextStyle(
+                fontSize: 12, color: Colors.black, fontWeight: FontWeight.w600),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+///todo the current content of the application
+///  return AppExpandableNotifier(
+//               paddingValue: 10,
+//               applyBackgroundToOnlyHeader: true,
+//               completeHeaderColor: CustomColors.appBackgroudGrey2Color,
+//               headerWidget: RegionTitle(
+//                 title: key,
+//                 hmcCount:
+//                 "${widget.patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmcSize ?? 0}",
+//                 hmgCount:
+//                 "${widget.patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmgSize ?? 0}",
+//               ),
+//               showDropDownIconWithCustomHeader: true,
+//               isTitleSingleLine: false,
+//               isDoctorSearchResult: widget.isDoctorSearchResult,
+//               widgetColor: Color(0xFFF8F8F8),
+//               bodyWidget: Column(
+//                 children: [
+//                   Padding(
+//                     padding: const EdgeInsets.all(8.0),
+//                     child: AppExpandableNotifier(
+//                       paddingValue: 8,
+//                       applyBackgroundColor: false,
+//                       applyBackgroundToOnlyHeader: true,
+//                       completeHeaderColor: Colors.white,
+//                       headerRadius: BorderRadius.circular(16),
+//                       headerWidget: HospitalTitle(
+//                         iconUrl: 'assets/images/svg/HMG.svg',
+//                         title: TranslationBase.of(context).hmgHospital,
+//                         isHMC: false,
+//                         itemCount:
+//                         "${widget.patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmgSize ?? 0}",
+//                       ),
+//                       showDropDownIconWithCustomHeader: true,
+//                       bodyWidget: HospitalBodyWidget(
+//                         patientDoctorAppointmentListHospital:
+//                         widget.patientDoctorAppointmentListHospital
+//                             .registeredDoctorMap?[key]?.hmgDoctorList,
+//                         isLiveCareAppointment: widget.isLiveCareAppointment,
+//                         isObGyneAppointment: widget.isObGyneAppointment,
+//                         isDoctorNameSearch: widget.isDoctorNameSearch,
+//                         isDoctorSearchResult: widget.isDoctorSearchResult,
+//                       ),
+//                     ),
+//                   ),
+//                   Padding(
+//                     padding: const EdgeInsets.only(
+//                         bottom: 8.0, left: 8, right: 8),
+//                     child: AppExpandableNotifier(
+//                       paddingValue: 8,
+//                       applyBackgroundColor: false,
+//                       applyBackgroundToOnlyHeader: true,
+//                       completeHeaderColor: Colors.white,
+//                       headerRadius: BorderRadius.circular(16),
+//                       headerWidget: HospitalTitle(
+//                         iconUrl: 'assets/images/svg/HMC.svg',
+//                         title: TranslationBase.of(context).hmcHospital,
+//                         isHMC: true,
+//                         itemCount:
+//                         "${widget.patientDoctorAppointmentListHospital.registeredDoctorMap?[key]?.hmcSize ?? 0}",
+//                       ),
+//                       showDropDownIconWithCustomHeader: true,
+//                       bodyWidget: HospitalBodyWidget(
+//                         patientDoctorAppointmentListHospital:
+//                         widget.patientDoctorAppointmentListHospital
+//                             .registeredDoctorMap?[key]?.hmcDoctorList,
+//                         isLiveCareAppointment: widget.isLiveCareAppointment,
+//                         isObGyneAppointment: widget.isObGyneAppointment,
+//                         isDoctorNameSearch: widget.isDoctorNameSearch,
+//                         isDoctorSearchResult: widget.isDoctorSearchResult,
+//                       ),
+//                     ),
+//                   ),
+//                 ],
+//               ));
--- a/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
+++ b/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/models/Appointments/DentalChiefComplaintsModel.dart';
 import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
 import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart';
+import 'package:diplomaticquarterapp/services/appointment_services/doctor_response_mapper.dart';
 import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
@ -16,8 +17,15 @@ class DentalComplaintCard extends StatefulWidget {
  var languageID;
  Function? onSelectedMethod;
  bool isDoctorNameSearch;
+  bool isFromHospitalSearchPage;
+  Function(RegionList)? onDoctorFetched;

-  DentalComplaintCard({required this.listDentalChiefComplain, this.languageID, this.onSelectedMethod, this.isDoctorNameSearch = false});
+  DentalComplaintCard({required this.listDentalChiefComplain,
+    this.languageID,
+    this.onSelectedMethod,
+    this.isDoctorNameSearch = false,
+    this.isFromHospitalSearchPage = false,
+    this.onDoctorFetched});

  @override
  _DentalComplaintCardState createState() => _DentalComplaintCardState();
@ -33,7 +41,10 @@ class _DentalComplaintCardState extends State<DentalComplaintCard> {
          // if(widget.isDoctorNameSearch) {
          //   widget.onSelectedMethod();
          // } else {
-          getChiefComplaintsList();
+          if (widget.isFromHospitalSearchPage) {
+            getChiefComplaintsDoctorMappedList();
+          } else
+            getChiefComplaintsList();
          // }
        },
        child: Container(
@ -110,4 +121,41 @@ class _DentalComplaintCardState extends State<DentalComplaintCard> {
  Future navigateToSearchResults(context, List<DoctorList> docList, List<PatientDoctorAppointmentList> patientDoctorAppointmentListHospital) async {
    Navigator.push(context, FadePage(page: SearchResults(doctorsList: docList, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital, isLiveCareAppointment: false, isDoctorSearchResult: true,)));
  }
+
+  void getChiefComplaintsDoctorMappedList() {
+    var isArabic = context.read<ProjectViewModel>().isArabic;
+    int languageID =
+        Provider.of<ProjectViewModel>(context, listen: false).isArabic ? 1 : 2;
+    List<DoctorList> doctorsList = [];
+    List<PatientDoctorAppointmentList> _patientDoctorAppointmentListHospital =
+        [];
+
+    GifLoaderDialogUtils.showMyDialog(context);
+    ClinicListService service = new ClinicListService();
+    service
+        .getChiefComplaintDoctorList(widget.listDentalChiefComplain!.iD!,
+            widget.listDentalChiefComplain.projectID!, languageID, context)
+        .then((res) async {
+      GifLoaderDialogUtils.hideDialog(context);
+      if (res['MessageStatus'] == 1) {
+        RegionList regionHospitalList = RegionList();
+        print(res['List_DentalDoctorChiefComplaintMapping']);
+        setState(() async {
+          doctorsList.clear();
+          res['List_DentalDoctorChiefComplaintMapping'].forEach((v) {
+            doctorsList.add(new DoctorList.fromJson(v));
+          });
+
+          regionHospitalList = await DoctorMapper.getMappedDoctor(doctorsList,
+              isArabic: isArabic);
+          widget.onDoctorFetched?.call(regionHospitalList);
+        });
+      } else {
+        AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
+      }
+    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      print(err);
+    });
+  }
 }
--- a/lib/pages/BookAppointment/widgets/DoctorView.dart
+++ b/lib/pages/BookAppointment/widgets/DoctorView.dart
@ -49,13 +49,12 @@ class DoctorView extends StatefulWidget {
  State<DoctorView> createState() => _DoctorViewState();
 }

-class _DoctorViewState extends State<DoctorView> with AutomaticKeepAliveClientMixin {
+class _DoctorViewState extends State<DoctorView> {
  late ProjectViewModel projectViewModel;

  @override
  Widget build(BuildContext context) {
    projectViewModel = Provider.of(context);
-    super.build(context);
    return InkWell(
      onTap: () {
        if (widget.isObGyneAppointment) {
@ -79,7 +78,7 @@ class _DoctorViewState extends State<DoctorView> with AutomaticKeepAliveClientMi
              BoxShadow(
                color: Color(0xff000000).withOpacity(.05),
                //spreadRadius: 5,
-                blurRadius: 27,
+                blurRadius: 5,
                offset: Offset(0, -3),
              ),
            ],
@ -98,12 +97,12 @@ class _DoctorViewState extends State<DoctorView> with AutomaticKeepAliveClientMi
                      style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
                    ),
                  ),
-                  widget.isShowDate
-                      ? Text(
-                          DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(widget.doctor.date)),
-                          style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12),
-                        )
-                      : Container(),
+                  // widget.isShowDate
+                  //     ? Text(
+                  //         DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(widget.doctor.date)),
+                  //         style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12),
+                  //       )
+                  //     : Container(),
                ],
              ),
              if (widget.doctor.doctorTitle != null) SizedBox(height: 6),
--- a/lib/pages/DrawerPages/family/my-family.dart
+++ b/lib/pages/DrawerPages/family/my-family.dart
@ -14,6 +14,8 @@ import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.
 import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
 import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart' as list;
 import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart';
+import 'package:diplomaticquarterapp/models/InPatientServices/get_admission_info_response_model.dart';
+import 'package:diplomaticquarterapp/models/InPatientServices/get_admission_request_info_response_model.dart';
 import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
 import 'package:diplomaticquarterapp/pages/rateAppointment/rate_appointment_doctor.dart';
 import 'package:diplomaticquarterapp/routes.dart';
@ -467,6 +469,42 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
    });
  }

+  checkIfIsInPatient(BuildContext context) {
+    bool isAdmitted = false;
+    bool hasAdmissionRequest = false;
+    GetAdmissionInfoResponseModel getAdmissionInfoResponseModel;
+    GetAdmissionRequestInfoResponseModel getAdmissionRequestInfoResponseModel;
+    ClinicListService service = new ClinicListService();
+    service.checkIfInPatientAPI(context).then((res) {
+      if (res['MessageStatus'] == 1) {
+        isAdmitted = res['isAdmitted'];
+        hasAdmissionRequest = res['hasAdmissionRequests'];
+        print("IS ADMITTED: $isAdmitted");
+        print("Has Admission Request: $hasAdmissionRequest");
+        if (isAdmitted) {
+          if (res['PatientAdmittedInformation'].length != 0) {
+            getAdmissionInfoResponseModel = GetAdmissionInfoResponseModel.fromJson(res['PatientAdmittedInformation'][0]);
+            projectViewModel.setInPatientProjectID(res['PatientAdmittedInformation'][0]['ProjectID']);
+            projectViewModel.setInPatientAdmissionInfo(getAdmissionInfoResponseModel);
+            projectViewModel.setIsPatientAdmitted(true);
+          }
+        }
+        if (hasAdmissionRequest) {
+          if (res['MedicalInstruction'].length != 0) {
+            getAdmissionRequestInfoResponseModel = GetAdmissionRequestInfoResponseModel.fromJson(res['MedicalInstruction'][0]);
+            // projectViewModel.setInPatientProjectID(res['MedicalInstruction'][0]['ProjectID']);
+            projectViewModel.setInPatientProjectID(res['MedicalInstruction'][0]['projectId']);
+            projectViewModel.setInPatientAdmissionRequest(getAdmissionRequestInfoResponseModel);
+            projectViewModel.setPatientHasAdmissionRequest(true);
+          }
+        }
+      } else {}
+    }).catchError((err) {
+      projectViewModel.setIsPatientAdmitted(false);
+      projectViewModel.setPatientHasAdmissionRequest(false);
+    });
+  }
+
  loginAfter(result, context) async {
    var currentLang = await sharedPref.getString(APP_LANGUAGE);
    Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).setPrivilege(privilegeList: result, isLoginChild: true);
@ -501,6 +539,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {

    try {
      // await appointmentRateViewModel.getIsLastAppointmentRatedList();
+      checkIfIsInPatient(context);
      await getToDoCount();
      if (appointmentRateViewModel.isHaveAppointmentNotRate) {
        Navigator.pushAndRemoveUntil(
--- a/lib/pages/ErService/AmbulanceRequestIndexPages/BillAmount.dart
+++ b/lib/pages/ErService/AmbulanceRequestIndexPages/BillAmount.dart
@ -8,6 +8,7 @@ import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';

 class BillAmount extends StatefulWidget {
  final Function changeCurrentTab;
@ -98,7 +99,13 @@ class _BillAmountState extends State<BillAmount> {
                              child: _getNormalText(TranslationBase.of(context).patientShareTotalToDo),
                            ),
                            Expanded(
-                              child: _getNormalText(TranslationBase.of(context).sar + ' ${widget.patientER_RC.patientERTransportationMethod!.priceTotal}', isBold: true, isTotal: true),
+                              child: Row(
+                                children: [
+                                  SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
+                                  mWidth(6),
+                                  _getNormalText(TranslationBase.of(context).sar + ' ${widget.patientER_RC.patientERTransportationMethod!.priceTotal}', isBold: true, isTotal: true),
+                                ],
+                              ),
                            )
                          ],
                        ),
--- a/lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart
+++ b/lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart
@ -22,6 +22,7 @@ import 'package:diplomaticquarterapp/widgets/pickupLocation/PickupLocationFromMa
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:provider/provider.dart';

 import '../AvailableAppointmentsPage.dart';
@ -48,7 +49,8 @@ class _PickupLocationState extends State<PickupLocation> {
  // double _longitude;
  AppoitmentAllHistoryResultList? myAppointment;
  HospitalsModel? _selectedHospital;
-  LocationDetails? _result ;
+  LocationDetails? _result;
+
  LocationUtils? locationUtils;
  late ProjectViewModel projectViewModel;

@ -519,9 +521,19 @@ class _PickupLocationState extends State<PickupLocation> {
                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                      children: [
                        Text(TranslationBase.of(context).patientShareTotalToDo, style: TextStyle(fontSize: 13.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
-                        Text(
-                          TranslationBase.of(context).sar + (widget.patientER_RC.transportationDetails!.tripType == 1 ? ' ${widget.patientER_RC.patientERTransportationMethod!.priceTotal}' : ' ${(widget.patientER_RC.patientERTransportationMethod!.priceTotal * 2)}'),
-                          style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold),
+                        Row(
+                          children: [
+                            projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
+                            mWidth(6),
+                            Text(
+                              (widget.patientER_RC.transportationDetails!.tripType == 1
+                                  ? ' ${widget.patientER_RC.patientERTransportationMethod!.priceTotal}'
+                                  : ' ${(widget.patientER_RC.patientERTransportationMethod!.priceTotal * 2)}'),
+                              style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold),
+                            ),
+                            mWidth(6),
+                            projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
+                          ],
                        ),
                      ],
                    )
--- a/lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart
+++ b/lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart
@ -11,6 +11,7 @@ import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:provider/provider.dart';

 enum Direction { ToHospital, FromHospital }
@ -123,13 +124,21 @@ class _SelectTransportationMethodState extends State<SelectTransportationMethod>
                              ),
                              Expanded(
                                flex: 1,
-                                child: Text(
-                                  TranslationBase.of(context).sar + ' ${widget.amRequestViewModel.amRequestModeList[index].priceTotal}',
-                                  style: TextStyle(
-                                    fontSize: 12.0,
-                                    letterSpacing: -0.48,
-                                    fontWeight: FontWeight.w600,
-                                  ),
+                                child: Row(
+                                  children: [
+                                    projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
+                                    mWidth(6),
+                                    Text(
+                                      ' ${widget.amRequestViewModel.amRequestModeList[index].priceTotal}',
+                                      style: TextStyle(
+                                        fontSize: 12.0,
+                                        letterSpacing: -0.48,
+                                        fontWeight: FontWeight.w600,
+                                      ),
+                                    ),
+                                    mWidth(6),
+                                    projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
+                                  ],
                                ),
                              )
                            ],
@ -325,9 +334,17 @@ class _SelectTransportationMethodState extends State<SelectTransportationMethod>
                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                      children: [
                        Text(TranslationBase.of(context).patientShareTotalToDo, style: TextStyle(fontSize: 13.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
-                        Text(
-                          TranslationBase.of(context).sar + (_way == Way.OneWay ? ' ${_erTransportationMethod.priceTotal}' : ' ${(_erTransportationMethod.priceTotal * 2)}'),
-                          style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold),
+                        Row(
+                          children: [
+                            projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
+                            mWidth(6),
+                            Text(
+                              (_way == Way.OneWay ? ' ${_erTransportationMethod.priceTotal}' : ' ${(_erTransportationMethod.priceTotal * 2)}'),
+                              style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold),
+                            ),
+                            mWidth(6),
+                            projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
+                          ],
                        ),
                      ],
                    )
--- a/lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
+++ b/lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';

@ -18,14 +19,14 @@ class Summary extends StatefulWidget {
  final PatientER_RC patientER_RC;
  final AmRequestViewModel amRequestViewModel;
  final TabController tabController;
-  Summary({Key? key, required  this.changeCurrentTab, required this.patientER, required this.patientER_RC, required this.amRequestViewModel, required this.tabController});
+
+  Summary({Key? key, required this.changeCurrentTab, required this.patientER, required this.patientER_RC, required this.amRequestViewModel, required this.tabController});

  @override
  _SummaryState createState() => _SummaryState();
 }

 class _SummaryState extends State<Summary> {
-
  @override
  Widget build(BuildContext context) {
    ProjectViewModel projectViewModel = Provider.of(context);
@ -129,12 +130,19 @@ class _SummaryState extends State<Summary> {
                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                      children: [
                        Text(TranslationBase.of(context).patientShareTotalToDo, style: TextStyle(fontSize: 13.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
-                        Text(
-                          TranslationBase.of(context).sar +
+                        Row(
+                          children: [
+                            projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
+                            mWidth(6),
+                            Text(
                              (widget.patientER_RC.transportationDetails!.tripType == 1
                                  ? ' ${widget.patientER_RC.patientERTransportationMethod!.priceTotal}'
                                  : ' ${(widget.patientER_RC.patientERTransportationMethod!.priceTotal * 2)}'),
-                          style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold),
+                              style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold),
+                            ),
+                            mWidth(6),
+                            projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
+                          ],
                        ),
                      ],
                    )
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
haroon amjad	8e3f20794d	Radiology ExamId updates	1 year ago
haroon amjad	c1dae542c9	tamara fix	1 year ago
haroon amjad	220c954a4a	updates	1 year ago
Syed Taha Alam	303e9114a3	Wd: Nearest appointemtn added in search by hospital	1 year ago
haroon amjad	fff45cd3a8	Update to stores VersionID 18.6	1 year ago
haroon amjad	1ee86d0813	PDF report implemented for Lab, Rad, Prescription, SickLeave & Medical Report.	1 year ago
haroon amjad	0c3ef15895	Privacy policy updates	1 year ago
haroon amjad	f7599a47e7	LiveCare Phone Call type Mobile number edit field disabled as per Mr Rwaid's instructions.	1 year ago
haroon amjad	a0528da4cd	fix for medical report & user agreement page	1 year ago
haroon amjad	cb68731679	updates & fixes	1 year ago
haroon amjad	f56a1627db	updates & fixes	1 year ago
haroon amjad	260edfa303	update to stores, VersionID 18.4	1 year ago
haroon amjad	5fc939bf1e	Merge branch 'dev_v3.13.6_deep_link' into dev_v3.13.6	1 year ago
haroon amjad	f621f8c8d1	fixes	1 year ago
taha.alam	f8a66a58f8	WD:new deeplink schema added. make it compatible to link as follows: * with https http and www * without www and containing http or https * only link e.g hmg.com/navigate	1 year ago
Syed Taha Alam	57415bd670	Merge remote-tracking branch 'origin/dev_v3.13.6_deep_link' into dev_v3.13.6_deep_link	1 year ago
Syed Taha Alam	390455e5a2	deeplink done	1 year ago
taha.alam	ec96fecf2f	WD:deeplink changes.	1 year ago
taha.alam	bdcda02b26	WD:deeplink changes.	1 year ago
taha.alam	68eab7639c	Merge dev_3.13.6 to deep_link	1 year ago
haroon amjad	cb7a444d83	fixes	1 year ago
haroon amjad	c1212c2c6a	Dental updates & fixes, Update to stores VersionID 18.3	1 year ago
haroon amjad	4564b42018	updates & fixes	1 year ago
haroon amjad	d921b1d081	Merge branch 'dev_v3.13.6_search_hospital_by_region' into dev_v3.13.6	1 year ago
haroon amjad	b308079255	updates & fixes	1 year ago
haroon amjad	7a821a4604	updates	1 year ago
haroon amjad	a2dd8f2e35	no message	1 year ago
haroon amjad	4cde49cb51	er checkin changes	1 year ago
taha.alam	bbf18baade	WD: 0 count hmg or hmc will not be displayed	1 year ago
taha.alam	2e9f6bcb51	WD: show nearest doctor item different for search clinic	1 year ago
Haroon Amjad	8d23ea6fda	Release Sent to stores, VersionID 18.2	1 year ago
taha.alam	9074bf2e65	WD:location icon added.	1 year ago
taha.alam	b46eb6214e	Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region	1 year ago
taha.alam	4b40d5d5a0	WD: Color of hospital name will be as of the type of it.	1 year ago
taha.alam	5dbd97aa46	WD: hospital name selection change	1 year ago
Haroon Amjad	556ff02e64	update sent to stores, VersionID 18.1	2 years ago
taha.alam	e3b75b18c8	WD: stepper back button added and text directionality added.	2 years ago
taha.alam	cb8eb316ec	Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	2 years ago
Syed Taha Alam	159135bb77	Wd: Item size changes.	2 years ago
taha.alam	88cd6f811a	WD: doctor screen issue changes and string changes of top bar	2 years ago
taha.alam	ca965a6d06	WD:String value change and context changes	2 years ago
taha.alam	e6fcb1fddf	WD:select hospital by region changes	2 years ago
taha.alam	951a5a4932	WD: search by region changes	2 years ago
Syed Taha Alam	ae4c287af2	new ui integrated.	2 years ago
taha.alam	8ffcebc44e	WD:deeplink changes.	2 years ago
haroon amjad	9590d268a0	Update sent to stores, VersionID 18.0	2 years ago
haroon amjad	a1600dbfce	LiveCare Terms & Conditions updated	2 years ago
haroon amjad	0dc32e061f	User agreement updates done.	2 years ago
haroon amjad	d865bd9c3b	user agreement updates	2 years ago
haroon amjad	7842f95d7b	livecare insurance navigation issue fixed	2 years ago
taha.alam	e876eaaa33	Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_deep_link # Conflicts: # pubspec.yaml	2 years ago
taha.alam	d4c741e1ec	Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region # Conflicts: # lib/uitl/translations_delegate_base.dart	2 years ago
haroon amjad	21fda7987a	Updates & fixes, App uploaded to Stores VersionID 17.9	2 years ago
taha.alam	e5198f093a	Merge branch 'dev_v3.13.6_deep_link' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_deep_link	2 years ago
taha.alam	e2efc3749c	WD:deeplink changes.	2 years ago
haroon amjad	91b9e792c6	updates	2 years ago
haroon amjad	c2785c5f68	Updates & fixes	2 years ago
haroon amjad	7ed401fb1c	Riyal symbol update & sent to stores VersionID 17.8	2 years ago
haroon amjad	0706d9f5f9	App update sent to Stores VersionID 17.7	2 years ago
haroon amjad	889828d4d4	Lab report download VIDA Plus implementation	2 years ago
haroon amjad	8b74c9df61	updates	2 years ago
sultan khan	e66e42edda	next day appointment updates	2 years ago
sultan khan	b93d373c6f	next appointment updated.	2 years ago
sultan khan	2c746bf783	next day appointments change.	2 years ago
taha.alam	81ddb81b8e	Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_deep_link	2 years ago
haroon amjad	3bf1e3fceb	Ask Dr error toast issue resolved	2 years ago
sultan khan	08965c72c8	Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_deep_link	2 years ago
haroon amjad	b445d1d59e	image added	2 years ago
haroon amjad	1080a59106	Lab report download enabled	2 years ago
Haroon Amjad	2c5be020e9	LanguageID added in Lab Report Email API	2 years ago
haroon amjad	7d33ace5c9	images added	2 years ago
haroon amjad	f74a3301da	SAR new symbol integrated	2 years ago
haroon amjad	744e3978d3	user agreement service privilege added	2 years ago
haroon amjad	a24582a578	InPatient check added in Family file switch	2 years ago
Haroon Amjad	04413aa7d6	lab report updates	2 years ago
taha.alam	6cf86e2e84	WIP: deeplink added to android and ios	2 years ago
taha.alam	06192292d0	WD: unresolved reference issue fixed	2 years ago
taha.alam	2a37777b9a	Merge branch 'dev_v3.13.6_search_hospital_by_region' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region	2 years ago
taha.alam	c2f38f1b7f	Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region # Conflicts: # android/app/build.gradle # android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt # android/app/src/main/res/values/strings.xml	2 years ago
sultan khan	2ab0d0b682	WD:get current location place change and live care ui changes	2 years ago
taha.alam	0221cb1250	WD: search by region added for the doctors to be mapped.	2 years ago
haroon amjad	d98f2c31a2	updates	2 years ago
taha.alam	7cafe3aaa9	WD: Arabic name value is handled.	2 years ago
taha.alam	11b83d1276	WD: Grouped by region ui changed and added to other two tabs of Search	2 years ago
haroon amjad	c77ffb1730	updates	2 years ago
haroon amjad	780f645cbe	Updates & fixes, CR 6038 Ask Dr changes implemented	2 years ago
Haroon Amjad	a31c677919	invoice type check added	2 years ago
haroon amjad	95a4d8dd14	PaymentRequestID added in InPatient Advance Insert API	2 years ago
haroon amjad	880611f7bb	Insurance card details button removed, Autofill for WhatsApp for android implemented, Updated to stores VersionID 17.3	2 years ago
haroon amjad	e9accb00ef	updates	2 years ago
haroon amjad	62bc29d450	updates	2 years ago
taha.alam	bd3dca6719	WD: session id issue fixed	2 years ago
taha.alam	59335ac04d	WD: reverting changes	2 years ago
taha.alam	8509c3d94d	WD: picking otp and providing the code to flutter channel	2 years ago
taha.alam	c4de4c1bd9	Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6 # Conflicts: # lib/uitl/whatsapp_method_channel.dart	2 years ago
haroon amjad	b677be9e3c	Updates & fixes	2 years ago
taha.alam	f52aed49fd	WD: gradle changes	2 years ago
taha.alam	c6787ff966	WD: doctor list by region and sorting by name and distance	2 years ago
taha.alam	615f3bfa8e	WD: region filter is added.	2 years ago
taha.alam	cd460ee31b	WIP: doctor list by region	2 years ago
				`@ -1 +0,0 @@`
				<svg id="Icon" viewBox="0 0 60 60" xmlns="http://www.w3.org/2000/svg"><circle cx="30" cy="30" fill="#e3ebf0" r="29"/><path d="m19.41 19.41c-2.32 2.3-3.89 5.37-4.3 8.79-.13 1.02-.96 1.8-1.99 1.8h-6.03c-1.16 0-2.1-.99-2-2.15.52-6.03 3.19-11.47 7.24-15.52l1.67-.33 5 4z" fill="#54afa4"/><path d="m30 5 1 2v6l-1 2c-4.13 0-7.88 1.68-10.59 4.41l-7.08-7.08c4.53-4.53 10.78-7.33 17.67-7.33z" fill="#68cec5"/><path d="m47.67 12.33.322 1.671-4.992 4.999-2.4.41h-.01c-2.71-2.73-6.45-4.41-10.59-4.41v-10c6.89 0 13.14 2.8 17.67 7.33z" fill="#f9d84b"/><path d="m54.91 27.85c.1 1.16-.84 2.15-2 2.15h-6.03c-1.03 0-1.86-.78-1.99-1.8-.41-3.41-1.97-6.48-4.29-8.79l7.07-7.08c4.05 4.05 6.72 9.49 7.24 15.52z" fill="#f9536b"/><path d="m44.851 16.308c-2.578 3.935-7.307 10.699-12.38 15.772-1.42 1.42-3.831 1.242-4.99-.543-.846-1.284-.585-2.985.501-4.071 5.073-5.052 11.795-9.75 15.71-12.317.762-.511 1.66.397 1.159 1.159z" fill="#4d5c7a"/><g fill="#262626"><path d="m52.907 31c.842 0 1.652-.356 2.223-.979.563-.613.846-1.437.774-2.26-.52-6.072-3.192-11.804-7.527-16.139-4.916-4.916-11.442-7.623-18.377-7.623-13.385 0-24.764 10.437-25.904 23.76-.071.824.212 1.648.774 2.262.571.622 1.381.979 2.223.979h6.031c1.514 0 2.793-1.152 2.977-2.68.843-7.023 6.818-12.32 13.899-12.32 2.708 0 5.28.763 7.52 2.206-3.316 2.42-7.096 5.418-10.244 8.554-1.446 1.445-1.711 3.686-.633 5.321.705 1.088 1.837 1.788 3.105 1.922.149.016.299.023.447.023 1.115 0 2.183-.439 2.982-1.239 3.162-3.161 6.182-6.966 8.615-10.302 1.131 1.762 1.858 3.753 2.107 5.835.182 1.527 1.461 2.68 2.976 2.68h6.031zm-23.907-24.951v7.998c-3.642.227-6.984 1.666-9.583 3.957l-5.631-5.631c4.07-3.741 9.413-6.078 15.213-6.324zm-14.886 22.034c-.063.532-.48.918-.99.918h-6.031c-.283 0-.557-.12-.749-.33-.188-.205-.279-.468-.256-.739.466-5.437 2.784-10.349 6.287-14.142l5.637 5.637c-2.083 2.357-3.498 5.333-3.898 8.656zm16.886-14.041v-8.018c5.694.233 11.038 2.45 15.239 6.323l-1.715 1.715c-.465-.098-.958-.032-1.38.251-1.065.698-2.409 1.603-3.9 2.656-2.437-1.744-5.254-2.746-8.243-2.928zm.764 17.332c-.479.478-1.13.709-1.807.641-.675-.071-1.256-.434-1.641-1.026-.562-.854-.405-2.036.372-2.812 4.791-4.772 11.129-9.254 14.887-11.751-2.5 3.767-7.006 10.143-11.812 14.948zm14.123-3.29c-.317-2.644-1.303-5.16-2.852-7.329 1.05-1.489 1.953-2.831 2.651-3.896.279-.425.344-.916.249-1.379l1.704-1.704c3.593 3.905 5.822 8.885 6.273 14.157.023.271-.067.532-.256.737-.192.21-.466.33-.749.33h-6.031c-.51 0-.927-.385-.989-.917z"/><path d="m30 0c-6.367 0-12.448 1.969-17.587 5.693-.447.324-.547.949-.223 1.396s.948.548 1.396.223c4.795-3.476 10.471-5.312 16.413-5.312 15.439 0 28 12.561 28 28s-12.561 28-28 28-27.999-12.561-27.999-28c0-7.737 3.086-14.938 8.689-20.276.4-.381.416-1.014.034-1.413-.381-.402-1.015-.415-1.413-.034-6.003 5.718-9.31 13.433-9.31 21.723 0 16.542 13.458 30 30 30s30-13.458 30-30-13.458-30-30-30z"/><path d="m33 50c.553 0 1-.447 1-1v-10c0-.464-.319-.866-.771-.974-.45-.106-.917.111-1.124.526l-2.105 4.211-2.105-4.211c-.207-.415-.677-.632-1.124-.526-.451.107-.771.51-.771.974v10c0 .553.447 1 1 1s1-.447 1-1v-5.764l1.105 2.211c.34.678 1.449.678 1.789 0l1.105-2.211v5.764c0 .553.447 1 1 1z"/><path d="m44 40c.553 0 1-.447 1-1s-.447-1-1-1h-6c-.553 0-1 .447-1 1s.447 1 1 1h2v8h-2c-.553 0-1 .447-1 1s.447 1 1 1h6c.553 0 1-.447 1-1s-.447-1-1-1h-2v-8z"/><path d="m23 41.5c0-1.93-1.57-3.5-3.5-3.5h-3.5c-.553 0-1 .447-1 1v10c0 .553.447 1 1 1h3.5c1.93 0 3.5-1.57 3.5-3.5 0-.98-.407-1.864-1.058-2.5.651-.636 1.058-1.52 1.058-2.5zm-2 5c0 .827-.673 1.5-1.5 1.5h-2.5v-3h2.5c.827 0 1.5.673 1.5 1.5zm-4-3.5v-3h2.5c.827 0 1.5.673 1.5 1.5s-.673 1.5-1.5 1.5z"/></g></svg>
				`@ -1 +0,0 @@`
				<svg id="Layer_3" enable-background="new 0 0 64 64" height="512" viewBox="0 0 64 64" width="512" xmlns="http://www.w3.org/2000/svg"><g><path d="m62 22.04c0 2.92-.42 5.82-1.24 8.59-.82 2.78-2.04 5.43-3.63 7.89-4.02 6.22-9.57 11.29-16.12 14.74l-9.01 4.74-9.01-4.74c-6.55-3.45-12.1-8.52-16.12-14.74-.73-1.14-1.39-2.31-1.96-3.52h11.16l.93-1 6 13 5-18 4 6h9.55c.7 1.19 1.97 2 3.45 2 2.21 0 4-1.79 4-4s-1.79-4-4-4c-1.48 0-2.75.81-3.45 2h-7.55l-7-12-5 17-5-10-3.07 5h-10.57c-.05-.12-.08-.25-.12-.37-.82-2.77-1.24-5.67-1.24-8.59 0-2.66.62-5.28 1.81-7.65 1.29-2.57 3.24-4.67 5.59-6.12 2.36-1.46 5.1-2.27 7.98-2.27 3.18 0 6.2 1 8.7 2.74 2.49 1.75 4.46 4.25 5.55 7.25l.37 1.01.37-1.01c1.09-3 3.06-5.5 5.55-7.25 2.5-1.74 5.52-2.74 8.7-2.74 2.88 0 5.62.81 7.98 2.27 2.35 1.45 4.3 3.55 5.59 6.12 1.19 2.37 1.81 4.99 1.81 7.65z" fill="#ea3647"/><path d="m54.6 8.27c-2.36-1.46-5.1-2.27-7.98-2.27-3.18 0-6.2 1-8.7 2.74-2.49 1.75-4.46 4.25-5.55 7.25l-.37 1.01-.37-1.01c-1.09-3-3.06-5.5-5.55-7.25-2.5-1.74-5.52-2.74-8.7-2.74-.041 0-.081.004-.122.004-1.452 3.72-2.258 7.762-2.258 11.996 0 3.177.452 6.249 1.29 9.156l.71-1.156 5 10 5-17 7 12h7.55c.7-1.19 1.97-2 3.45-2 2.21 0 4 1.79 4 4s-1.79 4-4 4c-1.48 0-2.75-.81-3.45-2h-9.55l-4-6-3.404 12.255c5.315 5.347 12.449 8.885 20.397 9.603 4.822-3.246 8.962-7.425 12.137-12.338 1.59-2.46 2.81-5.11 3.63-7.89.82-2.77 1.24-5.67 1.24-8.59 0-2.66-.62-5.28-1.81-7.65-1.29-2.57-3.24-4.67-5.59-6.12z" fill="#fd505b"/><path d="m44.941 11.534c.574-2.063 6.032-2.742 10.097 1.296s3.39 9.503 1.284 10.087-4.416-2.006-6.887-4.505c-2.47-2.5-5.068-4.815-4.494-6.878z" fill="#ff9aa5"/><path d="m55.126 7.419c-2.558-1.582-5.499-2.419-8.506-2.419-3.321 0-6.527 1.01-9.275 2.922-2.323 1.633-4.15 3.811-5.345 6.354-1.195-2.545-3.022-4.723-5.349-6.356-2.744-1.91-5.95-2.92-9.271-2.92-3.007 0-5.948.837-8.505 2.419-2.544 1.569-4.604 3.825-5.959 6.522-1.254 2.497-1.916 5.298-1.916 8.099 0 3.018.431 6.003 1.292 8.906l.029.097c.034.116.07.234.118.347.157.37.52.61.921.61h10.57c.348 0 .67-.181.853-.477l2.128-3.467 4.195 8.391c.185.368.565.592.983.549.409-.036.755-.319.87-.714l4.346-14.774 5.831 9.996c.179.308.509.496.864.496h7.55c.354 0 .683-.188.862-.493.555-.944 1.523-1.507 2.588-1.507 1.654 0 3 1.346 3 3s-1.346 3-3 3c-1.065 0-2.033-.563-2.588-1.507-.18-.305-.508-.493-.862-.493h-9.015l-3.703-5.555c-.217-.325-.601-.499-.99-.433-.386.062-.7.343-.806.72l-4.271 15.374-4.857-10.525c-.14-.303-.421-.516-.751-.568-.321-.054-.663.062-.89.307l-.632.68h-10.725c-.343 0-.661.175-.845.465-.184.289-.206.651-.06.962.563 1.196 1.244 2.419 2.024 3.636 4.098 6.341 9.801 11.557 16.494 15.082l9.01 4.74c.147.077.307.115.467.115s.32-.038.466-.115l9.01-4.74c6.693-3.525 12.396-8.741 16.494-15.082 1.644-2.543 2.905-5.285 3.749-8.148.85-2.872 1.281-5.857 1.281-8.875 0-2.801-.662-5.602-1.916-8.099-1.355-2.697-3.415-4.953-5.958-6.522zm4.675 22.929c-.79 2.68-1.972 5.247-3.511 7.629-3.911 6.054-9.356 11.032-15.746 14.398l-8.544 4.495-8.544-4.495c-6.39-3.366-11.835-8.345-15.744-14.396-.423-.66-.816-1.322-1.173-1.979h9.531c.236 0 .464-.084.644-.234l5.378 11.653c.176.38.556.608.989.578.418-.034.771-.325.883-.729l4.415-15.896 2.789 4.184c.186.277.498.444.832.444h9.017c.947 1.263 2.397 2 3.983 2 2.757 0 5-2.243 5-5s-2.243-5-5-5c-1.586 0-3.036.737-3.983 2h-6.442l-6.71-11.504c-.201-.345-.582-.54-.985-.489-.396.049-.726.328-.838.711l-4.283 14.562-3.863-7.727c-.162-.325-.488-.536-.851-.552-.364-.031-.706.166-.896.476l-2.779 4.523h-9.271c-.73-2.58-1.099-5.256-1.099-7.96 0-2.491.589-4.981 1.703-7.202 1.188-2.365 2.994-4.343 5.224-5.718 2.241-1.387 4.818-2.12 7.453-2.12 2.911 0 5.722.886 8.125 2.559 2.394 1.682 4.187 4.023 5.187 6.775l.37 1.01c.143.394.518.656.938.656s.795-.262.938-.656l.371-1.012c.999-2.75 2.792-5.092 5.182-6.771 2.407-1.675 5.218-2.561 8.129-2.561 2.635 0 5.212.733 7.454 2.12 2.229 1.375 4.035 3.353 5.223 5.718 1.114 2.221 1.703 4.711 1.703 7.202 0 2.825-.403 5.619-1.199 8.308z"/></g></svg>