From cc0dc198e0f5dca5d008baaa51f1522d13757702 Mon Sep 17 00:00:00 2001
From: FikriMilano <fikrimilano1@gmail.com>
Date: Wed, 4 Sep 2024 12:28:51 +0700
Subject: [PATCH] Add condition to not populate string value if it's empty
 (#2521)

* Add condition to not populate string value if it's empty

* Revert "Add condition to not populate string value if it's empty"

This reverts commit 6f652e1409b49c5de5fe840a6959824895c303df.

* Filter only non-empty text should be saved

* spotless

* Address review
---
 .../fhir/datacapture/views/OptionSelectDialogFragment.kt  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
index cc1565af51..4fb0238ca0 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
@@ -138,7 +138,13 @@ internal class OptionSelectDialogFragment(
         SelectedOptions(
           options = currentList.filterIsInstance<OptionSelectRow.Option>().map { it.option },
           otherOptions =
-            currentList.filterIsInstance<OptionSelectRow.OtherEditText>().map { it.currentText },
+            currentList
+              .filterIsInstance<OptionSelectRow.OtherEditText>()
+              .filter {
+                it.currentText.isNotEmpty()
+              } // Filters out empty answers when the user inputs nothing into a new option choice
+              // edit text field.
+              .map { it.currentText },
         ),
       )
     }