diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index d10b5e0..196c28e 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_2_API_29.avd" />
+            <value value="$USER_HOME$/.android/avd/Pixel_4_API_33_PLAYSTORE_.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-09-27T13:38:52.284423Z" />
+    <timeTargetWasSelectedWithDropDown value="2024-02-18T16:03:20.339360Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..0fc3113
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.10" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0aaa04d..b11aef4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
diff --git a/app/build.gradle b/app/build.gradle
index 6710fa7..02c57d0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -94,7 +94,10 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:$GLIDE_VER"
     annotationProcessor "com.github.bumptech.glide:compiler:$GLIDE_VER"
 
-    implementation "com.github.yuriy-budiyev:code-scanner:$SCANNER_VER"
+
+
+    implementation "com.journeyapps:zxing-android-embedded:$ZXING_VER"
+
     implementation "com.squareup.okio:okio:$SQUARE_OKIO_VER"
 //    implementation 'com.github.barteksc:android-pdf-viewer:2.8.2'
 //    implementation 'com.github.barteksc:android-pdf-viewer:1.6.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1335800..ece6854 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:hardwareAccelerated="true"
         android:theme="@style/Theme.ABDMApp">
         <activity
             android:name=".ui.main.activity.AbdmActivity"
@@ -43,6 +44,9 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".ui.main.activity.BarcodeCaptureAct"
+            android:screenOrientation="portrait"
+            android:stateNotNeeded="true"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/org/commcare/dalvik/abha/model/AbhaScanModel.kt b/app/src/main/java/org/commcare/dalvik/abha/model/AbhaScanModel.kt
index 0a679f0..a4dd907 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/model/AbhaScanModel.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/model/AbhaScanModel.kt
@@ -19,6 +19,9 @@ data class AbhaScanModel(
     )   {
 
     fun getAbha(): String? {
+        hid?.let {
+            return it
+        }
         hidn?.let {
             return it.replace("-", "")
         } ?: run {
diff --git a/app/src/main/java/org/commcare/dalvik/abha/model/LinkCareContextModel.kt b/app/src/main/java/org/commcare/dalvik/abha/model/LinkCareContextModel.kt
index 35068c1..8569a6a 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/model/LinkCareContextModel.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/model/LinkCareContextModel.kt
@@ -7,6 +7,7 @@ import org.commcare.dalvik.domain.model.CCRequesterModel
 
 class LinkCareContextModel {
     lateinit var patientAbhaId: String
+    lateinit var abhaNumber: String
     lateinit var hipId: String
     lateinit var purpose: String
     lateinit var patient: CCPatientDetails
@@ -19,7 +20,7 @@ class LinkCareContextModel {
     }
 
     fun getCCLinkRequestModel(accessToken:String):CCLinkModel{
-        return CCLinkModel(accessToken,hipId,patient)
+        return CCLinkModel(accessToken,hipId,patient,patientAbhaId)
     }
 
 }
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/activity/AbdmActivity.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/activity/AbdmActivity.kt
index dc8e3b4..6caaa51 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/activity/AbdmActivity.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/activity/AbdmActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.core.os.bundleOf
@@ -16,6 +17,9 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.setupActionBarWithNavController
 import com.google.android.material.snackbar.Snackbar
+import com.journeyapps.barcodescanner.ScanContract
+import com.journeyapps.barcodescanner.ScanIntentResult
+import com.journeyapps.barcodescanner.ScanOptions
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -28,6 +32,7 @@ import org.commcare.dalvik.abha.viewmodel.AbdmViewModel
 import org.commcare.dalvik.abha.viewmodel.CareContextViewModel
 import org.commcare.dalvik.abha.viewmodel.GenerateAbhaUiState
 import org.commcare.dalvik.abha.viewmodel.PatientViewModel
+import org.commcare.dalvik.abha.viewmodel.ScanAbhaViewModel
 import org.commcare.dalvik.data.network.HeaderInterceptor
 import org.commcare.dalvik.domain.model.LanguageManager
 import org.commcare.dalvik.domain.model.TranslationKey
@@ -43,6 +48,7 @@ class AbdmActivity : BaseActivity<AbdmActivityBinding>(AbdmActivityBinding::infl
     val viewmodel: AbdmViewModel by viewModels()
     val patientViewModel: PatientViewModel by viewModels()
     val careContextViewModel: CareContextViewModel by viewModels()
+    val scanAbhaViewModel: ScanAbhaViewModel by viewModels()
 
     private var showMenu = true
 
@@ -51,6 +57,19 @@ class AbdmActivity : BaseActivity<AbdmActivityBinding>(AbdmActivityBinding::infl
     val ACTION_SCAN_ABHA = "scan_abha"
     val ACTION_GET_CONSENT = "get_consent"
     val ACTION_CARE_CONTEXT_LINK = "link_care_context"
+    val ACTION_NOTIFY_PATIENT = "notify_patient"
+
+    lateinit var scanCallback : (result:String?)->Unit
+
+    private val barcodeLauncher = registerForActivityResult<ScanOptions, ScanIntentResult>(
+        ScanContract()
+    ) { result: ScanIntentResult ->
+        if (result.contents == null) {
+            Toast.makeText(this@AbdmActivity, "Scan cancelled", Toast.LENGTH_LONG).show()
+        } else {
+            scanCallback.invoke( result.contents)
+        }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -69,14 +88,12 @@ class AbdmActivity : BaseActivity<AbdmActivityBinding>(AbdmActivityBinding::infl
         supportActionBar?.setDisplayShowHomeEnabled(true)
         supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_arrow_back)
 
-//        binding.toolbarContainer.toolbar.setNavigationOnClickListener { view ->
-//            Toast.makeText(this, "BACK", Toast.LENGTH_SHORT).show()
-//        }
 
         observeLoader()
         observerPatientViewModel()
         observerCCViewModel()
         observeBlockedOtpRequest()
+        observerScanabhaViewModel()
 
         intent.extras?.getString("lang_code")?.let { langId ->
             val config = Configuration(resources.configuration)
@@ -109,15 +126,16 @@ class AbdmActivity : BaseActivity<AbdmActivityBinding>(AbdmActivityBinding::infl
                         LanguageManager.getTranslatedValue(this, R.string.ABHA_CREATION)
                 }
 
-                ACTION_SCAN_ABHA -> {
-                    supportActionBar?.title =
-                        LanguageManager.getTranslatedValue(this, R.string.scanAbha)
-                }
 
                 ACTION_CARE_CONTEXT_LINK->{
                     supportActionBar?.title =
                         LanguageManager.getTranslatedValue(this, R.string.linkCareContext)
                 }
+
+                ACTION_NOTIFY_PATIENT ->{
+                    supportActionBar?.title =
+                        LanguageManager.getTranslatedValue(this, R.string.notifyPatient)
+                }
             }
 
         }
@@ -171,16 +189,20 @@ class AbdmActivity : BaseActivity<AbdmActivityBinding>(AbdmActivityBinding::infl
      * Verify intent data
      */
     private fun verifyIntentData() {
+        Timber.d("Verifying intet data.")
         intent.extras?.containsKey("abdm_api_token")?.let { tokenPresent ->
             if (tokenPresent) {
                 intent.extras?.getString("abdm_api_token")?.let {
+                    Timber.d("Token ----> $it")
                     if (it.isEmpty()) {
+                        Timber.d("Token is empty.")
                         showMessageAndDispatchResult(TranslationKey.TOKEN_MISSING.toString())
                     } else {
                         AbdmApplication.API_TOKEN = it
                     }
                 }
             } else {
+                Timber.d("Token not present.")
                 showMessageAndDispatchResult(TranslationKey.TOKEN_MISSING.toString())
             }
         }
@@ -193,14 +215,8 @@ class AbdmActivity : BaseActivity<AbdmActivityBinding>(AbdmActivityBinding::infl
                         showMessageAndDispatchResult(TranslationKey.REQ_DATA_MISSING.toString())
                     }
                  }
-
-                ACTION_SCAN_ABHA -> {
-
-                }
             }
-
         }
-
     }
 
     /**
@@ -252,6 +268,22 @@ class AbdmActivity : BaseActivity<AbdmActivityBinding>(AbdmActivityBinding::infl
         }
     }
 
+    private fun observerScanabhaViewModel(){
+        lifecycleScope.launch(Dispatchers.Main) {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                scanAbhaViewModel.uiState.collect {
+                    when (it) {
+                        is GenerateAbhaUiState.Loading -> {
+                            Timber.d("LOADER VISIBILITY ${it.isLoading}")
+                            binding.loader.visibility =
+                                if (it.isLoading) View.VISIBLE else View.GONE
+                        }
+                        else -> false
+                    }
+                }
+            }
+        }
+    }
     private fun observerCCViewModel(){
         lifecycleScope.launch(Dispatchers.Main) {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
@@ -300,6 +332,7 @@ class AbdmActivity : BaseActivity<AbdmActivityBinding>(AbdmActivityBinding::infl
 
 
     private fun inflateNavGraph() {
+        Timber.d("Initializing nav graph.")
         val bundle = intent.extras ?: bundleOf()
 
         bundle.getString("abdm_api_token")?.let {
@@ -333,7 +366,13 @@ class AbdmActivity : BaseActivity<AbdmActivityBinding>(AbdmActivityBinding::infl
                 ACTION_CARE_CONTEXT_LINK ->{
                     R.navigation.link_care_context
                 }
+
+                ACTION_NOTIFY_PATIENT ->{
+                    Timber.d("Action = notify_patient.")
+                    R.navigation.notify_patient
+                }
                 else -> {
+                    Timber.d("ACTION = -1")
                     -1
                 }
             }
@@ -343,7 +382,7 @@ class AbdmActivity : BaseActivity<AbdmActivityBinding>(AbdmActivityBinding::infl
                 graph.addInDefaultArgs(intent.extras)
                 navController.setGraph(graph, bundle)
             } else {
-                Timber.d("Action not present. Navgra ")
+                Timber.d("Action not present.")
             }
 
         }
@@ -419,6 +458,19 @@ class AbdmActivity : BaseActivity<AbdmActivityBinding>(AbdmActivityBinding::infl
     }
 
 
+    fun scanBarcode(callback : (result:String?)->Unit){
+        scanCallback = callback
+        val options = ScanOptions()
+        options.setDesiredBarcodeFormats(ScanOptions.ALL_CODE_TYPES)
+        options.setPrompt(resources.getString(R.string.place_barcode_inside))
+        options.setCameraId(0)
+        options.setBeepEnabled(true)
+        options.setBarcodeImageEnabled(true)
+        options.captureActivity = BarcodeCaptureAct::class.java
+        barcodeLauncher.launch(options)
+    }
+
+
 }
 
 /**
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/activity/BarcodeCaptureAct.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/activity/BarcodeCaptureAct.kt
new file mode 100644
index 0000000..65f02bc
--- /dev/null
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/activity/BarcodeCaptureAct.kt
@@ -0,0 +1,7 @@
+package org.commcare.dalvik.abha.ui.main.activity;
+
+import com.journeyapps.barcodescanner.CaptureActivity
+
+class BarcodeCaptureAct : CaptureActivity() {
+
+}
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/activity/TestActivity.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/activity/TestActivity.kt
index 62efcd2..61dc26f 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/activity/TestActivity.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/activity/TestActivity.kt
@@ -5,7 +5,6 @@ import android.os.Bundle
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
-import com.google.gson.JsonObject
 import org.commcare.dalvik.abha.R
 import org.commcare.dalvik.data.network.HeaderInterceptor
 import org.json.JSONArray
@@ -19,6 +18,7 @@ class TestActivity : AppCompatActivity() {
     val REQ_CODE_C = 102
     val REQ_CODE_D = 103
     val REQ_CODE_E = 104
+    val REQ_NOTIFY_PATIENT = 105
 
     val action = "org.commcare.dalvik.abha.abdm.app"
 
@@ -27,6 +27,7 @@ class TestActivity : AppCompatActivity() {
     val ACTION_VERIFY_ABHA = "verify_abha"
     val ACTION_SCAN_ABHA = "scan_abha"
     val ACTION_GET_CONSENT = "get_consent"
+    val ACTION_NOTIFY_PATIENT = "notify_patient"
     val ACTION_CARE_CONTEXT_LINK = "link_care_context"
 
 
@@ -35,11 +36,11 @@ class TestActivity : AppCompatActivity() {
         setContentView(R.layout.activity_test)
 
         findViewById<Button>(R.id.intentA).setOnClickListener {
-            startIntentB()
+            verifyABHAIntent()
         }
 
         findViewById<Button>(R.id.intentB).setOnClickListener {
-            startIntentA()
+            createABHAIntent()
         }
 
         findViewById<Button>(R.id.intentC).setOnClickListener {
@@ -54,19 +55,40 @@ class TestActivity : AppCompatActivity() {
             linkCareContext()
         }
 
+        findViewById<Button>(R.id.notifyPatient).setOnClickListener {
+            notifyPatient()
+        }
+
         HeaderInterceptor.API_KEY = ""
 
     }
 
+    private fun notifyPatient() {
+        val intent = Intent(action).apply {
+            putExtras(
+                bundleOf(
+                    "phoneNo" to "9560833229",
+                    "hip" to "6004",
+                    "lang_code" to lang,
+                    "abdm_api_token" to token,
+                    "action" to ACTION_NOTIFY_PATIENT
+                )
+            )
+        }
+        startActivityForResult(intent, REQ_NOTIFY_PATIENT)
+    }
+
     val lang = "en"
-    private val token = "0c0a3fbbacc0922192a1b4e63be5d6f511790a31"
+    private val token = "33ec318e4ea1261d1e200c4eff017ea696fedaa9" //"cba903c996da17ca535d4bbb1b04d8e0eb7127ce"
+
+
 
-    private fun startIntentA() {
+    private fun createABHAIntent() {
         val intent = Intent(action).apply {
             putExtras(
                 bundleOf(
                     "mobile_number" to "9560833229",
-                    "abha_id" to "ashish.yogi",
+                    "abha_id" to "harish23@sbx",
                     "lang_code" to lang,
                     "abdm_api_token" to token,
                     "action" to ACTION_CREATE_ABHA
@@ -77,11 +99,12 @@ class TestActivity : AppCompatActivity() {
 
     }
 
-    private fun startIntentB() {
+    private fun verifyABHAIntent() {
 
         val intent = Intent(action).apply {
             putExtras(
                 bundleOf(
+                    "abha_id" to "harish23@sbx",
                     "mobile_number" to "9560833229",
                     "abdm_api_token" to token,
                     "lang_code" to lang,
@@ -111,11 +134,13 @@ class TestActivity : AppCompatActivity() {
         val intent = Intent(action).apply {
             putExtras(
                 bundleOf(
-                    "abha_id" to "ajeet2040@sbx",
+                    "patient_name" to "Test Patient",
+                    "abha_id" to "ajeet2042@sbx",
                     "hiu_id" to "Ashish-HIU-Registered",
                     "abdm_api_token" to token,
                     "lang_code" to lang,
-                    "action" to ACTION_GET_CONSENT
+                    "action" to ACTION_GET_CONSENT,
+                    "requester" to "Dr xyz"
                 )
             )
         }
@@ -137,6 +162,15 @@ class TestActivity : AppCompatActivity() {
                         put("Prescription")
                     }
                     put("hiTypes",hiTypes)
+
+                    val additionalInfo =  JSONObject().apply {
+                        put("domain","domain  data")
+                        put("record_date","2023-10-31T21:37:41.786Z")
+                        // 2023-10-31T21:37:41.786Z
+                    }
+
+                    put("additionalInfo",additionalInfo)
+
                 }
 
 
@@ -148,7 +182,7 @@ class TestActivity : AppCompatActivity() {
             }
             putExtras(
                 bundleOf(
-                    "abhaId" to "ajeet2040@sbx",
+                    "abhaId" to "91766261606756@sbx",
                     "purpose" to "LINK",
                     "hipId" to "6004",
                     "patientDetail" to patientJson.toString(),
@@ -173,6 +207,10 @@ class TestActivity : AppCompatActivity() {
             REQ_CODE_B -> {
 
             }
+
+            REQ_NOTIFY_PATIENT -> {
+
+            }
         }
 
     }
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/adapters/ConsentArtefactAdapter.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/adapters/ConsentArtefactAdapter.kt
index 4ac9e3c..2ad7efb 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/adapters/ConsentArtefactAdapter.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/adapters/ConsentArtefactAdapter.kt
@@ -66,10 +66,10 @@ class ConsentArtefactAdapter(val callback :(artefactId: String)->Unit) :
         fun bindModel(model: ConsentArtefactModel) {
             binding.model = model
             binding.careContextChipGroup.removeAllViews()
-            model.details.careContexts.forEach { it ->
+            model.details?.careContexts?.forEach { it ->
 //                careContextsList.forEach {
                     val chip = Chip(binding.root.context, null, R.style.HiTypeStyle)
-                    chip.text = it.patientReference
+                    chip.text = it.careContextReference
                     chip.setTextColor(Color.BLACK)
                     binding.careContextChipGroup.addView(chip)
 //                }
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/adapters/PatientConsentAdapter.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/adapters/PatientConsentAdapter.kt
index 1cb6f78..8788b8b 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/adapters/PatientConsentAdapter.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/adapters/PatientConsentAdapter.kt
@@ -13,10 +13,11 @@ import org.commcare.dalvik.abha.ui.main.fragment.HITYPES
 import org.commcare.dalvik.abha.utility.CommonUtil
 import org.commcare.dalvik.domain.model.DATE_FORMAT
 import org.commcare.dalvik.domain.model.PatientConsentModel
-import java.text.SimpleDateFormat
-import java.util.Date
 
-class PatientConsentAdapter(val callback :(patientConsentModel:PatientConsentModel)->Unit) :
+class PatientConsentAdapter(
+    val patientName: String?,
+    val callback: (patientConsentModel: PatientConsentModel) -> Unit
+) :
     PagingDataAdapter<PatientConsentModel, PatientConsentAdapter.PatientConsentViewHolder>(
         COMPARATOR
     ) {
@@ -51,7 +52,7 @@ class PatientConsentAdapter(val callback :(patientConsentModel:PatientConsentMod
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PatientConsentViewHolder {
-       val binding =  PatientConsentCellBinding.inflate(
+        val binding = PatientConsentCellBinding.inflate(
             LayoutInflater.from(parent.context),
             parent,
             false
@@ -60,27 +61,96 @@ class PatientConsentAdapter(val callback :(patientConsentModel:PatientConsentMod
     }
 
 
-    inner class PatientConsentViewHolder(val binding: PatientConsentCellBinding) : RecyclerView.ViewHolder(binding.root) {
+    inner class PatientConsentViewHolder(val binding: PatientConsentCellBinding) :
+        RecyclerView.ViewHolder(binding.root) {
 
-        fun bindModel(model: PatientConsentModel){
+        fun bindModel(model: PatientConsentModel) {
             binding.model = model
             renderHealthInfoTypes()
+            binding.patientName.text = patientName
+
             model.healthInfoFromDate?.let {
-                binding.fromDate.text = CommonUtil.getUserFormatDate(it)
+                binding.fromDate.text =
+                    CommonUtil.getUtcTimeFromDate(it, DATE_FORMAT.CONSENT_LIST_TIME)
             }
 
             model.healthInfoToDate?.let {
-                binding.toDate.text = CommonUtil.getUserFormatDate(it)
+                binding.toDate.text =
+                    CommonUtil.getUtcTimeFromDate(it, DATE_FORMAT.CONSENT_LIST_TIME)
             }
 
             model.expiryDate?.let {
-                binding.expiryDate.text = CommonUtil.getUserFormatDate(it)
+                binding.expiryDate.text =
+                    CommonUtil.getUtcTimeFromDate(it, DATE_FORMAT.CONSENT_LIST_TIME)
+            }
+
+            model.creationDate?.let {
+                binding.consentCreationDate.text =
+                    CommonUtil.getUtcTimeFromDate(it, DATE_FORMAT.CONSENT_LIST_TIME)
+            }
+            model.lastModified?.let {
+                if (model.status != "GRANTED") {
+                    binding.consentGrantedDate.text = ""
+                } else {
+                    binding.consentGrantedDate.text =
+                        CommonUtil.getUtcTimeFromDate(it, DATE_FORMAT.CONSENT_LIST_TIME)
+                }
+            }
+
+            binding.statusDateLabel.apply {
+                when (model.status) {
+                    "GRANTED" -> {
+                        text = resources.getString(R.string.granted_date)
+                    }
+
+                    "EXPIRED" -> {
+                        text = resources.getString(R.string.expired_date)
+                    }
+
+                    "DENIED" -> {
+                        text = resources.getString(R.string.denied_date)
+                    }
+
+                    "REVOKED" -> {
+                        text = resources.getString(R.string.revoked_date)
+                    }
+                    else ->{
+                        text = model.status
+                    }
+                }
+            }
+            binding.statusDate.apply {
+                when (model.status) {
+                    "GRANTED" -> {
+                        model.grantedDate?.let {
+                            text = CommonUtil.getUtcTimeFromDate(it, DATE_FORMAT.CONSENT_LIST_TIME)
+                        } ?: run { text = "Unknown Date" }
+                    }
+
+                    "EXPIRED" -> {
+                        model.expiryDate?.let {
+                            text = CommonUtil.getUtcTimeFromDate(it, DATE_FORMAT.CONSENT_LIST_TIME)
+                        } ?: run { text = "Unknown Date" }
+                    }
+
+                    "DENIED" -> {
+                        model.deniedDate?.let {
+                            text = CommonUtil.getUtcTimeFromDate(it, DATE_FORMAT.CONSENT_LIST_TIME)
+                        } ?: run { text = "Unknown Date" }
+                    }
+
+                    "REVOKED" -> {
+                        model.revokedDate?.let {
+                            text = CommonUtil.getUtcTimeFromDate(it, DATE_FORMAT.CONSENT_LIST_TIME)
+                        } ?: run { text = "Unknown Date" }
+                    }
+                }
             }
 
         }
 
 
-        private fun renderHealthInfoTypes(){
+        private fun renderHealthInfoTypes() {
 
             binding.healthTypeChipGroup.removeAllViews()
             binding.model?.healthInfoType?.forEach {
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/custom/TimeProgressBar.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/custom/TimeProgressBar.kt
index e9c0fe3..b074756 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/custom/TimeProgressBar.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/custom/TimeProgressBar.kt
@@ -32,7 +32,7 @@ class TimeProgressBar @JvmOverloads constructor(
             ).apply {
                 try {
                     pb.max =
-                        getInt(R.styleable.custom_number_progress_attributes_maxCounter, 60)
+                        getInt(R.styleable.custom_number_progress_attributes_maxCounter, 90)
                     pb.progress = pb.max
                 } finally {
                     recycle()
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/AbhaCreationResultFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/AbhaCreationResultFragment.kt
index 67263fe..37d7472 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/AbhaCreationResultFragment.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/AbhaCreationResultFragment.kt
@@ -71,6 +71,11 @@ class AbhaCreationResultFragment : BaseFragment<AbhaDetailBinding>(AbhaDetailBin
                             viewModel.uiState.emit(GenerateAbhaUiState.Loading(false))
                         }
 
+                        is GenerateAbhaUiState.AbdmError -> {
+                            viewModel.uiState.emit(GenerateAbhaUiState.Loading(false))
+                            (activity as AbdmActivity).showBlockerDialog(it.data.getActualMessage())
+                        }
+
                         else -> {
                             //exhaustive block
                         }
@@ -121,9 +126,8 @@ class AbhaCreationResultFragment : BaseFragment<AbhaDetailBinding>(AbhaDetailBin
             putExtra("message", "ABHA creation completed.")
             putExtra("exists_on_abdm", binding.model?.existsOnAbdm.toString())
             putExtra("exists_on_hq", binding.model?.existsOnHq.toString())
-            if (binding.shareWithCC.isChecked) {
-                putExtra("aadhaarData", binding.model?.data?.toString())
-            }
+            putExtra("aadhaarData", binding.model?.data?.toString())
+
         }
         (activity as AbdmActivity).onAbhaNumberReceived(intent)
     }
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/AbhaDisclaimerFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/AbhaDisclaimerFragment.kt
index 5d6d0b2..7466789 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/AbhaDisclaimerFragment.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/AbhaDisclaimerFragment.kt
@@ -42,7 +42,7 @@ class AbhaDisclaimerFragment : BaseFragment<DisclaimerBinding>(DisclaimerBinding
                 binding.abhaNumberEt.isEnabled = false
                 binding.checkABHA.isEnabled = false
                 binding.skipCheckABHA.isEnabled = false
-                viewModel.checkForAbhaAvailability(abhaAddress+"@abdm")
+                viewModel.checkForAbhaAvailability(abhaAddress)
             }
             R.id.skipCheckABHA ->{
                 navigateToAadhaarOtpVerificationScreen(null)
@@ -83,6 +83,14 @@ class AbhaDisclaimerFragment : BaseFragment<DisclaimerBinding>(DisclaimerBinding
                             binding.skipCheckABHA.isEnabled = true
                             viewModel.uiState.emit(GenerateAbhaUiState.Loading(false))
                         }
+
+                        is GenerateAbhaUiState.AbdmError ->{
+                            binding.checkABHA.isEnabled = true
+                            binding.abhaNumberEt.isEnabled = true
+                            binding.skipCheckABHA.isEnabled = true
+                            viewModel.uiState.emit(GenerateAbhaUiState.Loading(false))
+                            (activity as AbdmActivity).showBlockerDialog(it.data.getErrorMsg())
+                        }
                         else -> {
                             //exhaustive block
                         }
@@ -107,7 +115,7 @@ class AbhaDisclaimerFragment : BaseFragment<DisclaimerBinding>(DisclaimerBinding
     }
 
     private fun navigateToAadhaarOtpVerificationScreen(healthId:String?) {
-        arguments?.putString("healthId",if(healthId == null) null else healthId+"@abdm")
+        arguments?.putString("healthId",if(healthId == null) null else healthId)
         findNavController().navigate(
             R.id.action_disclaimerFragment_to_enterAbhaCreationDetailsFragment, arguments
         )
@@ -116,7 +124,7 @@ class AbhaDisclaimerFragment : BaseFragment<DisclaimerBinding>(DisclaimerBinding
     private fun showAbhaAddressAvailableDialog(){
         DialogUtility.showDialog(
             requireContext(),
-            "\"${binding.abhaNumberEt.text.toString()}@abdm\" address is available.",
+            "\"${binding.abhaNumberEt.text.toString()}\" address is available.",
             { onAbhaAddressPresent() },
             {  }
         )
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/AbhaVerificationResultFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/AbhaVerificationResultFragment.kt
index 27de0fc..25a29bf 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/AbhaVerificationResultFragment.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/AbhaVerificationResultFragment.kt
@@ -59,6 +59,7 @@ class AbhaVerificationResultFragment :
             putExtra("abha_address", binding.model?.healthId)
             putExtra("code", AbdmResponseCode.SUCCESS.value)
             putExtra("verified", binding.model?.status)
+            putExtra("aadhaarData", binding.model?.aadharData?.toString())
             putExtra("message", "ABHA verification completed.")
         }
 
@@ -85,6 +86,11 @@ class AbhaVerificationResultFragment :
                         is GenerateAbhaUiState.Error -> {
                             viewModel.uiState.emit(GenerateAbhaUiState.Loading(false))
                         }
+
+                        is GenerateAbhaUiState.AbdmError -> {
+                            viewModel.uiState.emit(GenerateAbhaUiState.Loading(false))
+                            (activity as AbdmActivity).showBlockerDialog(it.data.getActualMessage())
+                        }
                         else -> {
                             //exhaustive block
                         }
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CCFetchAuthModeFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CCFetchAuthModeFragment.kt
index 7d89c40..ffaa8f0 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CCFetchAuthModeFragment.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CCFetchAuthModeFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import androidx.core.os.bundleOf
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
@@ -16,9 +17,12 @@ import org.commcare.dalvik.abha.R
 import org.commcare.dalvik.abha.databinding.CCAuthModeBinding
 import org.commcare.dalvik.abha.model.LinkCareContextModel
 import org.commcare.dalvik.abha.ui.main.activity.AbdmActivity
+import org.commcare.dalvik.abha.ui.main.activity.VerificationMode
+import org.commcare.dalvik.abha.utility.CommonUtil
 import org.commcare.dalvik.abha.viewmodel.CareContextViewModel
 import org.commcare.dalvik.abha.viewmodel.GenerateAbhaUiState
 import org.commcare.dalvik.domain.model.CCPatientDetails
+import org.commcare.dalvik.domain.model.DATE_FORMAT
 import timber.log.Timber
 
 class CCFetchAuthModeFragment : BaseFragment<CCAuthModeBinding>(CCAuthModeBinding::inflate),
@@ -28,6 +32,8 @@ class CCFetchAuthModeFragment : BaseFragment<CCAuthModeBinding>(CCAuthModeBindin
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        binding.ccStartAuth.visibility = View.GONE
+        binding.ccGenerateAuthOtp.visibility = View.GONE
         viewModel.authModesList.clear()
         observeUiState()
         populateIntentData()
@@ -37,6 +43,9 @@ class CCFetchAuthModeFragment : BaseFragment<CCAuthModeBinding>(CCAuthModeBindin
     private fun populateIntentData() {
         arguments?.let {
             val linkCareContextModel = LinkCareContextModel()
+            it.getString("abha_number")?.let {
+                linkCareContextModel.abhaNumber = it
+            }
             it.getString("abhaId")?.let {
                 linkCareContextModel.patientAbhaId = it
             }
@@ -49,11 +58,26 @@ class CCFetchAuthModeFragment : BaseFragment<CCAuthModeBinding>(CCAuthModeBindin
                 linkCareContextModel.hipId = it
             }
 
+
+            val UTC_DIFF = (30 * 60 * 1000) + (5 * 60 * 60 * 1000)
+
             it.getString("patientDetail")?.let {
                 linkCareContextModel.patient = Gson().fromJson(
                     it,
                     CCPatientDetails::class.java
                 )
+
+                linkCareContextModel.patient.careContexts[0].let { ccDetail ->
+                    ccDetail.additionalInfo.record_date?.let { recordDate ->
+                        Timber.d("+++ ORG Record Date == ${recordDate}")
+                        val recordDateMs = CommonUtil.getTimeInMillis(recordDate) - UTC_DIFF
+                        CommonUtil.getGMTFormattedDateTime(recordDateMs, DATE_FORMAT.SERVER.format)
+                            ?.let {
+                                ccDetail.additionalInfo.record_date = it
+                                Timber.d("+++ Final Record Date = ${it}")
+                            }
+                    }
+                }
             }
 
             viewModel.init(linkCareContextModel)
@@ -79,9 +103,11 @@ class CCFetchAuthModeFragment : BaseFragment<CCAuthModeBinding>(CCAuthModeBindin
         (binding.ccAuthMode as? MaterialAutoCompleteTextView)?.apply {
 
             setAdapter(adapter)
-            setOnItemClickListener(this@CCFetchAuthModeFragment)
+            onItemClickListener = this@CCFetchAuthModeFragment
             if (viewModel.authModesList.size == 1) {
                 setText(adapter.getItem(0).toString(), false)
+                viewModel.selectedAuthMethod = adapter.getItem(0).toString()
+                binding.ccGenerateAuthOtp.isEnabled = true
             }
         }
     }
@@ -97,9 +123,7 @@ class CCFetchAuthModeFragment : BaseFragment<CCAuthModeBinding>(CCAuthModeBindin
 
                             try {
                                 it.data.getAsJsonArray("modes")?.forEach { modeName ->
-                                    if ("DEMOGRAPHICS" != modeName.asString) {
-                                        viewModel.authModesList.add(modeName.asString)
-                                    }
+                                    viewModel.authModesList.add(modeName.asString)
                                 }
                                 viewModel.authModesList.sort()
 
@@ -137,15 +161,31 @@ class CCFetchAuthModeFragment : BaseFragment<CCAuthModeBinding>(CCAuthModeBindin
         parent?.getItemAtPosition(position).toString().let {
             viewModel.selectedAuthMethod = it
             binding.ccGenerateAuthOtp.isEnabled = true
+
+            if (it == "DEMOGRAPHICS") {
+                binding.ccStartAuth.visibility = View.VISIBLE
+                binding.ccGenerateAuthOtp.visibility = View.GONE
+            } else {
+                binding.ccStartAuth.visibility = View.GONE
+                binding.ccGenerateAuthOtp.visibility = View.VISIBLE
+            }
         }
     }
 
     override fun onClick(view: View?) {
         super.onClick(view)
         when (view?.id) {
+            R.id.ccStartAuth,
             R.id.ccGenerateAuthOtp -> {
+
+                val bundle = bundleOf(
+                    "verifyWithDemographics" to (binding.ccStartAuth.visibility == View.VISIBLE),
+                    "demographic" to viewModel.linkCareContextModel.patient.demographics
+                )
+
                 findNavController().navigate(
-                    R.id.action_CCFetchAuthModeFragment_to_verifyCCLinkOtpFragment
+                    R.id.action_CCFetchAuthModeFragment_to_verifyCCLinkOtpFragment,
+                    bundle
                 )
             }
         }
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CCVerifyOtpFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CCVerifyOtpFragment.kt
index 3d24618..d2d6ed9 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CCVerifyOtpFragment.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CCVerifyOtpFragment.kt
@@ -26,6 +26,7 @@ import org.commcare.dalvik.domain.model.CCGenerateOtpResponseModel
 import org.commcare.dalvik.domain.model.CCVerifyOtpResponseModel
 import org.commcare.dalvik.domain.model.ConfirmAuthModel
 import org.commcare.dalvik.domain.model.Credential
+import org.commcare.dalvik.domain.model.Demographic
 
 class CCVerifyOtpFragment : BaseFragment<GenerateCCOtpBinding>(GenerateCCOtpBinding::inflate) {
 
@@ -36,6 +37,20 @@ class CCVerifyOtpFragment : BaseFragment<GenerateCCOtpBinding>(GenerateCCOtpBind
 
         binding.clickHandler = this
 
+        arguments?.let {
+            it.getBoolean("verifyWithDemographics").let {
+                binding.isVerifyWithDemoGraphics = it
+                if(it) {
+                    (activity as AbdmActivity).setToolbarTitle(R.string.demographics)
+                }
+            }
+
+            it.getSerializable("demographic")?.let { model ->
+                binding.demograhicModel = model as Demographic
+            }
+
+        }
+
         lifecycleScope.launch(Dispatchers.Main) {
             binding.otpEt.observeText().collect {
                 binding.verifyCCOtp.isEnabled = it == AppConstants.OTP_LENGTH
@@ -70,7 +85,7 @@ class CCVerifyOtpFragment : BaseFragment<GenerateCCOtpBinding>(GenerateCCOtpBind
 
     private fun requestOtp() {
         lifecycleScope.launch {
-            viewModel.linkCareContextModel.hipId.let {hipId ->
+            viewModel.linkCareContextModel.hipId.let { hipId ->
                 viewModel.checkForBlockedState(hipId).collect {
                     when (it) {
                         OtpCallState.OtpReqAvailable -> {
@@ -98,6 +113,7 @@ class CCVerifyOtpFragment : BaseFragment<GenerateCCOtpBinding>(GenerateCCOtpBind
                             binding.otpEt.isEnabled = false
                             binding.resendCCOtp.isEnabled = false
                             binding.verifyCCOtp.isEnabled = false
+                            binding.startAuth.isEnabled = false
                             viewModel.uiState.emit(GenerateAbhaUiState.InvalidState)
                             viewModel.uiState.emit(GenerateAbhaUiState.Loading(true))
                         }
@@ -106,6 +122,7 @@ class CCVerifyOtpFragment : BaseFragment<GenerateCCOtpBinding>(GenerateCCOtpBind
                             binding.otpEt.isEnabled = false
                             binding.resendCCOtp.isEnabled = false
                             binding.verifyCCOtp.isEnabled = false
+                            binding.startAuth.isEnabled = false
                             binding.timeProgress.startTimer()
                             viewModel.uiState.emit(GenerateAbhaUiState.InvalidState)
                             viewModel.uiState.emit(GenerateAbhaUiState.Loading(true))
@@ -118,16 +135,18 @@ class CCVerifyOtpFragment : BaseFragment<GenerateCCOtpBinding>(GenerateCCOtpBind
                                 RequestType.CC_AUTH_INIT -> {
                                     binding.otpEt.requestFocus()
                                     binding.otpEt.isEnabled = true
+                                    binding.startAuth.isEnabled = true
 
                                     val ccGenerateOtpResponseModel = Gson().fromJson(
                                         it.data,
                                         CCGenerateOtpResponseModel::class.java
                                     )
 
+
                                     viewModel.confirmAuthModel =
                                         ConfirmAuthModel(
                                             ccGenerateOtpResponseModel.transactionId,
-                                            Credential(null)
+                                            Credential()
                                         )
 
                                 }
@@ -153,8 +172,10 @@ class CCVerifyOtpFragment : BaseFragment<GenerateCCOtpBinding>(GenerateCCOtpBind
                             when (it.requestType) {
                                 RequestType.CC_AUTH_CONFIRM -> {
                                     binding.verifyCCOtp.isEnabled = true
+                                    binding.startAuth.isEnabled = true
                                 }
-                                else ->{
+
+                                else -> {
 
                                 }
                             }
@@ -167,8 +188,10 @@ class CCVerifyOtpFragment : BaseFragment<GenerateCCOtpBinding>(GenerateCCOtpBind
                             when (it.requestType) {
                                 RequestType.CC_AUTH_CONFIRM -> {
                                     binding.verifyCCOtp.isEnabled = true
+                                    binding.startAuth.isEnabled = true
                                 }
-                                else ->{
+
+                                else -> {
 
                                 }
                             }
@@ -198,10 +221,33 @@ class CCVerifyOtpFragment : BaseFragment<GenerateCCOtpBinding>(GenerateCCOtpBind
                 viewModel.confirmAuthModel.credential.authCode = binding.otpEt.text.toString()
                 viewModel.confirmCareContextOtp()
             }
+
+            R.id.startAuth -> {
+                viewModel.confirmAuthModel.credential.demographic =
+                    viewModel.linkCareContextModel.patient.demographics
+
+                viewModel.confirmAuthModel.credential.demographic?.let {
+                    when(it.gender.lowercase()){
+                        "male" ->{
+                            it.gender = "M"
+                        }
+                        "female" ->{
+                            it.gender = "F"
+                        }
+                        "other" ->{
+                            it.gender = "O"
+                        }
+                        "unknown" ->{
+                            it.gender = "U"
+                        }
+                    }
+                }
+                viewModel.confirmCareContextOtp()
+            }
         }
     }
 
-    private fun navigateToLinkCCScreen(accessToken:String){
+    private fun navigateToLinkCCScreen(accessToken: String) {
         val bundle = bundleOf(
             "accessToken" to accessToken
         )
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/ConsentArtefactFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/ConsentArtefactFragment.kt
index b071bbd..4fe96ff 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/ConsentArtefactFragment.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/ConsentArtefactFragment.kt
@@ -11,20 +11,15 @@ import androidx.core.view.MenuProvider
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import androidx.paging.LoadState
-import com.google.gson.Gson
-import kotlinx.coroutines.launch
 import org.commcare.dalvik.abha.R
 import org.commcare.dalvik.abha.databinding.ConsentArtefactBinding
+import org.commcare.dalvik.abha.ui.main.activity.AbdmActivity
 import org.commcare.dalvik.abha.ui.main.adapters.ConsentArtefactAdapter
 import org.commcare.dalvik.abha.ui.main.adapters.ConsentPageLoaderAdapter
-import org.commcare.dalvik.abha.viewmodel.GenerateAbhaUiState
 import org.commcare.dalvik.abha.viewmodel.PatientViewModel
-import org.commcare.dalvik.domain.model.PatientHealthDataModel
-import timber.log.Timber
+import org.commcare.dalvik.data.paging.AbdmException
 
 class ConsentArtefactFragment :
     BaseFragment<ConsentArtefactBinding>(ConsentArtefactBinding::inflate) {
@@ -87,7 +82,13 @@ class ConsentArtefactFragment :
 
             if (loadState.refresh is LoadState.Error) {
                 binding.statusView.isVisible = true
-                binding.statusView.text = resources.getText(R.string.loadErrorMsg)
+                val abdmException: AbdmException? =
+                    (loadState.refresh as LoadState.Error).error as? AbdmException
+                abdmException?.let {
+                    it.message?.let { msg -> (activity as AbdmActivity).showBlockerDialog(msg) }
+                } ?: run {
+                    binding.statusView.text = resources.getText(R.string.loadErrorMsg)
+                }
             }
             if (loadState.append.endOfPaginationReached) {
                 if (artefactAdapter.itemCount < 1) {
@@ -102,10 +103,9 @@ class ConsentArtefactFragment :
     }
 
     private fun navigateToPatientHealthData(artefactId: String) {
+        arguments?.putString("artefactId", artefactId)
         findNavController().navigate(
-            R.id.action_consentArtefactFragment_to_patientHealthDataFragment, bundleOf(
-                "artefactId" to artefactId
-            )
+            R.id.action_consentArtefactFragment_to_patientHealthDataFragment, arguments
         )
 
     }
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CreatePatientConsentFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CreatePatientConsentFragment.kt
index 15ee19e..e242102 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CreatePatientConsentFragment.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CreatePatientConsentFragment.kt
@@ -19,6 +19,7 @@ import com.google.android.material.datepicker.DateValidatorPointForward
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.timepicker.MaterialTimePicker
+import com.google.android.material.timepicker.MaterialTimePicker.INPUT_MODE_CLOCK
 import com.google.android.material.timepicker.TimeFormat
 import kotlinx.coroutines.launch
 import org.commcare.dalvik.abha.R
@@ -51,9 +52,13 @@ class CreatePatientConsentFragment :
         arguments?.let { bundle ->
             bundle.getString("abha_id")?.let { abhaId ->
                 bundle.getString("hiu_id")?.let { hiuId ->
-                    viewmodel.init(abhaId, hiuId)
+                    viewmodel.init(abhaId, hiuId,   bundle.getString("requester") ?: "")
                 }
             }
+            bundle.getString("patient_name")?.let { patientName ->
+                binding.patientName.setText(patientName)
+            }
+
         }
 
         binding.model = viewmodel.patientConsentModel
@@ -176,7 +181,7 @@ class CreatePatientConsentFragment :
 
                     val dateValidatorEnd =
                         DateValidatorPointBackward.before(
-                            Calendar.getInstance().timeInMillis - 1.days.toLong(DurationUnit.MILLISECONDS)
+                            Calendar.getInstance().timeInMillis  //- 1.days.toLong(DurationUnit.MILLISECONDS)
                         )
 
                     val validatorList = mutableListOf<CalendarConstraints.DateValidator>()
@@ -285,7 +290,8 @@ class CreatePatientConsentFragment :
             val minutes = timePicker.minute * 60 * 1000
             val hours = timePicker.hour * 60 * 60 * 1000
 
-            val finalTime = selectedDate + hours + minutes
+            var finalTime = selectedDate + hours + minutes
+
 
             timechip.text = CommonUtil.getFormattedDateTime(finalTime, DATE_FORMAT.USER.format)
             timechip.visibility = View.VISIBLE
@@ -293,18 +299,21 @@ class CreatePatientConsentFragment :
             when (timechip.id) {
                 R.id.startDateChip -> {
                     CommonUtil.getFormattedDateTime(finalTime, DATE_FORMAT.SERVER.format)?.let {
+                        Timber.d("+++Start Date = ${it}")
                         viewmodel.patientConsentModel.setPermissionStartDate(it)
                     }
                 }
 
                 R.id.endDateChip -> {
                     CommonUtil.getFormattedDateTime(finalTime, DATE_FORMAT.SERVER.format)?.let {
+                        Timber.d("+++End Date = ${it}")
                         viewmodel.patientConsentModel.setPermissionEndDate(it)
                     }
                 }
 
                 R.id.eraseDateChip -> {
                     CommonUtil.getFormattedDateTime(finalTime, DATE_FORMAT.SERVER.format)?.let {
+                        Timber.d("+++Expiry Date = ${it}")
                         viewmodel.patientConsentModel.setPermissionExpiryDate(it)
                     }
                 }
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/NotifyPatientFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/NotifyPatientFragment.kt
new file mode 100644
index 0000000..cc2acc1
--- /dev/null
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/NotifyPatientFragment.kt
@@ -0,0 +1,99 @@
+package org.commcare.dalvik.abha.ui.main.fragment
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.view.View.OnClickListener
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.google.gson.Gson
+import kotlinx.coroutines.launch
+import org.commcare.dalvik.abha.R
+import org.commcare.dalvik.abha.databinding.NotifyPatientBinding
+import org.commcare.dalvik.abha.ui.main.activity.AbdmActivity
+import org.commcare.dalvik.abha.ui.main.activity.AbdmResponseCode
+import org.commcare.dalvik.abha.viewmodel.AbdmViewModel
+import org.commcare.dalvik.abha.viewmodel.GenerateAbhaUiState
+import org.commcare.dalvik.domain.model.HealthCardResponseModel
+import org.commcare.dalvik.domain.model.HipModel
+import org.commcare.dalvik.domain.model.NotifyPatientResponseModel
+import org.commcare.dalvik.domain.model.PatientNotificationModel
+
+class NotifyPatientFragment : BaseFragment<NotifyPatientBinding>(NotifyPatientBinding::inflate)  , OnClickListener {
+
+    val viewModel: AbdmViewModel by activityViewModels()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        try {
+            arguments?.getString("phoneNo")?.let {phoneNumber ->
+                arguments?.getString("hip")?.let { hipId ->
+                    observeUiState()
+                    val patientNotificationModel = PatientNotificationModel(phoneNumber , HipModel(hipId))
+                    binding.model = patientNotificationModel
+                    viewModel.notifyPatient(patientNotificationModel)
+                    binding.clickHandler = this
+                }
+            }
+        }catch (e:Exception){
+            (activity as AbdmActivity).showBlockerDialog("Invalid intent data.")
+        }
+
+    }
+
+    private fun observeUiState() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.uiState.collect {
+                    when (it) {
+                        is GenerateAbhaUiState.Success -> {
+                           val notifyPatientResponseModel =
+                                Gson().fromJson(it.data, NotifyPatientResponseModel::class.java)
+                            binding.notifyStatus.text = notifyPatientResponseModel.status.toString().uppercase()
+                            viewModel.uiState.emit(GenerateAbhaUiState.Loading(false))
+                        }
+
+                        is GenerateAbhaUiState.Error -> {
+                            binding.notifyStatus.text ="FALSE"
+                            viewModel.uiState.emit(GenerateAbhaUiState.Loading(false))
+                        }
+
+                        is GenerateAbhaUiState.AbdmError -> {
+                            viewModel.uiState.emit(GenerateAbhaUiState.Loading(false))
+                            binding.notifyStatus.text ="FALSE"
+                            (activity as AbdmActivity).showBlockerDialog(it.data.message)
+
+                        }
+
+                        else -> {
+                            //exhaustive block
+                        }
+
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onClick(view: View?) {
+        super.onClick(view)
+        when(view?.id){
+            R.id.returnFromNotify ->{
+                dispatchResult()
+            }
+        }
+
+    }
+
+    private fun dispatchResult() {
+        val intent = Intent().apply {
+            putExtra("status", binding.notifyStatus.text.toString() )
+            putExtra("code", AbdmResponseCode.SUCCESS.value)
+            putExtra("message", "Notify patient completed.")
+        }
+        (activity as AbdmActivity).onAbhaScanCompleted(intent)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/PatientConsentFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/PatientConsentFragment.kt
index d2fd314..df1248e 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/PatientConsentFragment.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/PatientConsentFragment.kt
@@ -23,11 +23,13 @@ import com.google.android.material.datepicker.DateValidatorPointForward
 import com.google.android.material.datepicker.MaterialDatePicker
 import org.commcare.dalvik.abha.R
 import org.commcare.dalvik.abha.databinding.PatientConsentBinding
+import org.commcare.dalvik.abha.ui.main.activity.AbdmActivity
 import org.commcare.dalvik.abha.ui.main.adapters.ConsentPageLoaderAdapter
 import org.commcare.dalvik.abha.ui.main.adapters.PatientConsentAdapter
 import org.commcare.dalvik.abha.utility.CommonUtil
 import org.commcare.dalvik.abha.utility.hideKeyboard
 import org.commcare.dalvik.abha.viewmodel.PatientViewModel
+import org.commcare.dalvik.data.paging.AbdmException
 import org.commcare.dalvik.domain.model.DATE_FORMAT
 import org.commcare.dalvik.domain.model.PatientConsentModel
 import timber.log.Timber
@@ -45,7 +47,7 @@ class PatientConsentFragment : BaseFragment<PatientConsentBinding>(PatientConsen
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        arguments?.getString("abha_id")?.let {abhaId ->
+        arguments?.getString("abha_id")?.let { abhaId ->
             viewModel.initPatientAbhaId(abhaId)
         }
 
@@ -85,7 +87,8 @@ class PatientConsentFragment : BaseFragment<PatientConsentBinding>(PatientConsen
             }
         }, viewLifecycleOwner, Lifecycle.State.RESUMED)
 
-        consentAdapter = PatientConsentAdapter(this::onPatientConsentClicked)
+        val patientName = arguments?.getString("patient_name")
+        consentAdapter = PatientConsentAdapter(patientName, this::onPatientConsentClicked)
 
         binding.consentList.apply {
             setHasFixedSize(true)
@@ -109,31 +112,6 @@ class PatientConsentFragment : BaseFragment<PatientConsentBinding>(PatientConsen
             consentAdapter.submitData(lifecycle, it)
         }
 
-        //PAGING
-//        lifecycleScope.launch {
-//            consentAdapter.loadStateFlow.collectLatest { loadStates ->
-//
-//                if (loadStates.refresh is LoadState.Loading) {
-//                    binding.loadingLayout.padeLoaderHolder.isVisible = true
-//                    binding.loadingLayout.errMsg.isVisible = false
-//                    binding.loadingLayout.retry.isVisible = false
-//                    binding.loadingLayout.loadingProgress.isVisible = true
-//                }
-//
-//                if (loadStates.refresh is LoadState.Error) {
-//                    binding.loadingLayout.padeLoaderHolder.isVisible = true
-//                    binding.loadingLayout.errMsg.isVisible = true
-//                    binding.loadingLayout.retry.isVisible = true
-//                    binding.loadingLayout.loadingProgress.isVisible = false
-//                }
-//
-//                if (loadStates.refresh is LoadState.NotLoading) {
-//                    binding.loadingLayout.padeLoaderHolder.isVisible = false
-//                    binding.loadingLayout.loadingProgress.isVisible = false
-//                }
-//
-//            }
-//        }
 
         //PAGE RETRY
         binding.loadingLayout.retry.setOnClickListener {
@@ -145,15 +123,23 @@ class PatientConsentFragment : BaseFragment<PatientConsentBinding>(PatientConsen
 
             val isLoading = loadState.refresh is LoadState.Loading
             binding.statusLoading.isVisible = isLoading
-            if(isLoading){
+            if (isLoading) {
                 binding.statusView.isVisible = false
             }
 
-
             if (loadState.refresh is LoadState.Error) {
                 binding.statusView.isVisible = true
-                binding.statusView.text = resources.getText(R.string.loadErrorMsg)
+
+                val abdmException: AbdmException? =
+                    (loadState.refresh as LoadState.Error).error as? AbdmException
+                abdmException?.let {
+                    it.message?.let { msg -> (activity as AbdmActivity).showBlockerDialog(msg) }
+                } ?: run {
+                    binding.statusView.text = resources.getText(R.string.loadErrorMsg)
+                }
+
             }
+
             if (loadState.append.endOfPaginationReached) {
                 if (consentAdapter.itemCount < 1) {
                     binding.statusView.isVisible = true
@@ -166,9 +152,13 @@ class PatientConsentFragment : BaseFragment<PatientConsentBinding>(PatientConsen
 
         }
 
-        binding.createConsentBtn.setOnClickListener{
+        binding.createConsentBtn.setOnClickListener {
             navigateToCreateConsentScreen()
         }
+
+        binding.backBt.setOnClickListener {
+            (activity as AbdmActivity).finish()
+        }
     }
 
     private fun updateFilterMenu() {
@@ -302,10 +292,14 @@ class PatientConsentFragment : BaseFragment<PatientConsentBinding>(PatientConsen
     private fun onPatientConsentClicked(patientConsentModel: PatientConsentModel) {
         Timber.d("Clicked : ${patientConsentModel.id}")
         patientConsentModel.status?.let {
-            if(it == "GRANTED") {
+            if (it == "GRANTED") {
                 navigateToConsentArtefactScreen(patientConsentModel.consentRequestId)
-            }else{
-                Toast.makeText(requireContext(),resources.getString(R.string.notGrantedMsg),Toast.LENGTH_SHORT).show()
+            } else {
+                Toast.makeText(
+                    requireContext(),
+                    resources.getString(R.string.notGrantedMsg),
+                    Toast.LENGTH_SHORT
+                ).show()
             }
         }
 
@@ -313,10 +307,9 @@ class PatientConsentFragment : BaseFragment<PatientConsentBinding>(PatientConsen
 
     private fun navigateToConsentArtefactScreen(consentReqId: String) {
         activity?.runOnUiThread {
+            arguments?.putString("contentRequestId", consentReqId)
             findNavController().navigate(
-                R.id.action_patientConsentFragment_to_consentArtefactFragment, bundleOf(
-                    "contentRequestId" to consentReqId
-                )
+                R.id.action_patientConsentFragment_to_consentArtefactFragment, arguments
             )
         }
     }
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/PatientHealthDataFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/PatientHealthDataFragment.kt
index 050b920..52818f6 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/PatientHealthDataFragment.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/PatientHealthDataFragment.kt
@@ -7,18 +7,23 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
+import androidx.navigation.fragment.findNavController
 import com.google.gson.Gson
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.commcare.dalvik.abha.R
 import org.commcare.dalvik.abha.databinding.PatientHealthDataBinding
 import org.commcare.dalvik.abha.ui.main.activity.AbdmActivity
 import org.commcare.dalvik.abha.ui.main.adapters.FileData
 import org.commcare.dalvik.abha.ui.main.adapters.FileType
 import org.commcare.dalvik.abha.ui.main.adapters.HealthDataAdapter
+import org.commcare.dalvik.abha.utility.DialogType
+import org.commcare.dalvik.abha.utility.DialogUtility
 import org.commcare.dalvik.abha.viewmodel.GenerateAbhaUiState
 import org.commcare.dalvik.abha.viewmodel.PatientViewModel
 import org.commcare.dalvik.domain.model.HealthContentModel
 import org.commcare.dalvik.domain.model.PatientHealthDataModel
-import timber.log.Timber
 
 class PatientHealthDataFragment :
     BaseFragment<PatientHealthDataBinding>(PatientHealthDataBinding::inflate) {
@@ -30,6 +35,14 @@ class PatientHealthDataFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        binding.name =  arguments?.getString("patient_name")
+        binding.dob =  arguments?.getString("dob")
+        binding.age =  arguments?.getString("age")
+        binding.gender =  arguments?.getString("gender")
+        binding.phone =  arguments?.getString("phone_number")
+        binding.abhaId =  arguments?.getString("abha_id")
+        binding.abhaNum =  arguments?.getString("abha_number")
+
         arguments?.getString("artefactId")?.let { artefactId ->
 
             healthDataAdapter = HealthDataAdapter(healthDataList, this::launchImgAndPdfFragment)
@@ -77,8 +90,15 @@ class PatientHealthDataFragment :
                                 )
                             } ?: run {
                                 viewModel.uiState.emit(GenerateAbhaUiState.Loading(false))
+                                if(healthDataModel.results.isEmpty()){
+                                        DialogUtility.showDialog(
+                                            activity as AbdmActivity,
+                                            resources.getString(R.string.no_health_data_available),
+                                            { findNavController().popBackStack()},
+                                            DialogType.General
+                                        )
+                                }
                             }
-
                         }
 
                         is GenerateAbhaUiState.Error -> {
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/ScanAbhaFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/ScanAbhaFragment.kt
index e36003e..4eddcc0 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/ScanAbhaFragment.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/ScanAbhaFragment.kt
@@ -11,12 +11,9 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
-import com.budiyev.android.codescanner.AutoFocusMode
-import com.budiyev.android.codescanner.CodeScanner
-import com.budiyev.android.codescanner.DecodeCallback
-import com.budiyev.android.codescanner.ErrorCallback
-import com.budiyev.android.codescanner.ScanMode
+
 import com.google.gson.Gson
+import com.journeyapps.barcodescanner.ScanOptions
 import org.commcare.dalvik.abha.R
 import org.commcare.dalvik.abha.databinding.ScanAbhaBinding
 import org.commcare.dalvik.abha.ui.main.activity.AbdmActivity
@@ -27,7 +24,7 @@ import timber.log.Timber
 
 class ScanAbhaFragment : BaseFragment<ScanAbhaBinding>(ScanAbhaBinding::inflate) {
 
-    private lateinit var codeScanner: CodeScanner
+//    private lateinit var codeScanner: CodeScanner
     val viewmodel: ScanAbhaViewModel by activityViewModels()
     lateinit var requestPermissionLauncher: ActivityResultLauncher<String>
 
@@ -37,6 +34,8 @@ class ScanAbhaFragment : BaseFragment<ScanAbhaBinding>(ScanAbhaBinding::inflate)
         binding.clickHandler = this
 
 
+
+
         val callback = object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
 
@@ -61,22 +60,22 @@ class ScanAbhaFragment : BaseFragment<ScanAbhaBinding>(ScanAbhaBinding::inflate)
     }
 
     private fun initScanner() {
-        codeScanner = CodeScanner(requireContext(), binding.scannerView).apply {
-            camera = CodeScanner.CAMERA_BACK
-            formats = CodeScanner.ALL_FORMATS
-            autoFocusMode = AutoFocusMode.CONTINUOUS
-            scanMode = ScanMode.SINGLE
-            isAutoFocusEnabled = true
-            isFlashEnabled = false
-            decodeCallback = DecodeCallback {
-                releaseScanner()
-                validateScannedData(it.text)
-            }
-            errorCallback = ErrorCallback {
-                Timber.d("scan===> ${it.message}")
-                releaseScanner()
-            }
-        }
+//        codeScanner = CodeScanner(requireContext(), binding.scannerView).apply {
+//            camera = CodeScanner.CAMERA_BACK
+//            formats = CodeScanner.ALL_FORMATS
+//            autoFocusMode = AutoFocusMode.CONTINUOUS
+//            scanMode = ScanMode.SINGLE
+//            isAutoFocusEnabled = true
+//            isFlashEnabled = false
+//            decodeCallback = DecodeCallback {
+//                releaseScanner()
+//                validateScannedData(it.text)
+//            }
+//            errorCallback = ErrorCallback {
+//                Timber.d("scan===> ${it.message}")
+//                releaseScanner()
+//            }
+//        }
     }
 
 
@@ -103,12 +102,13 @@ class ScanAbhaFragment : BaseFragment<ScanAbhaBinding>(ScanAbhaBinding::inflate)
 
     private fun startScanner() {
         binding.scanViewHolder.visibility = View.VISIBLE
-        codeScanner.startPreview()
+//        codeScanner.startPreview()
+        (activity as AbdmActivity).scanBarcode(this::onBarcodeDataReceived)
     }
 
     private fun releaseScanner() {
-        codeScanner.stopPreview()
-        codeScanner.releaseResources()
+//        codeScanner.stopPreview()
+//        codeScanner.releaseResources()
         activity?.runOnUiThread {
             binding.scanViewHolder.visibility = View.GONE
         }
@@ -177,4 +177,8 @@ class ScanAbhaFragment : BaseFragment<ScanAbhaBinding>(ScanAbhaBinding::inflate)
 
     }
 
+     fun onBarcodeDataReceived(scannedDate: String?){
+         validateScannedData(scannedDate)
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/ScanAbhaResultFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/ScanAbhaResultFragment.kt
index 0d76844..ec46989 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/ScanAbhaResultFragment.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/ScanAbhaResultFragment.kt
@@ -18,6 +18,7 @@ import org.commcare.dalvik.abha.ui.main.activity.AbdmActivity
 import org.commcare.dalvik.abha.ui.main.activity.AbdmResponseCode
 import org.commcare.dalvik.abha.viewmodel.GenerateAbhaUiState
 import org.commcare.dalvik.abha.viewmodel.ScanAbhaViewModel
+import timber.log.Timber
 
 class ScanAbhaResultFragment : BaseFragment<ScanAbhaResultBinding>(ScanAbhaResultBinding::inflate) {
 
@@ -72,6 +73,20 @@ class ScanAbhaResultFragment : BaseFragment<ScanAbhaResultBinding>(ScanAbhaResul
                             )
                         }
 
+                        is GenerateAbhaUiState.AbdmError -> {
+                            binding.dispatchScanResult.isEnabled = true
+                            viewModel.uiState.emit(GenerateAbhaUiState.Loading(false))
+                            viewModel.abhaScanModel.validationState =  AbhaScanModel.AbhaValidationState.INVALID
+                            binding.verificationStatus.text = viewModel.abhaScanModel.validationState.value
+                            binding.verificationStatus.setTextColor(
+                                ContextCompat.getColor(
+                                    requireContext(),
+                                    R.color.red
+                                )
+                            )
+                            (activity as AbdmActivity).showBlockerDialog(it.data.message)
+                        }
+
                         else -> {
                             //exhaustive block
                         }
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/SelectAuthenticationFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/SelectAuthenticationFragment.kt
index e5d07b7..4a6981e 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/SelectAuthenticationFragment.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/SelectAuthenticationFragment.kt
@@ -82,7 +82,11 @@ class SelectAuthenticationFragment :
                                         setAdapter(adapter)
                                         setOnItemClickListener(this@SelectAuthenticationFragment)
                                         if (authList.size == 1) {
-                                            setText(adapter.getItem(0).toString(), false)
+                                            val selAuthValue = adapter.getItem(0).toString()
+                                            setText(selAuthValue, false)
+                                            binding.startVerfication.isEnabled = true
+                                            viewModel.selectedAuthMethod = if (selAuthValue.contains("mobile",true))
+                                                "MOBILE_OTP" else "AADHAAR_OTP"
                                         }
                                     }
 
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/VerifyMobileOtpFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/VerifyMobileOtpFragment.kt
index 8efc51d..32e8cfa 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/VerifyMobileOtpFragment.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/VerifyMobileOtpFragment.kt
@@ -230,6 +230,7 @@ class VerifyMobileOtpFragment :
                                         it.data,
                                         AbhaVerificationResultModel::class.java
                                     )
+                                    abhaVerificationResultModel.putAadharData(it.data)
 //                                    arguments?.getString("abhaId")?.let {
 //                                        abhaVerificationResultModel.healthId = it
 //                                    }
diff --git a/app/src/main/java/org/commcare/dalvik/abha/utility/CommonUtil.kt b/app/src/main/java/org/commcare/dalvik/abha/utility/CommonUtil.kt
index 1a6b7fe..fe3224e 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/utility/CommonUtil.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/utility/CommonUtil.kt
@@ -1,23 +1,33 @@
 package org.commcare.dalvik.abha.utility
 
 import org.commcare.dalvik.domain.model.DATE_FORMAT
+import timber.log.Timber
 import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.TimeZone
+import java.util.*
 
 object CommonUtil {
 
-    fun getUserFormatDate(serverDate:String):String?{
+    fun getTimeInMillis(date: String): Long {
+        val sdf = SimpleDateFormat(DATE_FORMAT.SERVER.format)
+        val date = sdf.parse(date)
+        return date.time
+    }
+
+    fun getUserFormatDate(serverDate: String): String? {
         var date: Date
         val formatter = SimpleDateFormat(DATE_FORMAT.SERVER.format)
         date = formatter.parse(serverDate)
         return getFormattedDateTime(date.time, DATE_FORMAT.USER.format)
     }
 
-    fun getFormattedDateTime(ts: Long,dateFormat:String): String? {
+    fun covertDateToServerFormat(date: String): String? {
+        val formatter = SimpleDateFormat(DATE_FORMAT.SERVER.format)
+        return formatter.parse(date).toString()
+    }
+
+    fun getFormattedDateTime(ts: Long, dateFormat: String): String? {
         return try {
-            val sdf = SimpleDateFormat(dateFormat , Locale.US)
+            val sdf = SimpleDateFormat(dateFormat, Locale.US)
             sdf.timeZone = TimeZone.getTimeZone("UTC")
             val netDate = Date(ts)
             sdf.format(netDate)
@@ -25,4 +35,32 @@ object CommonUtil {
             null
         }
     }
+
+    fun getGMTFormattedDateTime(ts: Long, dateFormat: String): String? {
+        return try {
+            val sdf = SimpleDateFormat(dateFormat, Locale.US)
+            sdf.format(Date(ts))
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    fun getUtcTimeFromDate(date: String, dateFormat: DATE_FORMAT = DATE_FORMAT.SERVER): String? {
+        try {
+            Timber.d("+++Server Date --> ${date}")
+            val sdf = SimpleDateFormat(DATE_FORMAT.SERVER.format, Locale.getDefault())
+            sdf.timeZone = TimeZone.getTimeZone("UTC")
+            var date = sdf.parse(date)
+
+            Timber.d("+++UTC   Date --> ${date}")
+
+            val ndf = SimpleDateFormat(dateFormat.format, Locale.getDefault())
+            val newDate = ndf.format(date)
+            Timber.d("+++FORMATTED UTC   Date --> ${newDate}")
+            return newDate
+        } catch (e: Exception) {
+            Timber.d("+++EXCEPTION --> ${e.message}")
+            return ""
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/commcare/dalvik/abha/viewmodel/AbdmViewModel.kt b/app/src/main/java/org/commcare/dalvik/abha/viewmodel/AbdmViewModel.kt
index 1fd0ae4..a2ef830 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/viewmodel/AbdmViewModel.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/viewmodel/AbdmViewModel.kt
@@ -32,7 +32,8 @@ class AbdmViewModel @Inject constructor(
     private val confirmAadhaarOtpUsecase: ConfirmAadhaarOtpUsecase,
     private val confirmMobileOtpUsecase: ConfirmMobileOtpUsecase,
     private val abhaAvailbilityUsecase: AbhaAvailabilityUsecase,
-    private val fetchAbhaCardUseCase: FetchAbhaCardUseCase
+    private val fetchAbhaCardUseCase: FetchAbhaCardUseCase,
+    private val notifyPatientUsecase: NotifyPatientUsecase
 ) : BaseViewModel() {
     var selectedAuthMethod: String? = null
     var checkAbhaResponseModel:MutableLiveData<CheckAbhaResponseModel> = MutableLiveData()
@@ -675,6 +676,14 @@ class AbdmViewModel @Inject constructor(
                            )
                        )
                    }
+                   is HqResponseModel.AbdmError -> {
+                       uiState.emit(
+                           GenerateAbhaUiState.AbdmError(
+                               it.value,
+                               RequestType.ABHA_AVAILABILITY
+                           )
+                       )
+                   }
                    else -> {
                        //exhaustive block
                    }
@@ -709,6 +718,14 @@ class AbdmViewModel @Inject constructor(
                             )
                         )
                     }
+                    is HqResponseModel.AbdmError -> {
+                        uiState.emit(
+                            GenerateAbhaUiState.AbdmError(
+                                it.value,
+                                RequestType.FETCH_ABHA_CARD
+                            )
+                        )
+                    }
                     else -> {
                         //exhaustive block
                     }
@@ -717,6 +734,46 @@ class AbdmViewModel @Inject constructor(
         }
     }
 
+    fun notifyPatient(patientNotificationModel: PatientNotificationModel) {
+      viewModelScope.launch {
+          notifyPatientUsecase.execute(patientNotificationModel).collect{
+              when (it) {
+                  HqResponseModel.Loading -> {
+                      uiState.emit(GenerateAbhaUiState.InvalidState)
+                      uiState.emit(GenerateAbhaUiState.Loading(true))
+                  }
+                  is HqResponseModel.Success -> {
+                      uiState.emit(
+                          GenerateAbhaUiState.Success(
+                              it.value,
+                              RequestType.NOTIFY_PATIENT
+                          )
+                      )
+                  }
+                  is HqResponseModel.Error -> {
+                      uiState.emit(
+                          GenerateAbhaUiState.Error(
+                              it.value,
+                              RequestType.NOTIFY_PATIENT
+                          )
+                      )
+                  }
+                  is HqResponseModel.AbdmError -> {
+                      uiState.emit(
+                          GenerateAbhaUiState.AbdmError(
+                              it.value,
+                              RequestType.NOTIFY_PATIENT
+                          )
+                      )
+                  }
+                  else -> {
+                      //exhaustive block
+                  }
+              }
+          }
+      }
+    }
+
 }
 
 /**
diff --git a/app/src/main/java/org/commcare/dalvik/abha/viewmodel/BaseViewModel.kt b/app/src/main/java/org/commcare/dalvik/abha/viewmodel/BaseViewModel.kt
index 323d8a5..399ff94 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/viewmodel/BaseViewModel.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/viewmodel/BaseViewModel.kt
@@ -60,5 +60,6 @@ enum class RequestType {
     CC_AUTH_METHODS,
     CC_AUTH_INIT,
     CC_AUTH_CONFIRM,
-    CC_LINK
+    CC_LINK,
+    NOTIFY_PATIENT
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/commcare/dalvik/abha/viewmodel/CareContextViewModel.kt b/app/src/main/java/org/commcare/dalvik/abha/viewmodel/CareContextViewModel.kt
index 6ec9171..5e8f8ce 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/viewmodel/CareContextViewModel.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/viewmodel/CareContextViewModel.kt
@@ -98,7 +98,7 @@ class CareContextViewModel @Inject constructor(
         viewModelScope.launch {
             selectedAuthMethod.let { authMethod ->
                 linkCareContextModel.getAuthModesRequestModel(authMethod)?.let { ccAuthReqModel ->
-                    //save otp req call count
+                    //save otp req call count only if not via demographic option here
                     saveOtpRequestCallCount(linkCareContextModel.hipId)
 
                     generateCareContextOtpUsecase.execute(ccAuthReqModel).collect { hqRespModel ->
diff --git a/app/src/main/java/org/commcare/dalvik/abha/viewmodel/PatientViewModel.kt b/app/src/main/java/org/commcare/dalvik/abha/viewmodel/PatientViewModel.kt
index 0d40b10..eec26cc 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/viewmodel/PatientViewModel.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/viewmodel/PatientViewModel.kt
@@ -5,13 +5,14 @@ import androidx.paging.cachedIn
 import com.google.gson.Gson
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import org.commcare.dalvik.abha.model.FilterModel
 import org.commcare.dalvik.abha.ui.main.fragment.ACCESS_MODE
 import org.commcare.dalvik.abha.ui.main.fragment.PURPOSE
+import org.commcare.dalvik.abha.utility.CommonUtil
 import org.commcare.dalvik.abha.utility.PropMutableLiveData
 import org.commcare.dalvik.domain.model.ConsentPermission
+import org.commcare.dalvik.domain.model.DATE_FORMAT
 import org.commcare.dalvik.domain.model.HealthContentModel
 import org.commcare.dalvik.domain.model.HqResponseModel
 import org.commcare.dalvik.domain.model.IdNameModel
@@ -42,12 +43,12 @@ class PatientViewModel @Inject constructor(
     lateinit var patientHealthData:Pair<String,MutableList<HealthContentModel>>
 
 
-    fun init(patientId: String, hiuId: String) {
+    fun init(patientId: String, hiuId: String ,requesterValue:String) {
         this.patientConsentModel =
             PatientConsentDetailModel(Purpose(PURPOSE.CAREMGT.name)).apply {
                 hiu = IdNameModel(hiuId)
                 patient = Patient(patientId)
-                requester = Requester("Dr. Manju")
+                requester = Requester(requesterValue)
                 permission = ConsentPermission(ACCESS_MODE.VIEW.value)
             }
     }
@@ -63,13 +64,43 @@ class PatientViewModel @Inject constructor(
     }
 
     fun submitPatientConsent() {
-        val consentJson = Gson().toJson(patientConsentModel)
+        val UTC_DIFF = (30 * 60 * 1000) + (5 * 60 * 60 * 1000)
+        val serverCopyPatientModel = Gson().fromJson(Gson().toJson(patientConsentModel),PatientConsentDetailModel::class.java)
+
+        serverCopyPatientModel.permission.expiryDate?.let {
+            Timber.d("+++ ORG Expiry Date == ${it}")
+            val expiryMs = CommonUtil.getTimeInMillis(it) - UTC_DIFF
+            CommonUtil.getGMTFormattedDateTime(expiryMs , DATE_FORMAT.SERVER.format)?.let {
+                serverCopyPatientModel.setPermissionExpiryDate(it)
+                Timber.d("+++ Final Expiry Date == ${it}")
+            }
+        }
+
+        serverCopyPatientModel.permission.dateRange.startDate?.let {
+            Timber.d("+++ ORG Start Date == ${it}")
+            val startMs = CommonUtil.getTimeInMillis(it) - UTC_DIFF
+            CommonUtil.getGMTFormattedDateTime(startMs , DATE_FORMAT.SERVER.format)?.let {
+                serverCopyPatientModel.permission.dateRange.startDate = it
+                Timber.d("+++ Final Start Date == ${it}")
+            }
+        }
+
+        serverCopyPatientModel.permission.dateRange.endDate?.let {
+            Timber.d("+++ ORG End Date == ${it}")
+            val endMs = CommonUtil.getTimeInMillis(it) - UTC_DIFF
+            CommonUtil.getGMTFormattedDateTime(endMs , DATE_FORMAT.SERVER.format)?.let {
+                serverCopyPatientModel.permission.dateRange.endDate = it
+                Timber.d("+++ Final End Date == ${it}")
+            }
+        }
+
+        val consentJson = Gson().toJson(serverCopyPatientModel)
         Timber.d(
             "Consent JSON ===>  ${consentJson} "
         )
 
         viewModelScope.launch {
-            submitPatientConsentUseCase.execute(patientConsentModel).collect {
+            submitPatientConsentUseCase.execute(serverCopyPatientModel).collect {
                 when (it) {
                     HqResponseModel.Loading -> {
                         uiState.emit(GenerateAbhaUiState.InvalidState)
@@ -94,6 +125,15 @@ class PatientViewModel @Inject constructor(
                         )
                     }
 
+                    is HqResponseModel.AbdmError -> {
+                        uiState.emit(
+                            GenerateAbhaUiState.AbdmError(
+                                it.value,
+                                RequestType.CREATE_PATIENT_CONSENT
+                            )
+                        )
+                    }
+
                     else -> {
                         //exhaustive block
                     }
diff --git a/app/src/main/java/org/commcare/dalvik/abha/viewmodel/ScanAbhaViewModel.kt b/app/src/main/java/org/commcare/dalvik/abha/viewmodel/ScanAbhaViewModel.kt
index 8ecf766..8efd7d6 100644
--- a/app/src/main/java/org/commcare/dalvik/abha/viewmodel/ScanAbhaViewModel.kt
+++ b/app/src/main/java/org/commcare/dalvik/abha/viewmodel/ScanAbhaViewModel.kt
@@ -31,6 +31,7 @@ class ScanAbhaViewModel @Inject constructor(private val abhaAvailbilityUsecase:
                abhaAvailbilityUsecase.execute(AbhaVerificationRequestModel(abhaId)).collect {
                    when (it) {
                        HqResponseModel.Loading -> {
+                           uiState.emit(GenerateAbhaUiState.InvalidState)
                            uiState.emit(GenerateAbhaUiState.Loading(true))
                        }
 
@@ -51,6 +52,14 @@ class ScanAbhaViewModel @Inject constructor(private val abhaAvailbilityUsecase:
                                )
                            )
                        }
+                       is HqResponseModel.AbdmError -> {
+                           uiState.emit(
+                               GenerateAbhaUiState.AbdmError(
+                                   it.value,
+                                   RequestType.ABHA_AVAILABILITY
+                               )
+                           )
+                       }
                        else -> {
                            //exhaustive block
                        }
diff --git a/app/src/main/res/layout/activity_test.xml b/app/src/main/res/layout/activity_test.xml
index 44a6383..8216be1 100644
--- a/app/src/main/res/layout/activity_test.xml
+++ b/app/src/main/res/layout/activity_test.xml
@@ -18,14 +18,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="32dp"
-            android:text="With -> Mobile Number"
+            android:text="Verify ABHA With -> Mobile Number"
          />
 
         <Button
             android:id="@+id/intentB"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="With -> AbhaId"
+            android:text="Create ABHA With -> AbhaId"
             android:layout_marginBottom="32dp"
           />
 
@@ -52,6 +52,14 @@
             android:text="Link Care Context"
             />
 
+        <Button
+            android:id="@+id/notifyPatient"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="32dp"
+            android:text="Notify Patient"
+            />
+
 
         <TextView
             android:id="@+id/textView"
diff --git a/app/src/main/res/layout/consent_artefact_item_layout.xml b/app/src/main/res/layout/consent_artefact_item_layout.xml
index 0d5e57a..959950a 100644
--- a/app/src/main/res/layout/consent_artefact_item_layout.xml
+++ b/app/src/main/res/layout/consent_artefact_item_layout.xml
@@ -85,7 +85,7 @@
                 <com.google.android.material.chip.ChipGroup
                     android:id="@+id/careContextChipGroup"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/_100dp"
+                    android:layout_height="wrap_content"
                     android:padding="@dimen/_5dp"
                     android:visibility="gone"
                     app:layout_constraintBottom_toTopOf="@+id/textView12"
diff --git a/app/src/main/res/layout/disclaimer_fragment.xml b/app/src/main/res/layout/disclaimer_fragment.xml
index 5affd95..aeae9ea 100644
--- a/app/src/main/res/layout/disclaimer_fragment.xml
+++ b/app/src/main/res/layout/disclaimer_fragment.xml
@@ -125,7 +125,6 @@
                 android:layout_marginTop="16dp"
                 android:hint="@string/abha_to_check"
                 app:endIconMode="clear_text"
-                app:suffixText="@string/custom_abha_suffix"
                 app:helperTextTextColor="@color/red"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
@@ -185,7 +184,7 @@
             <TextView
                 android:id="@+id/textView6"
                 android:layout_width="0dp"
-                android:layout_height="74dp"
+                android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 android:layout_marginLeft="8dp"
                 android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/fragment_abha_creation_result.xml b/app/src/main/res/layout/fragment_abha_creation_result.xml
index e2f9aa4..c222b88 100644
--- a/app/src/main/res/layout/fragment_abha_creation_result.xml
+++ b/app/src/main/res/layout/fragment_abha_creation_result.xml
@@ -91,6 +91,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
                 android:checked="true"
+                android:visibility="gone"
                 android:text="@string/USE_ADHR_DATA_IN_COMMCARE"
                 app:layout_constraintBottom_toTopOf="@+id/done"
                 app:layout_constraintEnd_toStartOf="@+id/guideline5"
diff --git a/app/src/main/res/layout/fragment_cc_auth_modes.xml b/app/src/main/res/layout/fragment_cc_auth_modes.xml
index b25686a..9c06924 100644
--- a/app/src/main/res/layout/fragment_cc_auth_modes.xml
+++ b/app/src/main/res/layout/fragment_cc_auth_modes.xml
@@ -60,7 +60,61 @@
                     android:gravity="center_vertical|start"
                     android:paddingStart="@dimen/_2dp"
                     android:paddingLeft="@dimen/_2dp"
-                    android:text="@string/abha_num" />
+                    android:text="@string/referenceNum" />
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:gravity="center_vertical|end"
+                    android:paddingEnd="@dimen/_2dp"
+                    android:paddingRight="@dimen/_2dp"
+                    android:text="@{reqModel.patient.referenceNumber}" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:minHeight="@dimen/_32dp">
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|start"
+                    android:paddingStart="@dimen/_2dp"
+                    android:paddingLeft="@dimen/_2dp"
+                    android:text="@string/display" />
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:gravity="center_vertical|end"
+                    android:paddingEnd="@dimen/_2dp"
+                    android:paddingRight="@dimen/_2dp"
+                    android:text="@{reqModel.patient.display}" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:minHeight="@dimen/_32dp">
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|start"
+                    android:paddingStart="@dimen/_2dp"
+                    android:paddingLeft="@dimen/_2dp"
+                    android:text="@string/abha_address" />
 
                 <TextView
                     style="@style/Headline2"
@@ -74,6 +128,33 @@
 
             </TableRow>
 
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:minHeight="@dimen/_32dp">
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|start"
+                    android:paddingStart="@dimen/_2dp"
+                    android:paddingLeft="@dimen/_2dp"
+                    android:text="@string/abha_number" />
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="3"
+                    android:gravity="center_vertical|end"
+                    android:paddingEnd="@dimen/_2dp"
+                    android:paddingRight="@dimen/_2dp"
+                    android:text="@{reqModel.abhaNumber}" />
+
+            </TableRow>
+
             <TableRow
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
@@ -104,7 +185,8 @@
             <TableRow
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:minHeight="@dimen/_32dp">
+                android:minHeight="@dimen/_32dp"
+                android:visibility="gone">
 
                 <TextView
                     style="@style/Headline2"
@@ -134,17 +216,17 @@
                     android:gravity="center_vertical|start"
                     android:paddingStart="@dimen/_2dp"
                     android:paddingLeft="@dimen/_2dp"
-                    android:text="@string/referenceNum" />
+                    android:text="@string/name" />
 
                 <TextView
                     style="@style/Headline2"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="2"
+                    android:layout_weight="3"
                     android:gravity="center_vertical|end"
                     android:paddingEnd="@dimen/_2dp"
                     android:paddingRight="@dimen/_2dp"
-                    android:text="@{reqModel.patient.referenceNumber}" />
+                    android:text="@{reqModel.patient.demographics.name}" />
 
             </TableRow>
 
@@ -161,20 +243,75 @@
                     android:gravity="center_vertical|start"
                     android:paddingStart="@dimen/_2dp"
                     android:paddingLeft="@dimen/_2dp"
-                    android:text="@string/display" />
+                    android:text="@string/gender" />
 
                 <TextView
                     style="@style/Headline2"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="2"
+                    android:layout_weight="3"
                     android:gravity="center_vertical|end"
                     android:paddingEnd="@dimen/_2dp"
                     android:paddingRight="@dimen/_2dp"
-                    android:text="@{reqModel.patient.display}" />
+                    android:text="@{reqModel.patient.demographics.gender}" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:minHeight="@dimen/_32dp">
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|start"
+                    android:paddingStart="@dimen/_2dp"
+                    android:paddingLeft="@dimen/_2dp"
+                    android:text="@string/dateOfBirth" />
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="3"
+                    android:gravity="center_vertical|end"
+                    android:paddingEnd="@dimen/_2dp"
+                    android:paddingRight="@dimen/_2dp"
+                    android:text="@{reqModel.patient.demographics.dateOfBirth}" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:minHeight="@dimen/_32dp">
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|start"
+                    android:paddingStart="@dimen/_2dp"
+                    android:paddingLeft="@dimen/_2dp"
+                    android:text="@string/phone" />
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="3"
+                    android:gravity="center_vertical|end"
+                    android:paddingEnd="@dimen/_2dp"
+                    android:paddingRight="@dimen/_2dp"
+                    android:text="@{reqModel.patient.demographics.phoneNumber}" />
 
             </TableRow>
 
+
         </TableLayout>
 
         <com.google.android.material.textfield.TextInputLayout
@@ -203,6 +340,22 @@
         </com.google.android.material.textfield.TextInputLayout>
 
 
+        <Button
+            android:id="@+id/ccStartAuth"
+            style="@style/RoundStyleButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="8dp"
+            android:onClickListener="@{clickHandler}"
+            android:text="@string/start_auth"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/authModeInputLayout" />
+
         <Button
             android:id="@+id/ccGenerateAuthOtp"
             style="@style/RoundStyleButton"
@@ -214,6 +367,7 @@
             android:enabled="false"
             android:onClickListener="@{clickHandler}"
             android:text="@string/GEN_OTP"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_create_patient_consent.xml b/app/src/main/res/layout/fragment_create_patient_consent.xml
index c6a9ef6..990f334 100644
--- a/app/src/main/res/layout/fragment_create_patient_consent.xml
+++ b/app/src/main/res/layout/fragment_create_patient_consent.xml
@@ -89,8 +89,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/_24dp"
-                android:hint="@string/hipId"
-                android:visibility="gone"
+                android:hint="@string/patient_name"
                 app:layout_constraintBottom_toTopOf="@+id/hiuIdInputLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
@@ -98,9 +97,10 @@
                 app:layout_constraintTop_toBottomOf="@+id/patientIdInputLayout">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/hipId"
+                    android:id="@+id/patientName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:enabled="false"
                     android:textColor="@color/black" />
 
             </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/fragment_generate_cc_otp.xml b/app/src/main/res/layout/fragment_generate_cc_otp.xml
index 2c650f4..5d6e02b 100644
--- a/app/src/main/res/layout/fragment_generate_cc_otp.xml
+++ b/app/src/main/res/layout/fragment_generate_cc_otp.xml
@@ -6,6 +6,16 @@
     <data class="GenerateCCOtpBinding">
 
         <import type="org.commcare.dalvik.domain.model.TranslationKey" />
+        <import type="android.view.View"/>
+
+
+        <variable
+            name="isVerifyWithDemoGraphics"
+            type="Boolean"
+            />
+        <variable
+            name="demograhicModel"
+            type="org.commcare.dalvik.domain.model.Demographic" />
 
         <variable
             name="model"
@@ -20,100 +30,240 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/otpInputLayout"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:hint="@string/ENTER_OTP"
-            android:orientation="vertical"
-            app:endIconMode="clear_text"
-            app:helperTextEnabled="true"
-            app:layout_constraintEnd_toStartOf="@+id/guideline5"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="@{isVerifyWithDemoGraphics ? View.VISIBLE : View.GONE}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="@+id/guideline4"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.5">
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/otpEt"
-                style="@style/EditTextStyle"
-                android:layout_width="match_parent"
+            <TableLayout
+                android:id="@+id/demographicDataLayout"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:hint="@string/ENTER_OTP"
-                android:inputType="number"
-                android:maxLength="6" />
-        </com.google.android.material.textfield.TextInputLayout>
+                android:orientation="vertical"
+                android:padding="1dp"
+                android:layout_margin="@dimen/_10dp"
+                android:stretchColumns="*"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.5">
 
+                <TableRow
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/bgColor"
+                    android:minHeight="32dp">
 
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_begin="@dimen/guidelineMargin" />
+                    <TextView
+                        style="@style/Headline1"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:paddingStart="2dp"
+                        android:paddingLeft="2dp"
+                        android:text="@string/name" />
 
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline5"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_end="@dimen/guidelineMargin" />
+                    <TextView
+                        style="@style/Headline2"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:paddingEnd="2dp"
+                        android:paddingRight="2dp"
+                        android:text="@{demograhicModel.name}"
+                        />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/resentOtpContainer"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/_32dp"
-            app:layout_constraintEnd_toStartOf="@+id/guideline5"
-            app:layout_constraintStart_toStartOf="@+id/guideline4"
-            app:layout_constraintTop_toBottomOf="@+id/otpInputLayout">
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/white"
+                    android:minHeight="32dp">
+
+                    <TextView
+                        style="@style/Headline1"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:paddingStart="2dp"
+                        android:paddingLeft="2dp"
+                        android:text="@string/gender" />
+
+                    <TextView
+                        style="@style/Headline1"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:paddingEnd="2dp"
+                        android:paddingRight="2dp"
+                        android:text="@{demograhicModel.gender}"
+                        android:textStyle="bold"
+                        tools:text="SUCCESS" />
+
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/bgColor"
+                    android:minHeight="32dp">
+
+                    <TextView
+                        style="@style/Headline1"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:paddingStart="2dp"
+                        android:paddingLeft="2dp"
+                        android:text="@string/dateOfBirth" />
+
+                    <TextView
+                        style="@style/Headline1"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:paddingEnd="2dp"
+                        android:paddingRight="2dp"
+                        android:text="@{demograhicModel.dateOfBirth}"
+                        android:textStyle="bold"
+                        tools:text="SUCCESS" />
+
+                </TableRow>
+
+
+            </TableLayout>
 
             <Button
-                android:id="@+id/resendCCOtp"
+                android:id="@+id/startAuth"
                 style="@style/RoundStyleButton"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_margin="@dimen/_10dp"
+                android:layout_marginBottom="16dp"
                 android:onClickListener="@{clickHandler}"
-                android:text="@string/RESEND_OTP"
-                android:enabled="false"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/timeProgress"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintHorizontal_chainStyle="spread_inside"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.5"
-                tools:text="Resend" />
-
-            <org.commcare.dalvik.abha.ui.main.custom.TimeProgressBar
-                android:id="@+id/timeProgress"
-                android:layout_width="@dimen/_32dp"
-                android:layout_height="32dp"
-                android:visibility="gone"
+                android:text="@string/verify"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.5"
+            android:visibility="@{isVerifyWithDemoGraphics ? View.GONE : View.VISIBLE}"
+            >
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/otpInputLayout"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:hint="@string/ENTER_OTP"
+                android:orientation="vertical"
+                app:endIconMode="clear_text"
+                app:helperTextEnabled="true"
+                app:layout_constraintEnd_toStartOf="@+id/guideline5"
                 app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@+id/resendCCOtp"
+                app:layout_constraintStart_toStartOf="@+id/guideline4"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.5" />
+                >
 
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/otpEt"
+                    style="@style/EditTextStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/ENTER_OTP"
+                    android:inputType="number"
+                    android:maxLength="6" />
+            </com.google.android.material.textfield.TextInputLayout>
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_begin="@dimen/guidelineMargin" />
 
-        <Button
-            android:id="@+id/verifyCCOtp"
-            style="@style/RoundStyleButton"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/_16dp"
-            android:enabled="false"
-            android:onClickListener="@{clickHandler}"
-            app:layout_constraintEnd_toStartOf="@+id/guideline5"
-            app:layout_constraintStart_toStartOf="@+id/guideline4"
-            app:layout_constraintTop_toBottomOf="@+id/resentOtpContainer"
-            android:text="@string/VERIFY"
-            />
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline5"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_end="@dimen/guidelineMargin" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/resentOtpContainer"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/_32dp"
+                app:layout_constraintEnd_toStartOf="@+id/guideline5"
+                app:layout_constraintStart_toStartOf="@+id/guideline4"
+                app:layout_constraintTop_toBottomOf="@+id/otpInputLayout">
+
+                <Button
+                    android:id="@+id/resendCCOtp"
+                    style="@style/RoundStyleButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:enabled="false"
+                    android:onClickListener="@{clickHandler}"
+                    android:text="@string/RESEND_OTP"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/timeProgress"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintHorizontal_chainStyle="spread_inside"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.5"
+                    tools:text="Resend" />
+
+                <org.commcare.dalvik.abha.ui.main.custom.TimeProgressBar
+                    android:id="@+id/timeProgress"
+                    android:layout_width="@dimen/_32dp"
+                    android:layout_height="32dp"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/resendCCOtp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.5" />
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+            <Button
+                android:id="@+id/verifyCCOtp"
+                style="@style/RoundStyleButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/_16dp"
+                android:enabled="false"
+                android:onClickListener="@{clickHandler}"
+                android:text="@string/VERIFY"
+                app:layout_constraintEnd_toStartOf="@+id/guideline5"
+                app:layout_constraintStart_toStartOf="@+id/guideline4"
+                app:layout_constraintTop_toBottomOf="@+id/resentOtpContainer" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_patient_consent_layout.xml b/app/src/main/res/layout/fragment_patient_consent_layout.xml
index 72c0a68..4aba6fb 100644
--- a/app/src/main/res/layout/fragment_patient_consent_layout.xml
+++ b/app/src/main/res/layout/fragment_patient_consent_layout.xml
@@ -70,7 +70,7 @@
             android:layout_height="0dp"
             android:background="@color/lightest_grey"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toTopOf="@+id/createConsentBtn"
+            app:layout_constraintBottom_toTopOf="@+id/btnHolder"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
@@ -87,26 +87,58 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/createConsentBtn"
+            app:layout_constraintTop_toBottomOf="@+id/btnHolder"
             app:layout_constraintVertical_bias="0.5" />
 
-        <Button
-            android:id="@+id/createConsentBtn"
-            android:layout_width="0dp"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/btnHolder"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-            android:layout_gravity="end|bottom"
-            android:layout_margin="@dimen/_8dp"
-            android:contentDescription="@string/create_consent"
-            android:text="@string/create_consent"
-            android:textColor="@color/white"
-            app:backgroundTint="@color/primary_button_background"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintBottom_toTopOf="@+id/loadingLayout"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/consentList" />
+            app:layout_constraintTop_toBottomOf="@+id/consentList">
+
+            <Button
+                android:id="@+id/backBt"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:layout_margin="@dimen/_8dp"
+                android:contentDescription="@string/create_consent"
+                android:text="@string/back"
+                android:textColor="@color/white"
+                app:backgroundTint="@color/primary_button_background"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/createConsentBtn"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.5" />
+
+            <Button
+                android:id="@+id/createConsentBtn"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:layout_margin="@dimen/_8dp"
+                android:contentDescription="@string/create_consent"
+                android:text="@string/create_consent"
+                android:textColor="@color/white"
+                app:backgroundTint="@color/primary_button_background"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toEndOf="@+id/backBt"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.5" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/fragment_scan_abha.xml b/app/src/main/res/layout/fragment_scan_abha.xml
index 6e661f4..3e9d073 100644
--- a/app/src/main/res/layout/fragment_scan_abha.xml
+++ b/app/src/main/res/layout/fragment_scan_abha.xml
@@ -87,18 +87,7 @@
                     app:srcCompat="@drawable/ic_baseline_close_24"
                     app:tint="@color/red" />
 
-                <com.budiyev.android.codescanner.CodeScannerView
-                    android:id="@+id/scanner_view"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.5"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_bias="0.5">
 
-                </com.budiyev.android.codescanner.CodeScannerView>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
         </FrameLayout>
diff --git a/app/src/main/res/layout/health_record_cell.xml b/app/src/main/res/layout/health_record_cell.xml
index 9a3050e..74bc47b 100644
--- a/app/src/main/res/layout/health_record_cell.xml
+++ b/app/src/main/res/layout/health_record_cell.xml
@@ -44,8 +44,9 @@
 
             <TextView
                 android:id="@+id/textView15"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="16dp"
diff --git a/app/src/main/res/layout/notify_patient_fragment.xml b/app/src/main/res/layout/notify_patient_fragment.xml
new file mode 100644
index 0000000..c44eca9
--- /dev/null
+++ b/app/src/main/res/layout/notify_patient_fragment.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data class="NotifyPatientBinding">
+
+        <import type="org.commcare.dalvik.domain.model.TranslationKey" />
+
+
+        <variable
+            name="model"
+            type="org.commcare.dalvik.domain.model.PatientNotificationModel" />
+
+        <variable
+            name="clickHandler"
+            type="org.commcare.dalvik.abha.ui.main.fragment.NotifyPatientFragment" />
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+        <TextView
+            android:id="@+id/linkInfoTxt"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toTopOf="@+id/aadhaarDataTableLayout"
+            app:layout_constraintEnd_toEndOf="@+id/aadhaarDataTableLayout"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="@+id/aadhaarDataTableLayout"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TableLayout
+            android:id="@+id/aadhaarDataTableLayout"
+            android:layout_width="347dp"
+            android:layout_height="wrap_content"
+            android:background="@color/bright_blue_grad_start"
+            android:orientation="vertical"
+            android:padding="1dp"
+            android:stretchColumns="*"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.5">
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/bgColor"
+                android:minHeight="@dimen/_32dp">
+
+                <TextView
+                    style="@style/Headline1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:paddingStart="2dp"
+                    android:paddingLeft="2dp"
+                    android:text="@string/phone" />
+
+                <TextView
+                    android:id="@+id/patientPhone"
+                    style="@style/Headline2"
+                    android:text="@{model.phoneNo}"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:paddingEnd="2dp"
+                    android:paddingRight="2dp" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:minHeight="32dp">
+
+                <TextView
+                    style="@style/Headline1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:paddingStart="2dp"
+                    android:paddingLeft="2dp"
+                    android:text="@string/hipId" />
+
+                <TextView
+                    android:id="@+id/linkHipId"
+                    style="@style/Headline2"
+                    android:text="@{model.hip.id}"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:paddingEnd="2dp"
+                    android:paddingRight="2dp" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:background="@color/bgColor"
+                android:minHeight="32dp">
+
+                <TextView
+                    style="@style/Headline1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:paddingStart="2dp"
+                    android:paddingLeft="2dp"
+                    android:text="@string/STATUS" />
+
+                <TextView
+                    android:id="@+id/notifyStatus"
+                    style="@style/Headline1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:paddingEnd="2dp"
+                    android:paddingRight="2dp"
+                    android:textStyle="bold"
+                    tools:text="SUCCESS" />
+
+            </TableRow>
+
+
+        </TableLayout>
+
+        <Button
+            android:id="@+id/returnFromNotify"
+            style="@style/RoundStyleButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="32dp"
+            android:onClickListener="@{clickHandler}"
+            android:text="@string/RETURN"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/patient_consent_item_layout.xml b/app/src/main/res/layout/patient_consent_item_layout.xml
index e506e01..b93421c 100644
--- a/app/src/main/res/layout/patient_consent_item_layout.xml
+++ b/app/src/main/res/layout/patient_consent_item_layout.xml
@@ -19,11 +19,11 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/_8dp"
+        android:layout_marginBottom="@dimen/_8dp"
         android:elevation="5dp"
         android:minHeight="150dp"
         android:padding="@dimen/_5dp"
-        android:layout_marginTop="@dimen/_8dp"
-        android:layout_marginBottom="@dimen/_8dp"
         app:cardBackgroundColor="@color/very_light_blue"
         app:cardCornerRadius="0dp"
         app:cardUseCompatPadding="true">
@@ -73,8 +73,8 @@
                     <TextView
                         style="@style/Headline2"
                         android:layout_width="0dp"
-                        android:layout_weight="1"
                         android:layout_height="match_parent"
+                        android:layout_weight="1"
                         android:gravity="center_vertical|start"
                         android:paddingStart="2dp"
                         android:paddingLeft="2dp"
@@ -83,8 +83,8 @@
                     <TextView
                         style="@style/Headline2"
                         android:layout_width="0dp"
-                        android:layout_weight="3"
                         android:layout_height="match_parent"
+                        android:layout_weight="3"
                         android:gravity="center_vertical|end"
                         android:paddingEnd="2dp"
                         android:paddingRight="2dp"
@@ -92,6 +92,142 @@
 
                 </TableRow>
 
+                <TableRow
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:minHeight="@dimen/_32dp">
+
+                    <TextView
+                        android:id="@+id/statusDateLabel"
+                        style="@style/Headline2"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical|start"
+                        android:paddingStart="2dp"
+                        android:paddingLeft="2dp"
+                         />
+
+                    <TextView
+                        android:id="@+id/statusDate"
+                        style="@style/Headline2"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="3"
+                        android:gravity="center_vertical|end"
+                        android:paddingEnd="2dp"
+                        android:paddingRight="2dp" />
+
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:minHeight="@dimen/_32dp">
+
+                    <TextView
+                        style="@style/Headline2"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical|start"
+                        android:paddingStart="2dp"
+                        android:paddingLeft="2dp"
+                        android:text="@string/abha_num" />
+
+                    <TextView
+                        style="@style/Headline2"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="3"
+                        android:gravity="center_vertical|end"
+                        android:paddingEnd="2dp"
+                        android:paddingRight="2dp"
+                        android:text="@{model.details.patient.id}" />
+
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:minHeight="@dimen/_32dp">
+
+                    <TextView
+                        style="@style/Headline2"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical|start"
+                        android:paddingStart="2dp"
+                        android:paddingLeft="2dp"
+                        android:text="@string/patient_name" />
+
+                    <TextView
+                        android:id="@+id/patientName"
+                        style="@style/Headline2"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="2"
+                        android:gravity="center_vertical|end"
+                        android:paddingEnd="2dp"
+                        android:paddingRight="2dp" />
+
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:minHeight="@dimen/_32dp">
+
+                    <TextView
+                        style="@style/Headline2"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical|start"
+                        android:paddingStart="2dp"
+                        android:paddingLeft="2dp"
+                        android:text="@string/creation_date" />
+
+                    <TextView
+                        android:id="@+id/consentCreationDate"
+                        style="@style/Headline2"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="2"
+                        android:gravity="center_vertical|end"
+                        android:paddingEnd="2dp"
+                        android:paddingRight="2dp" />
+
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:minHeight="@dimen/_32dp">
+
+                    <TextView
+                        style="@style/Headline2"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical|start"
+                        android:paddingStart="2dp"
+                        android:paddingLeft="2dp"
+                        android:text="@string/granted_date" />
+
+                    <TextView
+                        android:id="@+id/consentGrantedDate"
+                        style="@style/Headline2"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="2"
+                        android:gravity="center_vertical|end"
+                        android:paddingEnd="2dp"
+                        android:paddingRight="2dp" />
+
+                </TableRow>
+
                 <TableRow
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
@@ -125,8 +261,8 @@
                     <TextView
                         style="@style/Headline2"
                         android:layout_width="0dp"
-                        android:layout_weight="1"
                         android:layout_height="match_parent"
+                        android:layout_weight="1"
                         android:gravity="center_vertical|start"
                         android:paddingStart="2dp"
                         android:paddingLeft="2dp"
@@ -136,8 +272,8 @@
                         android:id="@+id/fromDate"
                         style="@style/Headline2"
                         android:layout_width="0dp"
-                        android:layout_weight="2"
                         android:layout_height="match_parent"
+                        android:layout_weight="2"
                         android:gravity="center_vertical|end"
                         android:paddingEnd="2dp"
                         android:paddingRight="2dp" />
@@ -152,8 +288,8 @@
                     <TextView
                         style="@style/Headline2"
                         android:layout_width="0dp"
-                        android:layout_weight="1"
                         android:layout_height="match_parent"
+                        android:layout_weight="1"
                         android:gravity="center_vertical|start"
                         android:paddingStart="2dp"
                         android:paddingLeft="2dp"
@@ -163,8 +299,8 @@
                         android:id="@+id/toDate"
                         style="@style/Headline2"
                         android:layout_width="0dp"
-                        android:layout_weight="2"
                         android:layout_height="match_parent"
+                        android:layout_weight="2"
                         android:gravity="center_vertical|end"
                         android:paddingEnd="2dp"
                         android:paddingRight="2dp" />
@@ -179,8 +315,8 @@
                     <TextView
                         style="@style/Headline2"
                         android:layout_width="0dp"
-                        android:layout_weight="1"
                         android:layout_height="match_parent"
+                        android:layout_weight="1"
                         android:gravity="center_vertical|start"
                         android:paddingStart="2dp"
                         android:paddingLeft="2dp"
@@ -190,8 +326,8 @@
                         android:id="@+id/expiryDate"
                         style="@style/Headline2"
                         android:layout_width="0dp"
-                        android:layout_weight="2"
                         android:layout_height="match_parent"
+                        android:layout_weight="2"
                         android:gravity="center_vertical|end"
                         android:paddingEnd="2dp"
                         android:paddingRight="2dp" />
diff --git a/app/src/main/res/layout/patient_health_data_layout.xml b/app/src/main/res/layout/patient_health_data_layout.xml
index 68a3f2a..3ff4478 100644
--- a/app/src/main/res/layout/patient_health_data_layout.xml
+++ b/app/src/main/res/layout/patient_health_data_layout.xml
@@ -1,8 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<layout 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">
+
     <data class="PatientHealthDataBinding">
 
+        <variable
+            name="name"
+            type="String" />
+
+        <variable
+            name="age"
+            type="String" />
+
+        <variable
+            name="gender"
+            type="String" />
+
+        <variable
+            name="phone"
+            type="String" />
+
+        <variable
+            name="abhaId"
+            type="String" />
+
+        <variable
+            name="abhaNum"
+            type="String" />
+
+        <variable
+            name="dob"
+            type="String" />
 
     </data>
 
@@ -10,16 +39,244 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <TableLayout
+            android:id="@+id/patientDataLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/lightest_grey"
+            android:orientation="vertical"
+            android:padding="@dimen/_8dp"
+            android:stretchColumns="*"
+            app:layout_constraintBottom_toTopOf="@+id/patientHealthDataList"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:minHeight="@dimen/_32dp">
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|start"
+                    android:paddingStart="@dimen/_2dp"
+                    android:paddingLeft="@dimen/_2dp"
+                    android:text="@string/abha_address" />
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="3"
+                    android:gravity="center_vertical|end"
+                    android:paddingEnd="@dimen/_2dp"
+                    android:paddingRight="@dimen/_2dp"
+                    android:text="@{abhaId}" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:minHeight="@dimen/_32dp">
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|start"
+                    android:paddingStart="@dimen/_2dp"
+                    android:paddingLeft="@dimen/_2dp"
+                    android:text="@string/abha_number" />
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="3"
+                    android:gravity="center_vertical|end"
+                    android:paddingEnd="@dimen/_2dp"
+                    android:paddingRight="@dimen/_2dp"
+                    android:text="@{abhaNum}" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:minHeight="@dimen/_32dp">
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|start"
+                    android:paddingStart="@dimen/_2dp"
+                    android:paddingLeft="@dimen/_2dp"
+                    android:text="@string/name" />
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="3"
+                    android:gravity="center_vertical|end"
+                    android:paddingEnd="@dimen/_2dp"
+                    android:paddingRight="@dimen/_2dp"
+                    android:text="@{name}" />
+
+            </TableRow>
+
+
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:minHeight="@dimen/_32dp">
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|start"
+                    android:paddingStart="@dimen/_2dp"
+                    android:paddingLeft="@dimen/_2dp"
+                    android:text="@string/age" />
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:gravity="center_vertical|end"
+                    android:paddingEnd="@dimen/_2dp"
+                    android:paddingRight="@dimen/_2dp"
+                    android:text="@{age}" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:minHeight="@dimen/_32dp"
+                android:visibility="gone">
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|start"
+                    android:paddingStart="@dimen/_2dp"
+                    android:paddingLeft="@dimen/_2dp"
+                    android:text="@string/patietDetails"
+                    android:textColor="@color/blue"
+                    android:textStyle="bold" />
+
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:minHeight="@dimen/_32dp">
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|start"
+                    android:paddingStart="@dimen/_2dp"
+                    android:paddingLeft="@dimen/_2dp"
+                    android:text="@string/gender" />
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="3"
+                    android:gravity="center_vertical|end"
+                    android:paddingEnd="@dimen/_2dp"
+                    android:paddingRight="@dimen/_2dp"
+                    android:text="@{gender}" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:minHeight="@dimen/_32dp">
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|start"
+                    android:paddingStart="@dimen/_2dp"
+                    android:paddingLeft="@dimen/_2dp"
+                    android:text="@string/dateOfBirth" />
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="3"
+                    android:gravity="center_vertical|end"
+                    android:paddingEnd="@dimen/_2dp"
+                    android:paddingRight="@dimen/_2dp"
+                    android:text="@{dob}" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:minHeight="@dimen/_32dp">
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|start"
+                    android:paddingStart="@dimen/_2dp"
+                    android:paddingLeft="@dimen/_2dp"
+                    android:text="@string/phone" />
+
+                <TextView
+                    style="@style/Headline2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="3"
+                    android:gravity="center_vertical|end"
+                    android:paddingEnd="@dimen/_2dp"
+                    android:paddingRight="@dimen/_2dp"
+                    android:text="@{phone}" />
+
+            </TableRow>
+
+
+        </TableLayout>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/patientHealthDataList"
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toTopOf="@+id/healthDataErLayout"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@+id/patientDataLayout" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/healthDataErLayout"
@@ -30,7 +287,8 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/patientHealthDataList">
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.5">
 
             <TextView
                 android:id="@+id/healthDataErrMsg"
diff --git a/app/src/main/res/navigation/notify_patient.xml b/app/src/main/res/navigation/notify_patient.xml
new file mode 100644
index 0000000..16a654c
--- /dev/null
+++ b/app/src/main/res/navigation/notify_patient.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/notify_patient"
+    app:startDestination="@id/notifyPatientFragment">
+
+    <fragment
+        android:id="@+id/notifyPatientFragment"
+        android:name="org.commcare.dalvik.abha.ui.main.fragment.NotifyPatientFragment"
+        android:label="NotifyPatientFragment" />
+</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/scan_abha_navigation.xml b/app/src/main/res/navigation/scan_abha_navigation.xml
index aff282d..209f61e 100644
--- a/app/src/main/res/navigation/scan_abha_navigation.xml
+++ b/app/src/main/res/navigation/scan_abha_navigation.xml
@@ -8,7 +8,7 @@
     <fragment
         android:id="@+id/scanAbhaFragment"
         android:name="org.commcare.dalvik.abha.ui.main.fragment.ScanAbhaFragment"
-        android:label="ScanAbhaFragment" >
+        android:label="@string/scanAbha" >
         <action
             android:id="@+id/action_scanAbhaFragment_to_scanAbhaResultFragment"
             app:destination="@id/scanAbhaResultFragment" />
@@ -16,5 +16,5 @@
     <fragment
         android:id="@+id/scanAbhaResultFragment"
         android:name="org.commcare.dalvik.abha.ui.main.fragment.ScanAbhaResultFragment"
-        android:label="ScanAbhaResultFragment" />
+        android:label="@string/scanAbhaResult" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index f42d533..20c3674 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -45,7 +45,14 @@
     <string name="tnc">लाभार्थी की सहमति</string>
     <string name="note">टिप्पणी:</string>
     <string name="check_abha_note">नया ABHA बनाते समय आभा इनपुट वैकल्पिक है। खाली छोड़े जाने पर, एक ऑटो जनरेट किया गया ABHA बनाया जाएगा।
-यदि लाभार्थी कस्टम ABHA पते में रुचि रखता है तो कृपया इस फ़ील्ड को भरें।</string>
+यदि लाभार्थी कस्टम ABHA पते में रुचि रखता है तो कृपया इस फ़ील्ड को भरें।\n\n
+        1. Minimum length - 8 characters.\n
+2. Maximum length - 18 characters.\n
+3. Special characters allowed - 1 dot (.) and/or 1 underscore (_).\n
+4. Special character dot and underscore should be in between. Special characters cannot be in the beginning or at the end.\n
+5. Alphanumeric - only numbers, only letters or any combination of numbers and letters is allowed.\n
+    </string>
+
     <string name="ABHA_IN_USE">ABHA पता पहले से ही उपयोग में है।</string>
     <string name="checkABHA">ABHA की जाँच करें</string>
     <string name="abha_to_check">जाँच करने के लिए ABHA दर्ज करें</string>
@@ -87,7 +94,7 @@
     <string name="create_consent">Create Consent</string>
     <string name="healthInfo">Health Info</string>
     <string name="helthInfoType">Health Info Type</string>
-    <string name="healthInfoType">Health Info Type</string>
+    <string name="healthInfoType">FHIR डेटा</string>
     <string name="patient_consent">Patient Consents</string>
     <string name="filter">Filter</string>
     <string name="searchText">Enter text to search</string>
@@ -119,4 +126,19 @@
     <string name="linking_cc_success">Context care linked successfully.</string>
     <string name="linking_cc_error">Context care not linked.</string>
     <string name="cc_not_linked">NOT LINKED</string>
+    <string name="scanAbhaResult">ABHA Details</string>
+    <string name="place_barcode_inside">Place barcode at the center of the screen.</string>
+    <string name="back">Back</string>
+    <string name="notifyPatient">Notify Patient</string>
+    <string name="phone">Phone No.</string>
+    <string name="creation_date">निर्माण तिथि</string>
+    <string name="granted_date">स्वीकृत तिथि</string>
+    <string name="patient_name">रोगी का नाम</string>
+    <string name="no_health_data_available">No health record available</string>
+    <string name="abha_address">ABHA Address</string>
+    <string name="age">Age</string>
+
+    <string name="expired_date">Expired Date</string>
+    <string name="revoked_date">Revoked Date</string>
+    <string name="denied_date">Denied Date</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2347f27..cfc4e25 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <string name="START_VERIFICATION">Start Verification</string>
     <string name="VERIFY_OTP">Verify OTP</string>
     <string name="GEN_OTP">Generate OTP</string>
+    <string name="start_auth">Start Auth</string>
 
     <string name="RESEND_OTP">Resend OTP</string>
     <string name="ENTER_ADHR_OTP">Enter Aadhaar OTP</string>
@@ -58,11 +59,17 @@
     <string name="returnn">Return</string>
     <string name="adhar_consent">Use Aadhaar data in Commcare</string>
     <string name="abha_num">ABHA</string>
+    <string name="abha_number">ABHA No.</string>
     <string name="aadhar_data">Aadhaar Data</string>
     <string name="start_verification">Start Verification</string>
     <string name="select_auth">Select auth method</string>
     <string name="verification_status">Verification Status</string>
     <string name="status">Status</string>
+
+    <string name="expired_date">Expired Date</string>
+    <string name="revoked_date">Revoked Date</string>
+    <string name="denied_date">Denied Date</string>
+
     <string name="abha_verification">ABHA verification</string>
     <string name="mobile_start_number">Should start with 6,7,8 or 9</string>
     <string name="cancel">Cancel</string>
@@ -79,7 +86,16 @@ I, hereby declare that I am voluntarily sharing my Aadhaar Number and demographi
     <string name="checkABHA">Check ABHA</string>
     <string name="note">Note:</string>
     <string name="check_abha_note">ABHA input is optional while creating a new ABHA. When left blank, an auto generated ABHA will be created.
-Please fill this field if the beneficiary is interested in a custom ABHA address.</string>
+Please fill this field if the beneficiary is interested in a custom ABHA address.\n\n
+        1. Minimum length - 8 characters.\n
+2. Maximum length - 18 characters.\n
+3. Special characters allowed - 1 dot (.) and/or 1 underscore (_).\n
+4. Special character dot and underscore should be in between. Special characters cannot be in the beginning or at the end.\n
+5. Alphanumeric - only numbers, only letters or any combination of numbers and letters is allowed.\n
+
+    </string>
+
+
     <string name="ABHA_IN_USE">ABHA address already in use.</string>
     <string name="abha_to_check">Enter ABHA to check</string>
     <string name="custom_abha_suffix">\@abdm</string>
@@ -118,14 +134,14 @@ Please fill this field if the beneficiary is interested in a custom ABHA address
     <string name="permission">Permission</string>
     <string name="accessMode">Access Mode</string>
     <string name="dateRange">Consent Date Range</string>
-    <string name="startDate">Start Date</string>
-    <string name="endDate">End Date</string>
+    <string name="startDate">From Date</string>
+    <string name="endDate">To Date</string>
     <string name="expiryDate">Expiry Date</string>
     <string name="select_time">Select Time</string>
     <string name="create_consent">Create Consent</string>
     <string name="healthInfo">Health Info</string>
     <string name="helthInfoType">Health Info Type</string>
-    <string name="healthInfoType">Health Info Type</string>
+    <string name="healthInfoType">FHIR Data</string>
     <string name="patient_consent">Patient Consents</string>
     <string name="filter">Filter</string>
     <string name="searchText">Enter text to search</string>
@@ -157,4 +173,17 @@ Please fill this field if the beneficiary is interested in a custom ABHA address
     <string name="linking_cc_success">Context care linked successfully.</string>
     <string name="linking_cc_error">Context care not linked.</string>
     <string name="cc_not_linked">NOT LINKED</string>
+    <string name="scanAbhaResult">ABHA Details</string>
+    <string name="place_barcode_inside">Place barcode at the center of the screen.</string>
+    <string name="back">Back</string>
+    <string name="notifyPatient">Notify Patient</string>
+    <string name="phone">Phone No.</string>
+    <string name="creation_date">Creation Date</string>
+    <string name="granted_date">Granted Date</string>
+    <string name="patient_name">Patient Name</string>
+    <string name="no_health_data_available">No health record available</string>
+
+    <string name="demographics">Demographics</string>
+    <string name="abha_address">ABHA Address</string>
+    <string name="age">Age</string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ad4278e..bd967ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,6 +11,7 @@ buildscript {
     repositories {
         mavenCentral()
         maven { url 'https://jitpack.io' }
+        jcenter()
     }
 }
 
diff --git a/data/src/main/java/org/commcare/dalvik/data/network/NetworkUtil.kt b/data/src/main/java/org/commcare/dalvik/data/network/NetworkUtil.kt
index ca7ac9e..43f2fd2 100644
--- a/data/src/main/java/org/commcare/dalvik/data/network/NetworkUtil.kt
+++ b/data/src/main/java/org/commcare/dalvik/data/network/NetworkUtil.kt
@@ -53,12 +53,35 @@ class NetworkUtil {
                             }
                         }
 
-                        400, 422 -> {
+                        400,401, 422 -> {
                             it.errorBody()?.string()?.let {
                                 val gson = GsonBuilder().serializeNulls().create()
-                                val adbmError: AbdmErrorModel =
-                                    gson.fromJson(it, AbdmErrorModel::class.java)
-                                return HqResponseModel.AbdmError(500, adbmError)
+                                val errorJson = JSONObject(it)
+                                if (errorJson.has("error")) {
+                                    val actualError: AbdmErrorModel =
+                                        gson.fromJson(
+                                            errorJson.getString("error"),
+                                            AbdmErrorModel::class.java
+                                        )
+
+                                    try {
+                                        if (actualError.details[0].message.isEmpty()) {
+
+                                            errorJson.getJSONObject("error").getJSONArray("details").getJSONObject(0)
+                                                ?.let { detailJson ->
+                                                    actualError.details[0].message = detailJson.getString("detail")
+                                                }
+                                        }
+                                    } catch (e: Exception) {
+
+                                    }
+                                    return HqResponseModel.AbdmError(500, actualError)
+
+                                }else {
+                                    val adbmError: AbdmErrorModel =
+                                        gson.fromJson(it, AbdmErrorModel::class.java)
+                                    return HqResponseModel.AbdmError(500, adbmError)
+                                }
                             }
 
                         }
@@ -114,7 +137,7 @@ fun <T> safeApiCall(call: suspend () -> Response<T>) = flow {
 
                 }
 
-                400, 422, 554, 555 -> {
+                400,401, 422, 554, 555 -> {
                     it.errorBody()?.string()?.let { errResponse ->
                         Timber.d("Network : ===> ${errResponse}")
                         val gson = GsonBuilder().serializeNulls().create()
diff --git a/data/src/main/java/org/commcare/dalvik/data/paging/AbdmException.kt b/data/src/main/java/org/commcare/dalvik/data/paging/AbdmException.kt
new file mode 100644
index 0000000..d8be64a
--- /dev/null
+++ b/data/src/main/java/org/commcare/dalvik/data/paging/AbdmException.kt
@@ -0,0 +1,3 @@
+package org.commcare.dalvik.data.paging
+
+class AbdmException(message:String): RuntimeException(message)
\ No newline at end of file
diff --git a/data/src/main/java/org/commcare/dalvik/data/paging/ConsentPagingSource.kt b/data/src/main/java/org/commcare/dalvik/data/paging/ConsentPagingSource.kt
index 31d00f4..b741529 100644
--- a/data/src/main/java/org/commcare/dalvik/data/paging/ConsentPagingSource.kt
+++ b/data/src/main/java/org/commcare/dalvik/data/paging/ConsentPagingSource.kt
@@ -50,7 +50,7 @@ class ConsentPagingSource(
                 }
 
                 is HqResponseModel.AbdmError -> {
-                    LoadResult.Error(RuntimeException(response.value.message))
+                    LoadResult.Error(AbdmException(response.value.getErrorMsg()))
                 }
 
                 else -> LoadResult.Error(RuntimeException("Error while loading..."))
diff --git a/data/src/main/java/org/commcare/dalvik/data/repository/AbdmRepositoryImpl.kt b/data/src/main/java/org/commcare/dalvik/data/repository/AbdmRepositoryImpl.kt
index 5c7a761..aa7864e 100644
--- a/data/src/main/java/org/commcare/dalvik/data/repository/AbdmRepositoryImpl.kt
+++ b/data/src/main/java/org/commcare/dalvik/data/repository/AbdmRepositoryImpl.kt
@@ -23,6 +23,7 @@ import org.commcare.dalvik.domain.model.HqResponseModel
 import org.commcare.dalvik.domain.model.MobileOtpRequestModel
 import org.commcare.dalvik.domain.model.PatientConsentDetailModel
 import org.commcare.dalvik.domain.model.PatientConsentList
+import org.commcare.dalvik.domain.model.PatientNotificationModel
 import org.commcare.dalvik.domain.model.VerifyOtpRequestModel
 import org.commcare.dalvik.domain.repositories.AbdmRepository
 import org.commcare.dalvik.domain.usecases.FetchConsentArtefactsUsecase
@@ -112,6 +113,10 @@ class AbdmRepositoryImpl @Inject constructor(val hqServices: HqServices) : AbdmR
         hqServices.linkCareContext(ccLinkModel)
     }
 
+    override fun notifyPatient(patientNotificationModel: PatientNotificationModel)= safeApiCall {
+        hqServices.notifyPatient(patientNotificationModel)
+    }
+
     override suspend fun getPatientConsents(
         abhaId: String,
         page:Int?,
@@ -141,9 +146,15 @@ class AbdmRepositoryImpl @Inject constructor(val hqServices: HqServices) : AbdmR
     ): ConsentArtefactsList {
         val result = hqServices.getConsentArtefacts(consentRequestId, searchText,page)
         Timber.d("RESULT : ${result.body().toString()}")
-        return Gson().fromJson(result.body(), ConsentArtefactsList::class.java)
+        val consentArtefactsList =  Gson().fromJson(result.body(), ConsentArtefactsList::class.java)
+        return filterConsentArtefactsList(consentArtefactsList)
     }
 
+    private fun filterConsentArtefactsList(list: ConsentArtefactsList): ConsentArtefactsList {
+        val filteredList = list.results.filterNot { it.isArtefactRequested() }
+        list.results = filteredList
+        return list
+    }
 
     override fun getConsentArtefactPagerData(fetchPatientConsentUsecase: FetchConsentArtefactsUsecase) =
         Pager(
diff --git a/data/src/main/java/org/commcare/dalvik/data/services/HqServices.kt b/data/src/main/java/org/commcare/dalvik/data/services/HqServices.kt
index f013bcc..fc71777 100644
--- a/data/src/main/java/org/commcare/dalvik/data/services/HqServices.kt
+++ b/data/src/main/java/org/commcare/dalvik/data/services/HqServices.kt
@@ -75,5 +75,7 @@ interface HqServices {
     suspend fun confirmCareContextAuth(@Body confirmAuthModel: ConfirmAuthModel):Response<JsonObject>
     @POST("hip/link_care_context")
     suspend fun  linkCareContext(@Body careContextLinkModel:CCLinkModel):Response<JsonObject>
+    @POST("hip/patients/sms/notify2")
+    suspend fun notifyPatient(@Body patientNotificationModel: PatientNotificationModel):Response<JsonObject>
 
 }
\ No newline at end of file
diff --git a/domain/src/main/java/org/commcare/dalvik/domain/model/ConsentArtefactModel.kt b/domain/src/main/java/org/commcare/dalvik/domain/model/ConsentArtefactModel.kt
index f5424b5..31f1bb7 100644
--- a/domain/src/main/java/org/commcare/dalvik/domain/model/ConsentArtefactModel.kt
+++ b/domain/src/main/java/org/commcare/dalvik/domain/model/ConsentArtefactModel.kt
@@ -14,6 +14,7 @@ data class ConsentArtefactModel(
     @SerializedName("last_modified")
     val lastModified: String?,
 
+    @SerializedName("fetch_status")
     val status: String,
 
     val error: String?,
@@ -21,7 +22,9 @@ data class ConsentArtefactModel(
     @SerializedName("consent_request")
     val consentRequest: String,
 
-    val details: ConsentArtefactDetailModel
+    val details: ConsentArtefactDetailModel?
 
-)
+){
+    fun isArtefactRequested() = status == "REQUESTED"
+}
 
diff --git a/domain/src/main/java/org/commcare/dalvik/domain/model/ConsentArtefactsList.kt b/domain/src/main/java/org/commcare/dalvik/domain/model/ConsentArtefactsList.kt
index 904bb6f..dc2e0eb 100644
--- a/domain/src/main/java/org/commcare/dalvik/domain/model/ConsentArtefactsList.kt
+++ b/domain/src/main/java/org/commcare/dalvik/domain/model/ConsentArtefactsList.kt
@@ -4,5 +4,5 @@ data class ConsentArtefactsList(
     val count: Int,
     val next: String?,
     val previous: String?,
-    val results: List<ConsentArtefactModel>
+    var results: List<ConsentArtefactModel>
 )
diff --git a/domain/src/main/java/org/commcare/dalvik/domain/model/PatientConsentDetailModel.kt b/domain/src/main/java/org/commcare/dalvik/domain/model/PatientConsentDetailModel.kt
index 88ec3ec..9dd1114 100644
--- a/domain/src/main/java/org/commcare/dalvik/domain/model/PatientConsentDetailModel.kt
+++ b/domain/src/main/java/org/commcare/dalvik/domain/model/PatientConsentDetailModel.kt
@@ -111,7 +111,7 @@ data class Frequency(val unit: String = "HOUR", val value: Int = 1, val repeats:
 
 data class ConsentPermission(val accessMode: String) {
     @SerializedName("dataEraseAt")
-    lateinit var expiryDate: String
+    var expiryDate: String? = null
     var frequency: Frequency = Frequency()
     val dateRange: DateRange = DateRange()
 
@@ -121,7 +121,7 @@ data class ConsentPermission(val accessMode: String) {
         if (dateRangeValidation != ConsentValidation.SUCCESS) {
             return dateRangeValidation
         }
-        if (!this::expiryDate.isInitialized) {
+        if (expiryDate == null) {
             return ConsentValidation.INVALID_EXPIRY_DATE
         }
         return ConsentValidation.SUCCESS
@@ -141,7 +141,8 @@ enum class ConsentValidation(val msg: String) {
 
 enum class DATE_FORMAT(val format: String) {
     SERVER("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"),
-    USER("dd MMM YYYY , hh:mm a"),
+    USER("dd MMM yyyy , HH:mm a"),
+    CONSENT_LIST_TIME("dd/MMM/YYYY  hh:mm a"),
     ONLY_DATE("YYYY-MM-dd")
 }
 
diff --git a/domain/src/main/java/org/commcare/dalvik/domain/model/PatientConsentModel.kt b/domain/src/main/java/org/commcare/dalvik/domain/model/PatientConsentModel.kt
index a7c17b7..f6932bf 100644
--- a/domain/src/main/java/org/commcare/dalvik/domain/model/PatientConsentModel.kt
+++ b/domain/src/main/java/org/commcare/dalvik/domain/model/PatientConsentModel.kt
@@ -26,6 +26,15 @@ data class PatientConsentModel(
     @SerializedName("health_info_to_date")
     val healthInfoToDate: String?,
 
+    @SerializedName("date_granted")
+    val grantedDate: String?,
+
+    @SerializedName("date_revoked")
+    val revokedDate: String?,
+
+    @SerializedName("date_denied")
+    val deniedDate: String?,
+
     val user: String?,
     val error: Error?,
     val status: String?,
diff --git a/domain/src/main/java/org/commcare/dalvik/domain/model/RequestModels.kt b/domain/src/main/java/org/commcare/dalvik/domain/model/RequestModels.kt
index ff40c01..15e1e97 100644
--- a/domain/src/main/java/org/commcare/dalvik/domain/model/RequestModels.kt
+++ b/domain/src/main/java/org/commcare/dalvik/domain/model/RequestModels.kt
@@ -1,6 +1,8 @@
 package org.commcare.dalvik.domain.model
 
+import android.hardware.SensorAdditionalInfo
 import com.google.gson.annotations.SerializedName
+import java.io.Serializable
 
 abstract class BaseModel
 
@@ -27,7 +29,7 @@ data class AbhaVerificationRequestModel(@SerializedName("health_id") val healthI
 // CARE CONTEXT AUTH FETCH AND INIT
 data class CCAuthModesRequestModel(val id:String,
     val purpose:String = "LINK",
-    val authMethod: String?,
+    val authMode: String?,
     val requester:CCRequesterModel){
 }
 
@@ -36,14 +38,24 @@ data class CCRequesterModel(val type: String = "HIP", val id: String)
 // CONFIRM AUTH API
 data class ConfirmAuthModel(val transactionId:String,val credential: Credential)
 
-data class Credential(var authCode:String?)
+data class Credential(var authCode:String? = null,var demographic: Demographic?  = null)
 
 // CARE CONTEXT LINKING API
-data class CCLinkModel(val accessToken:String,@SerializedName("hip_id") val hipId:String,val patient:CCPatientDetails)
+data class CCLinkModel(val accessToken:String,@SerializedName("hip_id") val hipId:String,val patient:CCPatientDetails,val healthId: String)
 
-data class CCPatientDetails(val referenceNumber:String,val display:String,val careContexts:List<CCDetail>)
+data class CCPatientDetails(val referenceNumber:String,val display:String,val careContexts:List<CCDetail>,val demographics:Demographic)
 
-data class CCDetail(val referenceNumber:String,val display: String,val hiTypes:List<String>)
+
+data class Demographic(val name:String ,var gender:String ,val dateOfBirth:String ,var phoneNumber :String?):Serializable
+
+data class CCDetail(val referenceNumber:String,val display: String,val hiTypes:List<String>,val additionalInfo: AdditionalInfo)
+
+data class AdditionalInfo(val domain:String,var record_date:String)
+
+
+data class PatientNotificationModel(val phoneNo:String, val hip:HipModel)
+
+data class HipModel(val id:String)
 
 
 
diff --git a/domain/src/main/java/org/commcare/dalvik/domain/model/ResponseModel.kt b/domain/src/main/java/org/commcare/dalvik/domain/model/ResponseModel.kt
index d7b8a25..61161d7 100644
--- a/domain/src/main/java/org/commcare/dalvik/domain/model/ResponseModel.kt
+++ b/domain/src/main/java/org/commcare/dalvik/domain/model/ResponseModel.kt
@@ -1,5 +1,6 @@
 package org.commcare.dalvik.domain.model
 
+import com.google.gson.JsonObject
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
 
@@ -34,10 +35,25 @@ data class OtpResponseModel(val txnId: String)
 
 data class AbhaVerificationResultModel(
     val status: String = "",
-    var healthIdNumber: String,
+    var healthIdNumber: String?,
     var healthId: String,
-    @SerializedName("user_token") var userToken: String? = null
-) : Serializable
+    @SerializedName("user_token") var userToken: String? = null,
+    var aadharData: JsonObject
+
+) : Serializable{
+
+    fun putAadharData(responseJsonObject: JsonObject){
+        aadharData = responseJsonObject
+        try {
+            aadharData.remove("user_token")
+            aadharData.remove("status")
+            aadharData.remove("txnId")
+            aadharData.remove("authMethods")
+        }catch (e:Exception){
+            //
+        }
+    }
+}
 
 data class CheckAbhaResponseModel(
     @SerializedName("health_id") var healthId: String,
@@ -45,6 +61,7 @@ data class CheckAbhaResponseModel(
 )
 
 data class HealthCardResponseModel(@SerializedName("health_card") var healthCard: String)
+data class NotifyPatientResponseModel(var status: Boolean)
 
 
 data class PatientHealthDataModel(
diff --git a/domain/src/main/java/org/commcare/dalvik/domain/repositories/AbdmRepository.kt b/domain/src/main/java/org/commcare/dalvik/domain/repositories/AbdmRepository.kt
index c300c9d..bf27c32 100644
--- a/domain/src/main/java/org/commcare/dalvik/domain/repositories/AbdmRepository.kt
+++ b/domain/src/main/java/org/commcare/dalvik/domain/repositories/AbdmRepository.kt
@@ -54,4 +54,6 @@ interface AbdmRepository {
 
     fun linkCareContext(ccLinkModel:CCLinkModel):Flow<HqResponseModel>
 
+    fun notifyPatient(patientNotificationModel: PatientNotificationModel):Flow<HqResponseModel>
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/org/commcare/dalvik/domain/usecases/NotifyPatientUsecase.kt b/domain/src/main/java/org/commcare/dalvik/domain/usecases/NotifyPatientUsecase.kt
new file mode 100644
index 0000000..00241f2
--- /dev/null
+++ b/domain/src/main/java/org/commcare/dalvik/domain/usecases/NotifyPatientUsecase.kt
@@ -0,0 +1,12 @@
+package org.commcare.dalvik.domain.usecases
+
+import org.commcare.dalvik.domain.model.PatientNotificationModel
+import org.commcare.dalvik.domain.repositories.AbdmRepository
+import javax.inject.Inject
+
+class NotifyPatientUsecase @Inject constructor(val repository: AbdmRepository)   {
+
+    fun execute(patientNotificationModel: PatientNotificationModel) =
+        repository.notifyPatient(patientNotificationModel)
+
+}
\ No newline at end of file
diff --git a/version.gradle b/version.gradle
index 65ce9dc..cdd83b2 100644
--- a/version.gradle
+++ b/version.gradle
@@ -27,7 +27,7 @@ ext {
 
     DATA_STORE_VERSION ="1.0.0"
 
-    SCANNER_VER="2.3.2"
+    ZXING_VER="4.3.0"
     SQUARE_OKIO_VER="3.2.0"
 
     GLIDE_VER="4.13.2"