From ba656fe21e859c2690560f690911c24612f46c0e Mon Sep 17 00:00:00 2001
From: Madhuram Jajoo <madhuramjajoo10@gmail.com>
Date: Fri, 3 Mar 2023 23:47:40 +0530
Subject: [PATCH 1/5] ac

---
 .../datacapture/QuestionnaireViewModel.kt     |   8 +-
 .../enablement/EnablementEvaluator.kt         |  14 +-
 .../MoreQuestionnaireItemComponents.kt        |  18 +-
 .../fhir/datacapture/views/GroupHeaderView.kt |  13 +-
 .../fhir/datacapture/views/HeaderView.kt      |  22 +-
 .../views/QuestionnaireViewItem.kt            |   3 +-
 .../factories/AttachmentViewHolderFactory.kt  |   2 +-
 .../AutoCompleteViewHolderFactory.kt          |   2 +-
 .../BooleanChoiceViewHolderFactory.kt         |   6 +-
 .../CheckBoxGroupViewHolderFactory.kt         |   7 +-
 .../factories/DatePickerViewHolderFactory.kt  |   2 +-
 .../DateTimePickerViewHolderFactory.kt        |   2 +-
 .../DialogSelectViewHolderFactory.kt          |  18 +-
 .../factories/DisplayViewHolderFactory.kt     |   2 +-
 .../factories/DropDownViewHolderFactory.kt    |   4 +-
 .../factories/EditTextViewHolderFactory.kt    |   4 +-
 .../views/factories/GroupViewHolderFactory.kt |   2 +-
 .../factories/RadioGroupViewHolderFactory.kt  |   6 +-
 .../factories/ReviewViewHolderFactory.kt      |   4 +-
 .../factories/SliderViewHolderFactory.kt      |   2 +-
 .../datacapture/views/GroupHeaderViewTest.kt  | 240 +++++++++-------
 .../fhir/datacapture/views/HeaderViewTest.kt  | 256 +++++++++++-------
 .../factories/ReviewViewHolderFactoryTest.kt  |  34 +--
 23 files changed, 399 insertions(+), 272 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index 613c094e4a..a7989bcfb3 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -627,7 +627,13 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
             answersChangedCallback = answersChangedCallback,
             resolveAnswerValueSet = { resolveAnswerValueSet(it) },
             resolveAnswerExpression = { resolveAnswerExpression(it) },
-            draftAnswer = draftAnswerMap[questionnaireResponseItem]
+            draftAnswer = draftAnswerMap[questionnaireResponseItem],
+            enabledDisplayItems =
+              questionnaireItem.item.filter {
+                it.type == Questionnaire.QuestionnaireItemType.DISPLAY &&
+                  (it.isInstructionsCode || it.isFlyoverCode || it.isHelpCode) &&
+                  EnablementEvaluator(questionnaireResponse).evaluate(it, questionnaireResponseItem)
+              }
           )
         )
       )
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/enablement/EnablementEvaluator.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/enablement/EnablementEvaluator.kt
index 9c647fc0ff..674b7c2239 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/enablement/EnablementEvaluator.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/enablement/EnablementEvaluator.kt
@@ -114,6 +114,7 @@ internal class EnablementEvaluator(val questionnaireResponse: QuestionnaireRespo
     if (enableWhenList.size == 1) {
       return evaluateEnableWhen(
         enableWhenList.single(),
+        questionnaireItem,
         questionnaireResponseItem,
       )
     }
@@ -124,9 +125,9 @@ internal class EnablementEvaluator(val questionnaireResponse: QuestionnaireRespo
     // enabled if ANY `enableWhen` constraint is satisfied.
     return when (val value = questionnaireItem.enableBehavior) {
       Questionnaire.EnableWhenBehavior.ALL ->
-        enableWhenList.all { evaluateEnableWhen(it, questionnaireResponseItem) }
+        enableWhenList.all { evaluateEnableWhen(it, questionnaireItem, questionnaireResponseItem) }
       Questionnaire.EnableWhenBehavior.ANY ->
-        enableWhenList.any { evaluateEnableWhen(it, questionnaireResponseItem) }
+        enableWhenList.any { evaluateEnableWhen(it, questionnaireItem, questionnaireResponseItem) }
       else -> throw IllegalStateException("Unrecognized enable when behavior $value")
     }
   }
@@ -136,10 +137,15 @@ internal class EnablementEvaluator(val questionnaireResponse: QuestionnaireRespo
    */
   private fun evaluateEnableWhen(
     enableWhen: Questionnaire.QuestionnaireItemEnableWhenComponent,
+    questionnaireItem: Questionnaire.QuestionnaireItemComponent,
     questionnaireResponseItem: QuestionnaireResponse.QuestionnaireResponseItemComponent,
   ): Boolean {
-    val targetQuestionnaireResponseItem =
-      findEnableWhenQuestionnaireResponseItem(questionnaireResponseItem, enableWhen.question)
+    val targetQuestionnaireResponseItem: QuestionnaireResponse.QuestionnaireResponseItemComponent? =
+      if (questionnaireItem.type == Questionnaire.QuestionnaireItemType.DISPLAY &&
+          questionnaireResponseItem.linkId == enableWhen.question
+      )
+        questionnaireResponseItem
+      else findEnableWhenQuestionnaireResponseItem(questionnaireResponseItem, enableWhen.question)
     return if (Questionnaire.QuestionnaireItemOperator.EXISTS == enableWhen.operator) {
       // True iff the answer value of the enable when is equal to whether an answer exists in the
       // target questionnaire response item
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index fec18af260..3c185d79b1 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -308,9 +308,11 @@ val Questionnaire.QuestionnaireItemComponent.localizedPrefixSpanned: Spanned?
  * code is used as the instructions of the parent question.
  */
 internal val Questionnaire.QuestionnaireItemComponent.localizedInstructionsSpanned: Spanned?
+  get() = item.localizedInstructionsSpanned
+
+internal val List<Questionnaire.QuestionnaireItemComponent>.localizedInstructionsSpanned: Spanned?
   get() {
-    return item
-      .firstOrNull { questionnaireItem ->
+    return this.firstOrNull { questionnaireItem ->
         questionnaireItem.type == Questionnaire.QuestionnaireItemType.DISPLAY &&
           questionnaireItem.isInstructionsCode
       }
@@ -322,9 +324,11 @@ internal val Questionnaire.QuestionnaireItemComponent.localizedInstructionsSpann
  * present) is used as the fly-over text of the parent question.
  */
 internal val Questionnaire.QuestionnaireItemComponent.localizedFlyoverSpanned: Spanned?
+  get() = item.localizedFlyoverSpanned
+
+internal val List<Questionnaire.QuestionnaireItemComponent>.localizedFlyoverSpanned: Spanned?
   get() =
-    item
-      .firstOrNull { questionnaireItem ->
+    this.firstOrNull { questionnaireItem ->
         questionnaireItem.type == Questionnaire.QuestionnaireItemType.DISPLAY &&
           questionnaireItem.displayItemControl == DisplayItemControlType.FLYOVER
       }
@@ -335,9 +339,11 @@ internal val Questionnaire.QuestionnaireItemComponent.localizedFlyoverSpanned: S
  * code is used as the instructions of the parent question.
  */
 internal val Questionnaire.QuestionnaireItemComponent.localizedHelpSpanned: Spanned?
+  get() = item.localizedHelpSpanned
+
+internal val List<Questionnaire.QuestionnaireItemComponent>.localizedHelpSpanned: Spanned?
   get() {
-    return item
-      .firstOrNull { questionnaireItem -> questionnaireItem.isHelpCode }
+    return this.firstOrNull { questionnaireItem -> questionnaireItem.isHelpCode }
       ?.localizedTextSpanned
   }
 
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
index f507c0340a..4093a5ab32 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
@@ -25,7 +25,6 @@ import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.localizedInstructionsSpanned
 import com.google.android.fhir.datacapture.localizedPrefixSpanned
 import com.google.android.fhir.datacapture.localizedTextSpanned
-import org.hl7.fhir.r4.model.Questionnaire
 
 internal class GroupHeaderView(context: Context, attrs: AttributeSet?) :
   LinearLayout(context, attrs) {
@@ -34,14 +33,16 @@ internal class GroupHeaderView(context: Context, attrs: AttributeSet?) :
     LayoutInflater.from(context).inflate(R.layout.group_type_header_view, this, true)
   }
 
-  fun bind(questionnaireItem: Questionnaire.QuestionnaireItemComponent) {
+  fun bind(questionnaireViewItem: QuestionnaireViewItem) {
     val prefix = findViewById<TextView>(R.id.prefix)
     val question = findViewById<TextView>(R.id.question)
     val hint = findViewById<TextView>(R.id.hint)
-    initHelpButton(this, questionnaireItem)
-    prefix.updateTextAndVisibility(questionnaireItem.localizedPrefixSpanned)
-    question.updateTextAndVisibility(questionnaireItem.localizedTextSpanned)
-    hint.updateTextAndVisibility(questionnaireItem.localizedInstructionsSpanned)
+    initHelpButton(this, questionnaireViewItem)
+    prefix.updateTextAndVisibility(questionnaireViewItem.questionnaireItem.localizedPrefixSpanned)
+    question.updateTextAndVisibility(questionnaireViewItem.questionnaireItem.localizedTextSpanned)
+    hint.updateTextAndVisibility(
+      questionnaireViewItem.enabledDisplayItems?.localizedInstructionsSpanned
+    )
     visibility = getViewGroupVisibility(prefix, question, hint)
   }
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
index bc7cc984d2..9688bce185 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
@@ -33,7 +33,6 @@ import com.google.android.fhir.datacapture.localizedInstructionsSpanned
 import com.google.android.fhir.datacapture.localizedPrefixSpanned
 import com.google.android.fhir.datacapture.localizedTextSpanned
 import com.google.android.material.card.MaterialCardView
-import org.hl7.fhir.r4.model.Questionnaire
 
 /** View for the prefix, question, and hint of a questionnaire item. */
 internal class HeaderView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
@@ -47,11 +46,13 @@ internal class HeaderView(context: Context, attrs: AttributeSet?) : LinearLayout
   private var hint: TextView = findViewById(R.id.hint)
   private var errorTextView: TextView = findViewById(R.id.error_text_at_header)
 
-  fun bind(questionnaireItem: Questionnaire.QuestionnaireItemComponent) {
-    prefix.updateTextAndVisibility(questionnaireItem.localizedPrefixSpanned)
-    question.updateTextAndVisibility(questionnaireItem.localizedTextSpanned)
-    hint.updateTextAndVisibility(questionnaireItem.localizedInstructionsSpanned)
-    initHelpButton(this, questionnaireItem)
+  fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+    prefix.updateTextAndVisibility(questionnaireViewItem.questionnaireItem.localizedPrefixSpanned)
+    question.updateTextAndVisibility(questionnaireViewItem.questionnaireItem.localizedTextSpanned)
+    hint.updateTextAndVisibility(
+      questionnaireViewItem.enabledDisplayItems?.localizedInstructionsSpanned
+    )
+    initHelpButton(this, questionnaireViewItem)
     //   Make the entire view GONE if there is nothing to show. This is to avoid an empty row in the
     // questionnaire.
     visibility = getViewGroupVisibility(prefix, question, hint)
@@ -93,13 +94,10 @@ internal fun getViewGroupVisibility(vararg view: TextView): Int {
   return GONE
 }
 
-internal fun initHelpButton(
-  view: View,
-  questionnaireItem: Questionnaire.QuestionnaireItemComponent
-) {
+internal fun initHelpButton(view: View, questionnaireViewItem: QuestionnaireViewItem) {
   val helpButton = view.findViewById<Button>(R.id.helpButton)
   helpButton.visibility =
-    if (questionnaireItem.hasHelpButton) {
+    if (questionnaireViewItem.questionnaireItem.hasHelpButton) {
       VISIBLE
     } else {
       GONE
@@ -118,5 +116,5 @@ internal fun initHelpButton(
 
   view
     .findViewById<TextView>(R.id.helpText)
-    .updateTextAndVisibility(questionnaireItem.localizedHelpSpanned)
+    .updateTextAndVisibility(questionnaireViewItem.enabledDisplayItems?.localizedHelpSpanned)
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
index fd2141fa2a..26ed73a33f 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
@@ -78,7 +78,8 @@ data class QuestionnaireViewItem(
     {
       emptyList()
     },
-  internal val draftAnswer: Any? = null
+  internal val draftAnswer: Any? = null,
+  internal val enabledDisplayItems: List<Questionnaire.QuestionnaireItemComponent>? = null
 ) {
 
   /**
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AttachmentViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AttachmentViewHolderFactory.kt
index 5ff36c6348..15e7bb93d4 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AttachmentViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AttachmentViewHolderFactory.kt
@@ -103,8 +103,8 @@ internal object AttachmentViewHolderFactory :
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         this.questionnaireViewItem = questionnaireViewItem
+        header.bind(questionnaireViewItem)
         val questionnaireItem = questionnaireViewItem.questionnaireItem
-        header.bind(questionnaireItem)
         displayOrClearInitialPreview()
         displayTakePhotoButton(questionnaireItem)
         displayUploadButton(questionnaireItem)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt
index 454c784189..8622041d84 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt
@@ -76,7 +76,7 @@ internal object AutoCompleteViewHolderFactory :
       }
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
-        header.bind(questionnaireViewItem.questionnaireItem)
+        header.bind(questionnaireViewItem)
 
         val answerOptionString =
           questionnaireViewItem.answerOption.map { it.value.displayString(header.context) }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/BooleanChoiceViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/BooleanChoiceViewHolderFactory.kt
index a16dccd217..0e2d2ee294 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/BooleanChoiceViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/BooleanChoiceViewHolderFactory.kt
@@ -55,10 +55,10 @@ internal object BooleanChoiceViewHolderFactory :
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         this.questionnaireViewItem = questionnaireViewItem
-        val questionnaireItem = questionnaireViewItem.questionnaireItem
-        header.bind(questionnaireItem)
+        header.bind(questionnaireViewItem)
         val choiceOrientation =
-          questionnaireItem.choiceOrientation ?: ChoiceOrientationTypes.VERTICAL
+          questionnaireViewItem.questionnaireItem.choiceOrientation
+            ?: ChoiceOrientationTypes.VERTICAL
         with(flow) {
           when (choiceOrientation) {
             ChoiceOrientationTypes.HORIZONTAL -> {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactory.kt
index 75c98136e6..a7420f1ee8 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactory.kt
@@ -53,11 +53,10 @@ internal object CheckBoxGroupViewHolderFactory :
       }
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
-        val questionnaireItem = questionnaireViewItem.questionnaireItem
+        header.bind(questionnaireViewItem)
         val choiceOrientation =
-          questionnaireItem.choiceOrientation ?: ChoiceOrientationTypes.VERTICAL
-
-        header.bind(questionnaireItem)
+          questionnaireViewItem.questionnaireItem.choiceOrientation
+            ?: ChoiceOrientationTypes.VERTICAL
 
         // Keep the Flow layout which is always the first child
         checkboxGroup.removeViews(1, checkboxGroup.childCount - 1)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactory.kt
index ced30dc65f..d1f6515a39 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactory.kt
@@ -111,7 +111,7 @@ internal object DatePickerViewHolderFactory :
       @SuppressLint("NewApi") // java.time APIs can be used due to desugaring
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         clearPreviousState()
-        header.bind(questionnaireViewItem.questionnaireItem)
+        header.bind(questionnaireViewItem)
         textInputLayout.hint = canonicalizedDatePattern
         textInputEditText.removeTextChangedListener(textWatcher)
 
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactory.kt
index 5839b26e99..703cef77f6 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactory.kt
@@ -124,7 +124,7 @@ internal object DateTimePickerViewHolderFactory :
       @SuppressLint("NewApi") // java.time APIs can be used due to desugaring
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         clearPreviousState()
-        header.bind(questionnaireViewItem.questionnaireItem)
+        header.bind(questionnaireViewItem)
         dateInputLayout.hint = canonicalizedDatePattern
         dateInputEditText.removeTextChangedListener(textWatcher)
 
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
index 9e86576cb5..52a019eaea 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
@@ -63,28 +63,28 @@ internal object QuestionnaireItemDialogSelectViewHolderFactory :
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         cleanupOldState()
-        holder.summaryHolder.hint = questionnaireViewItem.questionnaireItem.localizedFlyoverSpanned
+        holder.summaryHolder.hint =
+          questionnaireViewItem.enabledDisplayItems?.localizedFlyoverSpanned
         val activity =
           requireNotNull(holder.header.context.tryUnwrapContext()) {
             "Can only use dialog select in an AppCompatActivity context"
           }
         val viewModel: QuestionnaireItemDialogSelectViewModel by activity.viewModels()
 
-        val item = questionnaireViewItem.questionnaireItem
-
         // Bind static data
-        holder.header.bind(item)
+        holder.header.bind(questionnaireViewItem)
 
+        val questionnaireItem = questionnaireViewItem.questionnaireItem
         selectedOptionsJob =
           activity.lifecycleScope.launch {
             // Set the initial selected options state from the FHIR data model
             viewModel.updateSelectedOptions(
-              item.linkId,
+              questionnaireItem.linkId,
               questionnaireViewItem.extractInitialOptions(holder.header.context)
             )
 
             // Listen for changes to selected options to update summary + FHIR data model
-            viewModel.getSelectedOptionsFlow(item.linkId).collect { selectedOptions ->
+            viewModel.getSelectedOptionsFlow(questionnaireItem.linkId).collect { selectedOptions ->
               holder.summary.text = selectedOptions.selectedSummary
               updateAnswers(selectedOptions)
             }
@@ -95,12 +95,12 @@ internal object QuestionnaireItemDialogSelectViewHolderFactory :
           View.OnClickListener {
             val fragment =
               OptionSelectDialogFragment(
-                title = item.localizedTextSpanned ?: "",
-                config = item.buildConfig(),
+                title = questionnaireItem.localizedTextSpanned ?: "",
+                config = questionnaireItem.buildConfig(),
               )
             fragment.arguments =
               bundleOf(
-                OptionSelectDialogFragment.KEY_QUESTION_LINK_ID to item.linkId,
+                OptionSelectDialogFragment.KEY_QUESTION_LINK_ID to questionnaireItem.linkId,
               )
             fragment.show(activity.supportFragmentManager, null)
           }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DisplayViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DisplayViewHolderFactory.kt
index 9b382cd0e7..a474898ccb 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DisplayViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DisplayViewHolderFactory.kt
@@ -33,7 +33,7 @@ internal object DisplayViewHolderFactory :
       }
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
-        header.bind(questionnaireViewItem.questionnaireItem)
+        header.bind(questionnaireViewItem)
       }
 
       override fun setReadOnly(isReadOnly: Boolean) {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
index 6ed903669a..f9c11dafa2 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
@@ -58,8 +58,8 @@ internal object DropDownViewHolderFactory :
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         cleanupOldState()
-        header.bind(questionnaireViewItem.questionnaireItem)
-        textInputLayout.hint = questionnaireViewItem.questionnaireItem.localizedFlyoverSpanned
+        header.bind(questionnaireViewItem)
+        textInputLayout.hint = questionnaireViewItem.enabledDisplayItems?.localizedFlyoverSpanned
         val answerOptionList =
           this.questionnaireViewItem.answerOption
             .map {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt
index 863eb6944d..05906c69ad 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt
@@ -80,8 +80,8 @@ abstract class QuestionnaireItemEditTextViewHolderDelegate(private val rawInputT
   }
 
   override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
-    header.bind(questionnaireViewItem.questionnaireItem)
-    textInputLayout.hint = questionnaireViewItem.questionnaireItem.localizedFlyoverSpanned
+    header.bind(questionnaireViewItem)
+    textInputLayout.hint = questionnaireViewItem.enabledDisplayItems?.localizedFlyoverSpanned
     displayValidationResult(questionnaireViewItem.validationResult)
 
     textInputEditText.removeTextChangedListener(textWatcher)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactory.kt
index ce7916f559..f776e9424b 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactory.kt
@@ -45,7 +45,7 @@ internal object GroupViewHolderFactory :
       }
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
-        header.bind(questionnaireViewItem.questionnaireItem)
+        header.bind(questionnaireViewItem)
         addItemButton.visibility =
           if (questionnaireViewItem.questionnaireItem.repeats) View.VISIBLE else View.GONE
         addItemButton.setOnClickListener {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactory.kt
index 0b20ce3210..3ce27e0d88 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactory.kt
@@ -53,12 +53,12 @@ internal object RadioGroupViewHolderFactory :
       }
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
-        val questionnaireItem = questionnaireViewItem.questionnaireItem
-        header.bind(questionnaireItem)
+        header.bind(questionnaireViewItem)
         // Keep the Flow layout which is the first child
         radioGroup.removeViews(1, radioGroup.childCount - 1)
         val choiceOrientation =
-          questionnaireItem.choiceOrientation ?: ChoiceOrientationTypes.VERTICAL
+          questionnaireViewItem.questionnaireItem.choiceOrientation
+            ?: ChoiceOrientationTypes.VERTICAL
         when (choiceOrientation) {
           ChoiceOrientationTypes.HORIZONTAL -> {
             flow.setOrientation(Flow.HORIZONTAL)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
index ae81f99fb8..164ab988f9 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
@@ -48,9 +48,9 @@ internal object ReviewViewHolderFactory : QuestionnaireItemViewHolderFactory(R.l
       }
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
-        header.bind(questionnaireViewItem.questionnaireItem)
+        header.bind(questionnaireViewItem)
         val localizedFlyoverSpanned =
-          questionnaireViewItem.questionnaireItem.localizedFlyoverSpanned
+          questionnaireViewItem.enabledDisplayItems?.localizedFlyoverSpanned
         flyOverTextView.apply {
           visibility =
             if (localizedFlyoverSpanned.isNullOrEmpty()) {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/SliderViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/SliderViewHolderFactory.kt
index 5c8c682a93..5c5ebeff7a 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/SliderViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/SliderViewHolderFactory.kt
@@ -49,7 +49,7 @@ internal object SliderViewHolderFactory : QuestionnaireItemViewHolderFactory(R.l
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         this.questionnaireViewItem = questionnaireViewItem
-        header.bind(questionnaireViewItem.questionnaireItem)
+        header.bind(questionnaireViewItem)
         val answer = questionnaireViewItem.answers.singleOrNull()
         val minValue = getMinValue(questionnaireViewItem.questionnaireItem)
         val maxValue = getMaxValue(questionnaireViewItem.questionnaireItem)
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/GroupHeaderViewTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/GroupHeaderViewTest.kt
index 49aa169a0b..82cdf7974d 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/GroupHeaderViewTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/GroupHeaderViewTest.kt
@@ -28,12 +28,14 @@ import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_SYSTEM
 import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_URL
 import com.google.android.fhir.datacapture.INSTRUCTIONS
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.material.card.MaterialCardView
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.CodeableConcept
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.Questionnaire
+import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -47,9 +49,37 @@ class GroupHeaderViewTest {
     )
   private val view = GroupHeaderView(parent.context, null)
 
+  private fun getQuestionnaireViewItemWithQuestionnaireItem(
+    questionnaireItem: Questionnaire.QuestionnaireItemComponent
+  ): QuestionnaireViewItem {
+    return QuestionnaireViewItem(
+      questionnaireItem = questionnaireItem,
+      questionnaireResponseItem = QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+      validationResult = Valid,
+      answersChangedCallback = { _, _, _, _ -> }
+    )
+  }
+
+  private fun getQuestionnaireViewItemWithQuestionnaireItemAndEnabledDisplayItems(
+    questionnaireItem: Questionnaire.QuestionnaireItemComponent,
+    enabledDisplayItems: List<Questionnaire.QuestionnaireItemComponent>
+  ): QuestionnaireViewItem {
+    return QuestionnaireViewItem(
+      questionnaireItem = questionnaireItem,
+      questionnaireResponseItem = QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+      validationResult = Valid,
+      answersChangedCallback = { _, _, _, _ -> },
+      enabledDisplayItems = enabledDisplayItems
+    )
+  }
+
   @Test
   fun shouldShowPrefix() {
-    view.bind(Questionnaire.QuestionnaireItemComponent().apply { prefix = "Prefix?" })
+    view.bind(
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply { prefix = "Prefix?" }
+      )
+    )
 
     assertThat(view.findViewById<TextView>(R.id.prefix).isVisible).isTrue()
     assertThat(view.findViewById<TextView>(R.id.prefix).text.toString()).isEqualTo("Prefix?")
@@ -57,7 +87,11 @@ class GroupHeaderViewTest {
 
   @Test
   fun shouldHidePrefix() {
-    view.bind(Questionnaire.QuestionnaireItemComponent().apply { prefix = "" })
+    view.bind(
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply { prefix = "" }
+      )
+    )
 
     assertThat(view.findViewById<TextView>(R.id.prefix).isVisible).isFalse()
   }
@@ -65,10 +99,12 @@ class GroupHeaderViewTest {
   @Test
   fun shouldShowQuestion() {
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        repeats = true
-        text = "Question?"
-      }
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          repeats = true
+          text = "Question?"
+        }
+      )
     )
 
     assertThat(view.findViewById<TextView>(R.id.question).text.toString()).isEqualTo("Question?")
@@ -76,18 +112,20 @@ class GroupHeaderViewTest {
 
   @Test
   fun `shows instructions`() {
+    val itemList =
+      listOf(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          linkId = "nested-display-question"
+          text = "subtitle text"
+          extension = listOf(displayCategoryExtensionWithInstructionsCode)
+          type = Questionnaire.QuestionnaireItemType.DISPLAY
+        }
+      )
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "subtitle text"
-              extension = listOf(displayCategoryExtensionWithInstructionsCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItemAndEnabledDisplayItems(
+        Questionnaire.QuestionnaireItemComponent().apply { item = itemList },
+        itemList
+      )
     )
 
     assertThat(view.findViewById<TextView>(R.id.hint).isVisible).isTrue()
@@ -97,15 +135,17 @@ class GroupHeaderViewTest {
   @Test
   fun `hides instructions`() {
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        }
+      )
     )
 
     assertThat(view.findViewById<TextView>(R.id.hint).visibility).isEqualTo(View.GONE)
@@ -114,17 +154,19 @@ class GroupHeaderViewTest {
   @Test
   fun `shows helpButton if help code is present`() {
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "help text"
-              extension = listOf(itemControlExtensionWithHelpCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                text = "help text"
+                extension = listOf(itemControlExtensionWithHelpCode)
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        }
+      )
     )
 
     assertThat(view.findViewById<Button>(R.id.helpButton).isVisible).isTrue()
@@ -133,17 +175,19 @@ class GroupHeaderViewTest {
   @Test
   fun `hides helpButton if help code is not present`() {
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "help text"
-              extension = listOf(displayCategoryExtensionWithInstructionsCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                text = "help text"
+                extension = listOf(displayCategoryExtensionWithInstructionsCode)
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        }
+      )
     )
 
     assertThat(view.findViewById<Button>(R.id.helpButton).isVisible).isFalse()
@@ -152,17 +196,19 @@ class GroupHeaderViewTest {
   @Test
   fun `shows helpCardView on help button click`() {
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "help text"
-              extension = listOf(itemControlExtensionWithHelpCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                text = "help text"
+                extension = listOf(itemControlExtensionWithHelpCode)
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        }
+      )
     )
     view.findViewById<Button>(R.id.helpButton).performClick()
 
@@ -172,17 +218,19 @@ class GroupHeaderViewTest {
   @Test
   fun `hides helpCardView on help button click if help card view was already visible`() {
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "help text"
-              extension = listOf(itemControlExtensionWithHelpCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                text = "help text"
+                extension = listOf(itemControlExtensionWithHelpCode)
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        }
+      )
     )
     view.findViewById<Button>(R.id.helpButton).performClick()
     view.findViewById<Button>(R.id.helpButton).performClick()
@@ -192,18 +240,20 @@ class GroupHeaderViewTest {
 
   @Test
   fun `updates textview for help code Text`() {
+    val itemList =
+      listOf(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          linkId = "nested-display-question"
+          text = "help text"
+          extension = listOf(itemControlExtensionWithHelpCode)
+          type = Questionnaire.QuestionnaireItemType.DISPLAY
+        }
+      )
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "help text"
-              extension = listOf(itemControlExtensionWithHelpCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItemAndEnabledDisplayItems(
+        questionnaireItem = Questionnaire.QuestionnaireItemComponent().apply { item = itemList },
+        enabledDisplayItems = itemList
+      )
     )
 
     assertThat(view.findViewById<TextView>(R.id.helpText).text.toString()).isEqualTo("help text")
@@ -211,18 +261,20 @@ class GroupHeaderViewTest {
 
   @Test
   fun `shows headerItem view`() {
+    val itemList =
+      listOf(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          linkId = "nested-display-question"
+          text = "subtitle text"
+          extension = listOf(displayCategoryExtensionWithInstructionsCode)
+          type = Questionnaire.QuestionnaireItemType.DISPLAY
+        }
+      )
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "subtitle text"
-              extension = listOf(displayCategoryExtensionWithInstructionsCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItemAndEnabledDisplayItems(
+        Questionnaire.QuestionnaireItemComponent().apply { item = itemList },
+        itemList
+      )
     )
 
     assertThat(view.visibility).isEqualTo(View.VISIBLE)
@@ -230,7 +282,9 @@ class GroupHeaderViewTest {
 
   @Test
   fun shouldHideHeaderView() {
-    view.bind(Questionnaire.QuestionnaireItemComponent())
+    view.bind(
+      getQuestionnaireViewItemWithQuestionnaireItem(Questionnaire.QuestionnaireItemComponent())
+    )
 
     assertThat(view.visibility).isEqualTo(View.GONE)
   }
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/HeaderViewTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/HeaderViewTest.kt
index ac91afbbbe..44abb4d24f 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/HeaderViewTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/HeaderViewTest.kt
@@ -28,12 +28,14 @@ import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_SYSTEM
 import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_URL
 import com.google.android.fhir.datacapture.INSTRUCTIONS
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.material.card.MaterialCardView
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.CodeableConcept
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.Questionnaire
+import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -47,9 +49,37 @@ class HeaderViewTest {
     )
   private val view = HeaderView(parent.context, null)
 
+  private fun getQuestionnaireViewItemWithQuestionnaireItem(
+    questionnaireItem: Questionnaire.QuestionnaireItemComponent
+  ): QuestionnaireViewItem {
+    return QuestionnaireViewItem(
+      questionnaireItem = questionnaireItem,
+      questionnaireResponseItem = QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+      validationResult = Valid,
+      answersChangedCallback = { _, _, _, _ -> }
+    )
+  }
+
+  private fun getQuestionnaireViewItemWithQuestionnaireItemAndEnabledDisplayItems(
+    questionnaireItem: Questionnaire.QuestionnaireItemComponent,
+    enabledDisplayItems: List<Questionnaire.QuestionnaireItemComponent>
+  ): QuestionnaireViewItem {
+    return QuestionnaireViewItem(
+      questionnaireItem = questionnaireItem,
+      questionnaireResponseItem = QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+      validationResult = Valid,
+      answersChangedCallback = { _, _, _, _ -> },
+      enabledDisplayItems = enabledDisplayItems
+    )
+  }
+
   @Test
   fun shouldShowPrefix() {
-    view.bind(Questionnaire.QuestionnaireItemComponent().apply { prefix = "Prefix?" })
+    view.bind(
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply { prefix = "Prefix?" }
+      )
+    )
 
     assertThat(view.findViewById<TextView>(R.id.prefix).isVisible).isTrue()
     assertThat(view.findViewById<TextView>(R.id.prefix).text.toString()).isEqualTo("Prefix?")
@@ -57,7 +87,11 @@ class HeaderViewTest {
 
   @Test
   fun shouldHidePrefix() {
-    view.bind(Questionnaire.QuestionnaireItemComponent().apply { prefix = "" })
+    view.bind(
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply { prefix = "" }
+      )
+    )
 
     assertThat(view.findViewById<TextView>(R.id.prefix).isVisible).isFalse()
   }
@@ -65,10 +99,12 @@ class HeaderViewTest {
   @Test
   fun shouldShowQuestion() {
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        repeats = true
-        text = "Question?"
-      }
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          repeats = true
+          text = "Question?"
+        }
+      )
     )
 
     assertThat(view.findViewById<TextView>(R.id.question).text.toString()).isEqualTo("Question?")
@@ -76,18 +112,20 @@ class HeaderViewTest {
 
   @Test
   fun `shows instructions`() {
+    val itemList =
+      listOf(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          linkId = "nested-display-question"
+          text = "subtitle text"
+          extension = listOf(displayCategoryExtensionWithInstructionsCode)
+          type = Questionnaire.QuestionnaireItemType.DISPLAY
+        }
+      )
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "subtitle text"
-              extension = listOf(displayCategoryExtensionWithInstructionsCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItemAndEnabledDisplayItems(
+        Questionnaire.QuestionnaireItemComponent().apply { item = itemList },
+        itemList
+      )
     )
 
     assertThat(view.findViewById<TextView>(R.id.hint).isVisible).isTrue()
@@ -97,15 +135,17 @@ class HeaderViewTest {
   @Test
   fun `hides instructions`() {
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        }
+      )
     )
 
     assertThat(view.findViewById<TextView>(R.id.hint).visibility).isEqualTo(View.GONE)
@@ -114,17 +154,19 @@ class HeaderViewTest {
   @Test
   fun `shows helpButton if help code is present`() {
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "help text"
-              extension = listOf(itemControlExtensionWithHelpCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                text = "help text"
+                extension = listOf(itemControlExtensionWithHelpCode)
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        }
+      )
     )
 
     assertThat(view.findViewById<Button>(R.id.helpButton).isVisible).isTrue()
@@ -133,17 +175,19 @@ class HeaderViewTest {
   @Test
   fun `hides helpButton if help code is not present`() {
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "help text"
-              extension = listOf(displayCategoryExtensionWithInstructionsCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                text = "help text"
+                extension = listOf(displayCategoryExtensionWithInstructionsCode)
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        }
+      )
     )
 
     assertThat(view.findViewById<Button>(R.id.helpButton).isVisible).isFalse()
@@ -152,17 +196,19 @@ class HeaderViewTest {
   @Test
   fun `shows helpCardView on help button click`() {
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "help text"
-              extension = listOf(itemControlExtensionWithHelpCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                text = "help text"
+                extension = listOf(itemControlExtensionWithHelpCode)
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        }
+      )
     )
     view.findViewById<Button>(R.id.helpButton).performClick()
 
@@ -172,17 +218,19 @@ class HeaderViewTest {
   @Test
   fun `hides helpCardView on help button click if help card view was already visible`() {
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "help text"
-              extension = listOf(itemControlExtensionWithHelpCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                text = "help text"
+                extension = listOf(itemControlExtensionWithHelpCode)
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        }
+      )
     )
     view.findViewById<Button>(R.id.helpButton).performClick()
     view.findViewById<Button>(R.id.helpButton).performClick()
@@ -192,18 +240,20 @@ class HeaderViewTest {
 
   @Test
   fun `updates textview for help code Text`() {
+    val itemList =
+      listOf(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          linkId = "nested-display-question"
+          text = "help text"
+          extension = listOf(itemControlExtensionWithHelpCode)
+          type = Questionnaire.QuestionnaireItemType.DISPLAY
+        }
+      )
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "help text"
-              extension = listOf(itemControlExtensionWithHelpCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItemAndEnabledDisplayItems(
+        Questionnaire.QuestionnaireItemComponent().apply { item = itemList },
+        itemList
+      )
     )
 
     assertThat(view.findViewById<TextView>(R.id.helpText).text.toString()).isEqualTo("help text")
@@ -211,18 +261,20 @@ class HeaderViewTest {
 
   @Test
   fun `shows headerItem view`() {
+    val itemList =
+      listOf(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          linkId = "nested-display-question"
+          text = "subtitle text"
+          extension = listOf(displayCategoryExtensionWithInstructionsCode)
+          type = Questionnaire.QuestionnaireItemType.DISPLAY
+        }
+      )
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              text = "subtitle text"
-              extension = listOf(displayCategoryExtensionWithInstructionsCode)
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItemAndEnabledDisplayItems(
+        Questionnaire.QuestionnaireItemComponent().apply { item = itemList },
+        itemList
+      )
     )
 
     assertThat(view.visibility).isEqualTo(View.VISIBLE)
@@ -231,15 +283,17 @@ class HeaderViewTest {
   @Test
   fun shouldHideHeaderView() {
     view.bind(
-      Questionnaire.QuestionnaireItemComponent().apply {
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "nested-display-question"
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-            }
-          )
-      }
+      getQuestionnaireViewItemWithQuestionnaireItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          item =
+            listOf(
+              Questionnaire.QuestionnaireItemComponent().apply {
+                linkId = "nested-display-question"
+                type = Questionnaire.QuestionnaireItemType.DISPLAY
+              }
+            )
+        }
+      )
     )
 
     assertThat(view.visibility).isEqualTo(View.GONE)
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt
index 23d56d18cb..84145e973d 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt
@@ -83,32 +83,34 @@ class ReviewViewHolderFactoryTest {
 
   @Test
   fun `bind() should set fly over text`() {
+    val itemList =
+      listOf(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          text = "flyover text"
+          type = Questionnaire.QuestionnaireItemType.DISPLAY
+          addExtension(
+            EXTENSION_ITEM_CONTROL_URL,
+            CodeableConcept().apply {
+              addCoding().apply {
+                system = EXTENSION_ITEM_CONTROL_SYSTEM
+                code = DisplayItemControlType.FLYOVER.extensionCode
+              }
+            }
+          )
+        }
+      )
     viewHolder.bind(
       QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "parent-question"
           text = "parent question text"
           type = Questionnaire.QuestionnaireItemType.BOOLEAN
-          item =
-            listOf(
-              Questionnaire.QuestionnaireItemComponent().apply {
-                text = "flyover text"
-                type = Questionnaire.QuestionnaireItemType.DISPLAY
-                addExtension(
-                  EXTENSION_ITEM_CONTROL_URL,
-                  CodeableConcept().apply {
-                    addCoding().apply {
-                      system = EXTENSION_ITEM_CONTROL_SYSTEM
-                      code = DisplayItemControlType.FLYOVER.extensionCode
-                    }
-                  }
-                )
-              }
-            )
+          item = itemList
         },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = Valid,
         answersChangedCallback = { _, _, _, _ -> },
+        enabledDisplayItems = itemList
       )
     )
 

From 203838db2bce9563613038d7fd933964294e32ff Mon Sep 17 00:00:00 2001
From: Madhuram Jajoo <madhuramjajoo10@gmail.com>
Date: Thu, 9 Mar 2023 17:27:54 +0530
Subject: [PATCH 2/5] Review changes and updated kdoc

---
 ...ultiSelectViewHolderFactoryEspressoTest.kt | 39 ++++++++++---------
 .../datacapture/QuestionnaireViewModel.kt     |  9 +----
 .../MoreQuestionnaireItemComponents.kt        | 30 ++++++++------
 .../fhir/datacapture/views/GroupHeaderView.kt |  2 +-
 .../fhir/datacapture/views/HeaderView.kt      | 12 +++---
 .../views/QuestionnaireViewItem.kt            |  8 ++--
 .../DialogSelectViewHolderFactory.kt          |  2 +-
 .../factories/DropDownViewHolderFactory.kt    |  2 +-
 .../factories/EditTextViewHolderFactory.kt    |  2 +-
 .../factories/ReviewViewHolderFactory.kt      |  2 +-
 10 files changed, 57 insertions(+), 51 deletions(-)

diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest.kt
index 23f1726d91..0186020ce9 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest.kt
@@ -200,31 +200,32 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
 
   @Test
   fun bindView_setHintText() {
+    val hintItem =
+      Questionnaire.QuestionnaireItemComponent().apply {
+        linkId = "1.1"
+        text = "Select code"
+        type = Questionnaire.QuestionnaireItemType.DISPLAY
+        addExtension(
+          Extension()
+            .setUrl(EXTENSION_ITEM_CONTROL_URL)
+            .setValue(
+              CodeableConcept()
+                .addCoding(
+                  Coding()
+                    .setCode(DisplayItemControlType.FLYOVER.extensionCode)
+                    .setSystem(EXTENSION_ITEM_CONTROL_SYSTEM)
+                )
+            )
+        )
+      }
     val questionnaireViewItem =
       QuestionnaireViewItem(
         answerOptions(false, "Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5")
-          .addItem(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "1.1"
-              text = "Select code"
-              type = Questionnaire.QuestionnaireItemType.DISPLAY
-              addExtension(
-                Extension()
-                  .setUrl(EXTENSION_ITEM_CONTROL_URL)
-                  .setValue(
-                    CodeableConcept()
-                      .addCoding(
-                        Coding()
-                          .setCode(DisplayItemControlType.FLYOVER.extensionCode)
-                          .setSystem(EXTENSION_ITEM_CONTROL_SYSTEM)
-                      )
-                  )
-              )
-            }
-          ),
+          .addItem(hintItem),
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
+        enabledDisplayItems = listOf(hintItem)
       )
     runOnUI { viewHolder.bind(questionnaireViewItem) }
 
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index a7989bcfb3..3f0bb98f2b 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -630,8 +630,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
             draftAnswer = draftAnswerMap[questionnaireResponseItem],
             enabledDisplayItems =
               questionnaireItem.item.filter {
-                it.type == Questionnaire.QuestionnaireItemType.DISPLAY &&
-                  (it.isInstructionsCode || it.isFlyoverCode || it.isHelpCode) &&
+                it.isDisplayItem &&
                   EnablementEvaluator(questionnaireResponse).evaluate(it, questionnaireResponseItem)
               }
           )
@@ -662,11 +661,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
             getQuestionnaireAdapterItems(
               // If nested display item is identified as instructions or flyover, then do not create
               // questionnaire state for it.
-              questionnaireItemList =
-                questionnaireItem.item.filterNot {
-                  it.type == Questionnaire.QuestionnaireItemType.DISPLAY &&
-                    (it.isInstructionsCode || it.isFlyoverCode || it.isHelpCode)
-                },
+              questionnaireItemList = questionnaireItem.item.filterNot { it.isDisplayItem },
               questionnaireResponseItemList = nestedResponseItemList,
             )
           )
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index 3c185d79b1..4a09fe42c5 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -272,18 +272,6 @@ internal val Questionnaire.QuestionnaireItemComponent.hasHelpButton: Boolean
     return item.any { it.isHelpCode }
   }
 
-/** Whether item type is display and [displayItemControl] is [DisplayItemControlType.HELP]. */
-internal val Questionnaire.QuestionnaireItemComponent.isHelpCode: Boolean
-  get() {
-    return when (type) {
-      Questionnaire.QuestionnaireItemType.DISPLAY -> {
-        displayItemControl == DisplayItemControlType.HELP
-      }
-      else -> {
-        false
-      }
-    }
-  }
 /** Converts Text with HTML Tag to formatted text. */
 private fun String.toSpanned(): Spanned {
   return HtmlCompat.fromHtml(this, HtmlCompat.FROM_HTML_MODE_COMPACT)
@@ -410,6 +398,24 @@ internal val Questionnaire.QuestionnaireItemComponent.isFlyoverCode: Boolean
     }
   }
 
+/** Whether item type is display and [displayItemControl] is [DisplayItemControlType.HELP]. */
+internal val Questionnaire.QuestionnaireItemComponent.isHelpCode: Boolean
+  get() {
+    return when (type) {
+      Questionnaire.QuestionnaireItemType.DISPLAY -> {
+        displayItemControl == DisplayItemControlType.HELP
+      }
+      else -> {
+        false
+      }
+    }
+  }
+
+internal val Questionnaire.QuestionnaireItemComponent.isDisplayItem: Boolean
+  get() =
+    (type == Questionnaire.QuestionnaireItemType.DISPLAY &&
+      (isInstructionsCode || isFlyoverCode || isHelpCode))
+
 /** Slider step extension value. */
 internal val Questionnaire.QuestionnaireItemComponent.sliderStepValue: Int?
   get() {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
index 4093a5ab32..841101f477 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
@@ -41,7 +41,7 @@ internal class GroupHeaderView(context: Context, attrs: AttributeSet?) :
     prefix.updateTextAndVisibility(questionnaireViewItem.questionnaireItem.localizedPrefixSpanned)
     question.updateTextAndVisibility(questionnaireViewItem.questionnaireItem.localizedTextSpanned)
     hint.updateTextAndVisibility(
-      questionnaireViewItem.enabledDisplayItems?.localizedInstructionsSpanned
+      questionnaireViewItem.enabledDisplayItems.localizedInstructionsSpanned
     )
     visibility = getViewGroupVisibility(prefix, question, hint)
   }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
index 9688bce185..9122272090 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
@@ -47,13 +47,15 @@ internal class HeaderView(context: Context, attrs: AttributeSet?) : LinearLayout
   private var errorTextView: TextView = findViewById(R.id.error_text_at_header)
 
   fun bind(questionnaireViewItem: QuestionnaireViewItem) {
-    prefix.updateTextAndVisibility(questionnaireViewItem.questionnaireItem.localizedPrefixSpanned)
-    question.updateTextAndVisibility(questionnaireViewItem.questionnaireItem.localizedTextSpanned)
+    questionnaireViewItem.questionnaireItem.let {
+      prefix.updateTextAndVisibility(it.localizedPrefixSpanned)
+      question.updateTextAndVisibility(it.localizedTextSpanned)
+    }
     hint.updateTextAndVisibility(
-      questionnaireViewItem.enabledDisplayItems?.localizedInstructionsSpanned
+      questionnaireViewItem.enabledDisplayItems.localizedInstructionsSpanned
     )
     initHelpButton(this, questionnaireViewItem)
-    //   Make the entire view GONE if there is nothing to show. This is to avoid an empty row in the
+    // Make the entire view GONE if there is nothing to show. This is to avoid an empty row in the
     // questionnaire.
     visibility = getViewGroupVisibility(prefix, question, hint)
   }
@@ -116,5 +118,5 @@ internal fun initHelpButton(view: View, questionnaireViewItem: QuestionnaireView
 
   view
     .findViewById<TextView>(R.id.helpText)
-    .updateTextAndVisibility(questionnaireViewItem.enabledDisplayItems?.localizedHelpSpanned)
+    .updateTextAndVisibility(questionnaireViewItem.enabledDisplayItems.localizedHelpSpanned)
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
index 26ed73a33f..7c6d190eca 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
@@ -32,8 +32,9 @@ import org.hl7.fhir.r4.model.QuestionnaireResponse
 /**
  * Data item for [QuestionnaireItemViewHolder] in [RecyclerView].
  *
- * The view should use [questionnaireItem], [answers], [answerOption], and [validationResult] to
- * render the data item in the UI. The view SHOULD NOT mutate the data using these properties.
+ * The view should use [questionnaireItem], [answers], [answerOption], [validationResult] and
+ * [enabledDisplayItems] to render the data item in the UI. The view SHOULD NOT mutate the data
+ * using these properties.
  *
  * The view should use the following answer APIs to update the answer(s):
  * - [setAnswer] (for single and repeated answers)
@@ -55,6 +56,7 @@ import org.hl7.fhir.r4.model.QuestionnaireResponse
  * @param resolveAnswerExpression the callback to resolve answer options when answer-expression
  * extension exists options
  * @param draftAnswer the draft input that cannot be stored in the [QuestionnaireResponse].
+ * @param enabledDisplayItems the enabled display items in the given [questionnaireItem]
  */
 data class QuestionnaireViewItem(
   val questionnaireItem: Questionnaire.QuestionnaireItemComponent,
@@ -79,7 +81,7 @@ data class QuestionnaireViewItem(
       emptyList()
     },
   internal val draftAnswer: Any? = null,
-  internal val enabledDisplayItems: List<Questionnaire.QuestionnaireItemComponent>? = null
+  internal val enabledDisplayItems: List<Questionnaire.QuestionnaireItemComponent> = emptyList()
 ) {
 
   /**
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
index 52a019eaea..3a5bc40f6a 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
@@ -64,7 +64,7 @@ internal object QuestionnaireItemDialogSelectViewHolderFactory :
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         cleanupOldState()
         holder.summaryHolder.hint =
-          questionnaireViewItem.enabledDisplayItems?.localizedFlyoverSpanned
+          questionnaireViewItem.enabledDisplayItems.localizedFlyoverSpanned
         val activity =
           requireNotNull(holder.header.context.tryUnwrapContext()) {
             "Can only use dialog select in an AppCompatActivity context"
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
index f9c11dafa2..6e2c56b0ce 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
@@ -59,7 +59,7 @@ internal object DropDownViewHolderFactory :
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         cleanupOldState()
         header.bind(questionnaireViewItem)
-        textInputLayout.hint = questionnaireViewItem.enabledDisplayItems?.localizedFlyoverSpanned
+        textInputLayout.hint = questionnaireViewItem.enabledDisplayItems.localizedFlyoverSpanned
         val answerOptionList =
           this.questionnaireViewItem.answerOption
             .map {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt
index 05906c69ad..6f6e524b5b 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt
@@ -81,7 +81,7 @@ abstract class QuestionnaireItemEditTextViewHolderDelegate(private val rawInputT
 
   override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
     header.bind(questionnaireViewItem)
-    textInputLayout.hint = questionnaireViewItem.enabledDisplayItems?.localizedFlyoverSpanned
+    textInputLayout.hint = questionnaireViewItem.enabledDisplayItems.localizedFlyoverSpanned
     displayValidationResult(questionnaireViewItem.validationResult)
 
     textInputEditText.removeTextChangedListener(textWatcher)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
index 164ab988f9..b81d08b921 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
@@ -50,7 +50,7 @@ internal object ReviewViewHolderFactory : QuestionnaireItemViewHolderFactory(R.l
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         header.bind(questionnaireViewItem)
         val localizedFlyoverSpanned =
-          questionnaireViewItem.enabledDisplayItems?.localizedFlyoverSpanned
+          questionnaireViewItem.enabledDisplayItems.localizedFlyoverSpanned
         flyOverTextView.apply {
           visibility =
             if (localizedFlyoverSpanned.isNullOrEmpty()) {

From 8ca7bf36bdcf637d59f561477c1f0f6793e8c995 Mon Sep 17 00:00:00 2001
From: Madhuram Jajoo <madhuramjajoo10@gmail.com>
Date: Tue, 14 Mar 2023 10:28:01 +0530
Subject: [PATCH 3/5] Espresso test for enabled display items

---
 ...stionnaire_with_enabled_display_items.json | 67 +++++++++++++++++++
 .../QuestionnaireUiEspressoTest.kt            | 37 ++++++++++
 .../fhir/datacapture/views/GroupHeaderView.kt |  2 +-
 .../fhir/datacapture/views/HeaderView.kt      |  2 +-
 4 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 datacapture/sampledata/questionnaire_with_enabled_display_items.json

diff --git a/datacapture/sampledata/questionnaire_with_enabled_display_items.json b/datacapture/sampledata/questionnaire_with_enabled_display_items.json
new file mode 100644
index 0000000000..222ebc74f9
--- /dev/null
+++ b/datacapture/sampledata/questionnaire_with_enabled_display_items.json
@@ -0,0 +1,67 @@
+{
+  "resourceType": "Questionnaire",
+  "id": "questionnaire.enabled.display",
+  "url": "https://fhir.dk.swisstph-mis.ch/matchbox/fhir/Questionnaire/questionnaire.enabled.display",
+  "name": "Questionnaire Enabled Display",
+  "title": "Questionnaire Enabled Display",
+  "status": "active",
+  "item": [
+    {
+      "linkId": "1",
+      "text": "Severe Pneumonia or Very Severe Disease",
+      "type": "boolean",
+      "item": [
+        {
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory",
+              "valueCodeableConcept": {
+                "coding": [
+                  {
+                    "system": "http://hl7.org/fhir/questionnaire-display-category",
+                    "code": "instructions"
+                  }
+                ]
+              }
+            },
+            {
+              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
+              "valueExpression": {
+                "language": "text/fhirpath",
+                "expression": "%resource.repeat(item).where(linkId='1' and answer.empty().not()).select(answer.value) = false"
+              }
+            }
+          ],
+          "linkId": "1.1",
+          "text": "Text when no is selected",
+          "type": "display"
+        },
+        {
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory",
+              "valueCodeableConcept": {
+                "coding": [
+                  {
+                    "system": "http://hl7.org/fhir/questionnaire-display-category",
+                    "code": "instructions"
+                  }
+                ]
+              }
+            },
+            {
+              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
+              "valueExpression": {
+                "language": "text/fhirpath",
+                "expression": "%resource.repeat(item).where(linkId='1' and answer.empty().not()).select(answer.value) = true"
+              }
+            }
+          ],
+          "linkId": "1.2",
+          "text": "Text when yes is selected",
+          "type": "display"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
index ae47c039b9..de28253d04 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
@@ -16,7 +16,9 @@
 
 package com.google.android.fhir.datacapture
 
+import android.view.View
 import android.widget.FrameLayout
+import android.widget.TextView
 import androidx.fragment.app.commitNow
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
@@ -361,6 +363,41 @@ class QuestionnaireUiEspressoTest {
     assertThat(exception.message).isEqualTo("minValue cannot be greater than maxValue")
   }
 
+  @Test
+  fun displayItems_shouldGetEnabled_withAnswerChoice() {
+    buildFragmentFromQuestionnaire("/questionnaire_with_enabled_display_items.json")
+
+    onView(withId(R.id.hint)).check { view, _ ->
+      val hintVisibility = (view as TextView).visibility
+      assertThat(hintVisibility).isEqualTo(View.GONE)
+    }
+
+    onView(withId(R.id.yes_radio_button)).perform(ViewActions.click())
+
+    onView(withId(R.id.hint)).check { view, _ ->
+      val hintVisibility = (view as TextView).visibility
+      val hintText = (view as TextView).text.toString()
+      assertThat(hintVisibility).isEqualTo(View.VISIBLE)
+      assertThat(hintText).isEqualTo("Text when yes is selected")
+    }
+
+    onView(withId(R.id.no_radio_button)).perform(ViewActions.click())
+
+    onView(withId(R.id.hint)).check { view, _ ->
+      val hintVisibility = (view as TextView).visibility
+      val hintText = (view as TextView).text.toString()
+      assertThat(hintVisibility).isEqualTo(View.VISIBLE)
+      assertThat(hintText).isEqualTo("Text when no is selected")
+    }
+
+    onView(withId(R.id.no_radio_button)).perform(ViewActions.click())
+
+    onView(withId(R.id.hint)).check { view, _ ->
+      val hintVisibility = (view as TextView).visibility
+      assertThat(hintVisibility).isEqualTo(View.GONE)
+    }
+  }
+
   private fun buildFragmentFromQuestionnaire(fileName: String, isReviewMode: Boolean = false) {
     val questionnaireJsonString = readFileFromAssets(fileName)
     val questionnaireFragment =
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
index f87d785cfb..23c1aa06d0 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
@@ -45,7 +45,7 @@ internal class GroupHeaderView(context: Context, attrs: AttributeSet?) :
       helpButton = findViewById(R.id.helpButton),
       helpCardView = findViewById(R.id.helpCardView),
       helpTextView = findViewById(R.id.helpText),
-      questionnaireViewItem.questionnaireItem
+      questionnaireItem = questionnaireViewItem.questionnaireItem
     )
     prefix.updateTextAndVisibility(questionnaireViewItem.questionnaireItem.localizedPrefixSpanned)
     question.updateTextAndVisibility(questionnaireViewItem.questionnaireItem.localizedTextSpanned)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
index 7a363c5afb..e66008eb23 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
@@ -46,7 +46,7 @@ internal class HeaderView(context: Context, attrs: AttributeSet?) : LinearLayout
       helpButton = findViewById(R.id.helpButton),
       helpCardView = findViewById(R.id.helpCardView),
       helpTextView = findViewById(R.id.helpText),
-      questionnaireViewItem.questionnaireItem
+      questionnaireItem = questionnaireViewItem.questionnaireItem
     )
     prefix.updateTextAndVisibility(questionnaireViewItem.questionnaireItem.localizedPrefixSpanned)
     question.updateTextAndVisibility(questionnaireViewItem.questionnaireItem.localizedTextSpanned)

From d3f9dd6e2a63ec76763c543889973405f1adb07f Mon Sep 17 00:00:00 2001
From: Madhuram Jajoo <madhuramjajoo10@gmail.com>
Date: Tue, 14 Mar 2023 19:21:55 +0530
Subject: [PATCH 4/5] Added unit test for enabledDisplayItems

---
 ...stionnaire_with_enabled_display_items.json |   3 +-
 .../datacapture/QuestionnaireViewModelTest.kt | 100 ++++++++++++++++++
 2 files changed, 101 insertions(+), 2 deletions(-)

diff --git a/datacapture/sampledata/questionnaire_with_enabled_display_items.json b/datacapture/sampledata/questionnaire_with_enabled_display_items.json
index 222ebc74f9..ce9e334ee3 100644
--- a/datacapture/sampledata/questionnaire_with_enabled_display_items.json
+++ b/datacapture/sampledata/questionnaire_with_enabled_display_items.json
@@ -1,14 +1,13 @@
 {
   "resourceType": "Questionnaire",
   "id": "questionnaire.enabled.display",
-  "url": "https://fhir.dk.swisstph-mis.ch/matchbox/fhir/Questionnaire/questionnaire.enabled.display",
   "name": "Questionnaire Enabled Display",
   "title": "Questionnaire Enabled Display",
   "status": "active",
   "item": [
     {
       "linkId": "1",
-      "text": "Severe Pneumonia or Very Severe Disease",
+      "text": "Questionnaire Text",
       "type": "boolean",
       "item": [
         {
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
index e3e0d905bc..1f6c15d5d2 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
@@ -35,6 +35,7 @@ import com.google.android.fhir.datacapture.extensions.DisplayItemControlType
 import com.google.android.fhir.datacapture.extensions.EXTENSION_CALCULATED_EXPRESSION_URL
 import com.google.android.fhir.datacapture.extensions.EXTENSION_DISPLAY_CATEGORY_SYSTEM
 import com.google.android.fhir.datacapture.extensions.EXTENSION_DISPLAY_CATEGORY_URL
+import com.google.android.fhir.datacapture.extensions.EXTENSION_ENABLE_WHEN_EXPRESSION_URL
 import com.google.android.fhir.datacapture.extensions.EXTENSION_ENTRY_MODE_URL
 import com.google.android.fhir.datacapture.extensions.EXTENSION_HIDDEN_URL
 import com.google.android.fhir.datacapture.extensions.EXTENSION_ITEM_CONTROL_SYSTEM
@@ -70,6 +71,7 @@ import org.hl7.fhir.r4.model.BooleanType
 import org.hl7.fhir.r4.model.CodeableConcept
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.DateType
+import org.hl7.fhir.r4.model.Enumerations
 import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.HumanName
@@ -4115,6 +4117,104 @@ class QuestionnaireViewModelTest {
     }
   }
 
+  @Test
+  fun `display item should be enabled when initial value is set`() = runTest {
+    val enableWhenExpressionExtension: (Boolean) -> Extension = {
+      Extension().apply {
+        url = EXTENSION_ENABLE_WHEN_EXPRESSION_URL
+        setValue(
+          Expression().apply {
+            language = Expression.ExpressionLanguage.TEXT_FHIRPATH.toCode()
+            expression =
+              "%resource.repeat(item).where(linkId='1' and answer.empty().not()).select(answer.value) = ${if (it) "true" else "false"}"
+          }
+        )
+      }
+    }
+    val displayCategoryExtension =
+      Extension().apply {
+        url = EXTENSION_DISPLAY_CATEGORY_URL
+        setValue(
+          CodeableConcept().apply {
+            coding =
+              listOf(
+                Coding().apply {
+                  code = INSTRUCTIONS
+                  system = EXTENSION_DISPLAY_CATEGORY_SYSTEM
+                }
+              )
+          }
+        )
+      }
+    val questionnaire: (List<Questionnaire.QuestionnaireItemInitialComponent>) -> Questionnaire = {
+      Questionnaire().apply {
+        id = "questionnaire.enabled.display"
+        name = "Questionnaire Enabled Display"
+        title = "Questionnaire Enabled Display"
+        status = Enumerations.PublicationStatus.ACTIVE
+        addItem(
+          Questionnaire.QuestionnaireItemComponent().apply {
+            linkId = "1"
+            text = "Questionnaire Text"
+            type = Questionnaire.QuestionnaireItemType.BOOLEAN
+            initial = it
+            addItem(
+                Questionnaire.QuestionnaireItemComponent().apply {
+                  extension = listOf(displayCategoryExtension, enableWhenExpressionExtension(false))
+                  linkId = "1.1"
+                  text = "Text when no is selected"
+                  type = Questionnaire.QuestionnaireItemType.DISPLAY
+                }
+              )
+              .addItem(
+                Questionnaire.QuestionnaireItemComponent().apply {
+                  extension = listOf(displayCategoryExtension, enableWhenExpressionExtension(true))
+                  linkId = "1.2"
+                  text = "Text when yes is selected"
+                  type = Questionnaire.QuestionnaireItemType.DISPLAY
+                }
+              )
+          }
+        )
+      }
+    }
+
+    state.set(
+      EXTRA_QUESTIONNAIRE_JSON_STRING,
+      printer.encodeResourceToString(questionnaire(emptyList()))
+    )
+
+    // empty initial value
+    var viewModel = QuestionnaireViewModel(context, state)
+    assertThat(viewModel.getQuestionnaireItemViewItemList().size).isEqualTo(1)
+    // enabledDisplayItems is 0 when no choice is present
+    assertThat(
+        viewModel.getQuestionnaireItemViewItemList()[0].asQuestion().enabledDisplayItems.size
+      )
+      .isEqualTo(0)
+
+    // initial value is set to false
+    state.set(
+      EXTRA_QUESTIONNAIRE_JSON_STRING,
+      printer.encodeResourceToString(
+        questionnaire(
+          listOf(
+            Questionnaire.QuestionnaireItemInitialComponent().apply { value = BooleanType(false) }
+          )
+        )
+      )
+    )
+
+    viewModel = QuestionnaireViewModel(context, state)
+    assertThat(viewModel.getQuestionnaireItemViewItemList().size).isEqualTo(1)
+    val enabledDisplayItems =
+      viewModel.getQuestionnaireItemViewItemList()[0].asQuestion().enabledDisplayItems
+    assertThat(enabledDisplayItems.size).isEqualTo(1)
+    assertThat(enabledDisplayItems[0].type).isEqualTo(Questionnaire.QuestionnaireItemType.DISPLAY)
+    assertThat(enabledDisplayItems[0].linkId).isEqualTo("1.1")
+    assertThat(enabledDisplayItems[0].text).isEqualTo("Text when no is selected")
+  }
+
   private fun createQuestionnaireViewModel(
     questionnaire: Questionnaire,
     questionnaireResponse: QuestionnaireResponse? = null,

From 0e2f27829975fc0db356b14b74f462c77b49f564 Mon Sep 17 00:00:00 2001
From: Madhuram Jajoo <madhuramjajoo10@gmail.com>
Date: Tue, 14 Mar 2023 23:41:51 +0530
Subject: [PATCH 5/5] modified test for initial value set to true

---
 ...stionnaire_with_enabled_display_items.json |  2 +-
 .../QuestionnaireUiEspressoTest.kt            |  4 ++--
 .../datacapture/QuestionnaireViewModelTest.kt | 23 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/datacapture/sampledata/questionnaire_with_enabled_display_items.json b/datacapture/sampledata/questionnaire_with_enabled_display_items.json
index ce9e334ee3..21aaf273bf 100644
--- a/datacapture/sampledata/questionnaire_with_enabled_display_items.json
+++ b/datacapture/sampledata/questionnaire_with_enabled_display_items.json
@@ -63,4 +63,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
index de28253d04..cf7e0d351d 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
@@ -376,7 +376,7 @@ class QuestionnaireUiEspressoTest {
 
     onView(withId(R.id.hint)).check { view, _ ->
       val hintVisibility = (view as TextView).visibility
-      val hintText = (view as TextView).text.toString()
+      val hintText = view.text.toString()
       assertThat(hintVisibility).isEqualTo(View.VISIBLE)
       assertThat(hintText).isEqualTo("Text when yes is selected")
     }
@@ -385,7 +385,7 @@ class QuestionnaireUiEspressoTest {
 
     onView(withId(R.id.hint)).check { view, _ ->
       val hintVisibility = (view as TextView).visibility
-      val hintText = (view as TextView).text.toString()
+      val hintText = view.text.toString()
       assertThat(hintVisibility).isEqualTo(View.VISIBLE)
       assertThat(hintText).isEqualTo("Text when no is selected")
     }
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
index 1f6c15d5d2..f30a3c98aa 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
@@ -4207,12 +4207,33 @@ class QuestionnaireViewModelTest {
 
     viewModel = QuestionnaireViewModel(context, state)
     assertThat(viewModel.getQuestionnaireItemViewItemList().size).isEqualTo(1)
-    val enabledDisplayItems =
+    var enabledDisplayItems =
       viewModel.getQuestionnaireItemViewItemList()[0].asQuestion().enabledDisplayItems
     assertThat(enabledDisplayItems.size).isEqualTo(1)
     assertThat(enabledDisplayItems[0].type).isEqualTo(Questionnaire.QuestionnaireItemType.DISPLAY)
     assertThat(enabledDisplayItems[0].linkId).isEqualTo("1.1")
     assertThat(enabledDisplayItems[0].text).isEqualTo("Text when no is selected")
+
+    // initial value is set to true
+    state.set(
+      EXTRA_QUESTIONNAIRE_JSON_STRING,
+      printer.encodeResourceToString(
+        questionnaire(
+          listOf(
+            Questionnaire.QuestionnaireItemInitialComponent().apply { value = BooleanType(true) }
+          )
+        )
+      )
+    )
+
+    viewModel = QuestionnaireViewModel(context, state)
+    assertThat(viewModel.getQuestionnaireItemViewItemList().size).isEqualTo(1)
+    enabledDisplayItems =
+      viewModel.getQuestionnaireItemViewItemList()[0].asQuestion().enabledDisplayItems
+    assertThat(enabledDisplayItems.size).isEqualTo(1)
+    assertThat(enabledDisplayItems[0].type).isEqualTo(Questionnaire.QuestionnaireItemType.DISPLAY)
+    assertThat(enabledDisplayItems[0].linkId).isEqualTo("1.2")
+    assertThat(enabledDisplayItems[0].text).isEqualTo("Text when yes is selected")
   }
 
   private fun createQuestionnaireViewModel(