From d16651b1257334d6ab1c7aa2cad3b0db99b01b87 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Wed, 8 Oct 2025 18:57:31 +0300
Subject: [PATCH 1/6] [MS-1166] Initial implementation of the Skip Credential
 screen

---
 .../ExternalCredentialSearchResult.kt         |   2 +-
 .../controller/ExternalCredentialViewModel.kt |  21 ++-
 .../ExternalCredentialSelectFragment.kt       |   5 +-
 .../ExternalCredentialSelectViewModel.kt      |  28 ----
 .../skip/ExternalCredentialSkipFragment.kt    |  88 +++++++++-
 .../fragment_external_credential_skip.xml     | 154 +++++++++++++++++-
 .../resources/src/main/res/values/strings.xml |  13 +-
 7 files changed, 269 insertions(+), 42 deletions(-)
 delete mode 100644 feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModel.kt

diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ExternalCredentialSearchResult.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ExternalCredentialSearchResult.kt
index 8942e3b815..d2584c3ed4 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ExternalCredentialSearchResult.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ExternalCredentialSearchResult.kt
@@ -19,7 +19,7 @@ import com.simprints.feature.externalcredential.screens.search.model.ScannedCred
 @ExcludedFromGeneratedTestCoverageReports("Data class")
 data class ExternalCredentialSearchResult(
     val flowType: FlowType,
-    val scannedCredential: ScannedCredential,
+    val scannedCredential: ScannedCredential?,
     val matchResults: List<CredentialMatch>,
 ) : StepResult {
     val goodMatches = matchResults.filter(CredentialMatch::isVerificationSuccessful)
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
index 751dd4b5db..d7f60e8678 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
@@ -3,17 +3,22 @@ package com.simprints.feature.externalcredential.screens.controller
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.simprints.core.domain.externalcredential.ExternalCredentialType
 import com.simprints.core.livedata.LiveDataEventWithContent
 import com.simprints.core.livedata.send
 import com.simprints.feature.externalcredential.ExternalCredentialSearchResult
 import com.simprints.feature.externalcredential.model.ExternalCredentialParams
+import com.simprints.infra.config.sync.ConfigManager
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
 import javax.inject.Inject
-import com.simprints.infra.resources.R as IDR
+import kotlin.collections.orEmpty
 
 @HiltViewModel
-internal class ExternalCredentialViewModel @Inject internal constructor() : ViewModel() {
+internal class ExternalCredentialViewModel @Inject internal constructor(
+    private val configManager: ConfigManager,
+) : ViewModel() {
     private var isInitialized = false
     lateinit var params: ExternalCredentialParams
         private set
@@ -28,6 +33,18 @@ internal class ExternalCredentialViewModel @Inject internal constructor() : View
     private val _stateLiveData = MutableLiveData(ExternalCredentialState.EMPTY)
     val stateLiveData: LiveData<ExternalCredentialState> = _stateLiveData
 
+    val externalCredentialTypes: LiveData<List<ExternalCredentialType>>
+        get() = _externalCredentialTypes
+    private val _externalCredentialTypes = MutableLiveData<List<ExternalCredentialType>>()
+
+    init {
+        viewModelScope.launch {
+            val config = configManager.getProjectConfiguration()
+            val allowedExternalCredentials = config.multifactorId?.allowedExternalCredentials.orEmpty()
+            _externalCredentialTypes.postValue(allowedExternalCredentials)
+        }
+    }
+
     private fun updateState(state: (ExternalCredentialState) -> ExternalCredentialState) {
         this.state = state(this.state)
     }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
index 54dce8c37a..6ab288a498 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
@@ -7,7 +7,6 @@ import android.widget.Button
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -32,7 +31,6 @@ import com.simprints.infra.resources.R as IDR
 @AndroidEntryPoint
 internal class ExternalCredentialSelectFragment : Fragment(R.layout.fragment_external_credential_select) {
     private val mainViewModel: ExternalCredentialViewModel by activityViewModels()
-    private val viewModel by viewModels<ExternalCredentialSelectViewModel>()
     private val binding by viewBinding(FragmentExternalCredentialSelectBinding::bind)
 
     private var dialog: Dialog? = null
@@ -46,7 +44,6 @@ internal class ExternalCredentialSelectFragment : Fragment(R.layout.fragment_ext
         Simber.i("ExternalCredentialSelectFragment started", tag = ORCHESTRATION)
 
         observeChanges()
-        viewModel.loadExternalCredentials()
     }
 
     override fun onDestroy() {
@@ -85,7 +82,7 @@ internal class ExternalCredentialSelectFragment : Fragment(R.layout.fragment_ext
     }
 
     private fun observeChanges() {
-        viewModel.externalCredentialTypes.observe(viewLifecycleOwner) { externalCredentialTypes ->
+        mainViewModel.externalCredentialTypes.observe(viewLifecycleOwner) { externalCredentialTypes ->
             updateSelectedCredentialType(null)
             fillRecyclerView(externalCredentialTypes)
             initViews(externalCredentialTypes)
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModel.kt
deleted file mode 100644
index e55d9da033..0000000000
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModel.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.simprints.feature.externalcredential.screens.select
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.simprints.core.domain.externalcredential.ExternalCredentialType
-import com.simprints.infra.config.sync.ConfigManager
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-internal class ExternalCredentialSelectViewModel @Inject internal constructor(
-    private val configManager: ConfigManager,
-) : ViewModel() {
-    val externalCredentialTypes: LiveData<List<ExternalCredentialType>>
-        get() = _externalCredentialTypes
-    private val _externalCredentialTypes = MutableLiveData<List<ExternalCredentialType>>()
-
-    fun loadExternalCredentials() {
-        viewModelScope.launch {
-            val config = configManager.getProjectConfiguration()
-            val allowedExternalCredentials = config.multifactorId?.allowedExternalCredentials.orEmpty()
-            _externalCredentialTypes.postValue(allowedExternalCredentials)
-        }
-    }
-}
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt
index d6f73c5f31..a91e985aed 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt
@@ -1,8 +1,94 @@
 package com.simprints.feature.externalcredential.screens.skip
 
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.isVisible
+import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.navigation.fragment.findNavController
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import com.simprints.feature.externalcredential.ExternalCredentialSearchResult
 import com.simprints.feature.externalcredential.R
+import com.simprints.feature.externalcredential.databinding.FragmentExternalCredentialSkipBinding
+import com.simprints.feature.externalcredential.ext.getCredentialTypeString
+import com.simprints.feature.externalcredential.screens.controller.ExternalCredentialViewModel
+import com.simprints.infra.uibase.viewbinding.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
+import com.simprints.infra.resources.R as IDR
 
 @AndroidEntryPoint
-class ExternalCredentialSkipFragment : Fragment(R.layout.fragment_external_credential_skip)
+class ExternalCredentialSkipFragment : Fragment(R.layout.fragment_external_credential_skip) {
+    private val binding by viewBinding(FragmentExternalCredentialSkipBinding::bind)
+    private val mainViewModel: ExternalCredentialViewModel by activityViewModels()
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initObservers()
+    }
+
+    private fun initObservers() {
+        mainViewModel.externalCredentialTypes.observe(viewLifecycleOwner) { credentialTypes ->
+            initViews(credentialTypes)
+            initListeners()
+        }
+    }
+
+    private fun initViews(credentialTypes: List<ExternalCredentialType>) = with(binding) {
+        val dynamicTextReasonItemMap =
+            mapOf(
+                title to IDR.string.mfid_skip_title,
+                skipReasonDoesNotHaveDocument to IDR.string.mfid_skip_reason_does_not_have,
+                skipReasonDidNotBring to IDR.string.mfid_skip_reason_did_not_bring,
+                skipReasonIncorrect to IDR.string.mfid_skip_reason_incorrect,
+                skipReasonDoesNotWantToProvide to IDR.string.mfid_skip_reason_does_not_want_to_provide,
+                skipReasonDamaged to IDR.string.mfid_skip_reason_damaged,
+                skipReasonUnableToScan to IDR.string.mfid_skip_reason_unable_to_scan,
+            )
+        dynamicTextReasonItemMap.forEach { entry ->
+            val textView = entry.key
+            val stringRes = entry.value
+            val credentialText = when (credentialTypes.size) {
+                1 -> resources.getCredentialTypeString(credentialTypes.first())
+                else -> getString(IDR.string.mfid_type_any_document)
+            }
+            textView.text = getString(stringRes, credentialText)
+        }
+    }
+
+    private fun initListeners() = with(binding) {
+        skipCredentialScanRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+            reasonTextInputLayout.isVisible = checkedId == R.id.skipReasonOther
+
+            val isSkipButtonEnabled = when (checkedId) {
+                R.id.skipReasonOther -> {
+                    reasonTextInput.text.toString().isNotEmpty()
+                }
+
+                else -> true
+            }
+            buttonSkip.isEnabled = isSkipButtonEnabled
+        }
+        reasonTextInput.addTextChangedListener(
+            afterTextChanged = {
+                buttonSkip.isEnabled = it.toString().isNotEmpty()
+            },
+        )
+        buttonGoBack.setOnClickListener {
+            findNavController().popBackStack()
+        }
+        buttonSkip.setOnClickListener {
+            mainViewModel.finish(
+                ExternalCredentialSearchResult(
+                    flowType = mainViewModel.params.flowType,
+                    scannedCredential = null,
+                    matchResults = emptyList(),
+                ),
+            )
+        }
+    }
+}
diff --git a/feature/external-credential/src/main/res/layout/fragment_external_credential_skip.xml b/feature/external-credential/src/main/res/layout/fragment_external_credential_skip.xml
index 1860c12b36..25d8233497 100644
--- a/feature/external-credential/src/main/res/layout/fragment_external_credential_skip.xml
+++ b/feature/external-credential/src/main/res/layout/fragment_external_credential_skip.xml
@@ -1,12 +1,156 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <!--TODO [MS-1127] add content-->
+    android:layout_height="match_parent"
+    android:background="@color/simprints_blue">
+
+
     <TextView
-        android:text="Skip Credential scan"
+        android:id="@+id/title"
+        style="@style/Text.Headline5.White"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:gravity="center"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:padding="@dimen/padding_default"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Why did you skip the document scan?" />
+
+    <ScrollView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:paddingHorizontal="6dp"
+        app:layout_constraintBottom_toTopOf="@+id/buttonGoBack"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title">
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="true"
+            android:theme="@style/Theme.Simprints"
+            app:cardCornerRadius="8dp"
+            app:cardElevation="4dp"
+            app:cardUseCompatPadding="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingHorizontal="@dimen/margin_default"
+                android:paddingVertical="@dimen/margin_large">
+
+
+                <RadioGroup
+                    android:id="@+id/skipCredentialScanRadioGroup"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/skipReasonDoesNotHaveDocument"
+                        style="@style/Widget.Simprints.RadioButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        tools:text="Does not have document" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/skipReasonDidNotBring"
+                        style="@style/Widget.Simprints.RadioButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        tools:text="Did not bring document" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/skipReasonIncorrect"
+                        style="@style/Widget.Simprints.RadioButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        tools:text="Brought incorrect document" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/skipReasonDoesNotWantToProvide"
+                        style="@style/Widget.Simprints.RadioButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        tools:text="Does not want to provide document" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/skipReasonDamaged"
+                        style="@style/Widget.Simprints.RadioButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        tools:text="Document damaged or unreadable" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/skipReasonUnableToScan"
+                        style="@style/Widget.Simprints.RadioButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        tools:text="Unable to scan document" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/skipReasonOther"
+                        style="@style/Widget.Simprints.RadioButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/mfid_skip_reason_other" />
+                </RadioGroup>
+
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/reasonTextInputLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/mfid_skip_reason_hint"
+                    android:visibility="gone"
+                    app:helperText="@string/mfid_skip_reason_helper_text"
+                    app:helperTextTextColor="@color/simprints_grey"
+                    app:hintTextColor="@color/simprints_grey"
+                    tools:visibility="visible">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/reasonTextInput"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="textMultiLine"
+                        android:maxLength="100"
+                        android:maxLines="4" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+    </ScrollView>
+
+    <Button
+        android:id="@+id/buttonGoBack"
+        style="@style/Widget.Simprints.Button.White"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/padding_default"
+        android:layout_marginBottom="@dimen/padding_default"
+        android:text="@string/mfid_skip_go_back"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/buttonSkip"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/buttonSkip"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_large"
+        android:layout_marginEnd="@dimen/padding_default"
+        android:layout_marginBottom="@dimen/padding_default"
+        android:enabled="false"
+        android:text="@string/mfid_skip_confirm"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/buttonGoBack" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/infra/resources/src/main/res/values/strings.xml b/infra/resources/src/main/res/values/strings.xml
index 8609d13fe0..478e2ff150 100644
--- a/infra/resources/src/main/res/values/strings.xml
+++ b/infra/resources/src/main/res/values/strings.xml
@@ -527,7 +527,18 @@
     <string name="mfid_search_not_found_identification">No record is found with this %1$s. You wil be able to link this %2$s to a patient later</string>
 
     <string name="mfid_add_document_title">Add this %1$s?</string>
-
+    <string name="mfid_skip_title">Why did you skip the %1$s scan?</string>
+    <string name="mfid_skip_reason_does_not_have">Does not have %1$s</string>
+    <string name="mfid_skip_reason_did_not_bring">Did not bring %1$s</string>
+    <string name="mfid_skip_reason_incorrect">Brought incorrect %1$s</string>
+    <string name="mfid_skip_reason_does_not_want_to_provide">Does not want to priovide %1$s</string>
+    <string name="mfid_skip_reason_damaged">%1$s damaged or unreadable</string>
+    <string name="mfid_skip_reason_unable_to_scan">Unable to scan %1$s</string>
+    <string name="mfid_skip_reason_other">Other</string>
+    <string name="mfid_skip_reason_hint">Reason</string>
+    <string name="mfid_skip_reason_helper_text">Please provide a reason for skipping</string>
+    <string name="mfid_skip_confirm">Skip Scanning</string>
+    <string name="mfid_skip_go_back">Go Back</string>
 
 
 </resources>

From 8642b580d7c38d7f6dc65bf9530e1663cb2ffead Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Thu, 9 Oct 2025 07:48:53 +0300
Subject: [PATCH 2/6] [MS-1166] Adding analytical reminder comment

---
 .../screens/skip/ExternalCredentialSkipFragment.kt              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt
index a91e985aed..edec286386 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt
@@ -81,6 +81,8 @@ class ExternalCredentialSkipFragment : Fragment(R.layout.fragment_external_crede
         buttonGoBack.setOnClickListener {
             findNavController().popBackStack()
         }
+
+        // [MS-1166] We should log skip reasons in analytics.
         buttonSkip.setOnClickListener {
             mainViewModel.finish(
                 ExternalCredentialSearchResult(

From 261bec8dda41e8945681de64abeb7779c8f89894 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Thu, 9 Oct 2025 09:16:34 +0300
Subject: [PATCH 3/6] [MS-1189] Adding MFID-specific consent text

---
 .../screens/consent/ConsentViewModel.kt       | 15 +++---
 .../helpers/GeneralConsentTextHelper.kt       | 49 +++++++++++++++++--
 .../helpers/ParentalConsentTextHelper.kt      | 48 ++++++++++++++++--
 .../resources/src/main/res/values/strings.xml |  6 +++
 4 files changed, 106 insertions(+), 12 deletions(-)

diff --git a/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/ConsentViewModel.kt b/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/ConsentViewModel.kt
index 8f8606c54c..0affc90d14 100644
--- a/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/ConsentViewModel.kt
+++ b/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/ConsentViewModel.kt
@@ -82,20 +82,23 @@ internal class ConsentViewModel @Inject constructor(
         selectedTabIndex: Int,
     ): ConsentViewState {
         val allowParentalConsent = projectConfig.consent.allowParentalConsent
+        val isMultiFactorIdEnabled = projectConfig.multifactorId?.allowedExternalCredentials?.isNotEmpty() ?: false
 
         return ConsentViewState(
             showLogo = projectConfig.consent.displaySimprintsLogo,
             showParentalConsent = allowParentalConsent,
             consentTextBuilder = GeneralConsentTextHelper(
-                projectConfig.consent,
-                projectConfig.general.modalities,
-                consentType,
+                config = projectConfig.consent,
+                modalities = projectConfig.general.modalities,
+                consentType = consentType,
+                isMultiFactorIdEnabled = isMultiFactorIdEnabled,
             ),
             parentalTextBuilder = if (allowParentalConsent) {
                 ParentalConsentTextHelper(
-                    projectConfig.consent,
-                    projectConfig.general.modalities,
-                    consentType,
+                    config = projectConfig.consent,
+                    modalities = projectConfig.general.modalities,
+                    consentType = consentType,
+                    isMultiFactorIdEnabled = isMultiFactorIdEnabled,
                 )
             } else {
                 null
diff --git a/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/GeneralConsentTextHelper.kt b/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/GeneralConsentTextHelper.kt
index 6fcb535638..257ce7f42b 100644
--- a/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/GeneralConsentTextHelper.kt
+++ b/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/GeneralConsentTextHelper.kt
@@ -10,6 +10,7 @@ internal data class GeneralConsentTextHelper(
     private val config: ConsentConfiguration,
     private val modalities: List<Modality>,
     private val consentType: ConsentType,
+    private val isMultiFactorIdEnabled: Boolean,
 ) {
     // TODO All the `getString(id).format(arg,arg)` calls should be `getString(id,arg,arg)` one strings are fixed
 
@@ -17,10 +18,14 @@ internal data class GeneralConsentTextHelper(
     fun assembleText(context: Context) = StringBuilder()
         .apply {
             val modalityUseCase = getModalitySpecificUseCaseText(context, modalities)
-            val modalityAccess = getModalitySpecificAccessText(context, modalities)
+            val modalityAccess =
+                getModalitySpecificAccessText(context, modalities) + getMultiFactorIdAccessText(context, isMultiFactorIdEnabled)
 
-            filterAppRequestForConsent(context, consentType, config, modalityUseCase)
-            filterForDataSharingOptions(context, config, modalityUseCase, modalityAccess)
+            val requestModalityUseCase = modalityUseCase + getMultiFactorIdUseCaseText(context, isMultiFactorIdEnabled)
+            val dataSharingModalityUseCase = modalityUseCase + getMultiFactorIdSharingText(context, isMultiFactorIdEnabled)
+
+            filterAppRequestForConsent(context, consentType, config, requestModalityUseCase)
+            filterForDataSharingOptions(context, config, dataSharingModalityUseCase, modalityAccess)
         }.toString()
 
     private fun StringBuilder.filterAppRequestForConsent(
@@ -134,4 +139,42 @@ internal data class GeneralConsentTextHelper(
         Modality.FACE -> context.getString(R.string.consent_biometrics_access_face)
         Modality.FINGERPRINT -> context.getString(R.string.consent_biometrics_access_fingerprint)
     }
+
+    private fun getMultiFactorIdUseCaseText(
+        context: Context,
+        isMultiFactorIdEnabled: Boolean,
+    ): String = if (isMultiFactorIdEnabled) {
+        listOf(
+            ",",
+            context.getString(R.string.consent_biometric_concat_modalities),
+            context.getString(R.string.consent_credentials_general),
+        ).joinToString(separator = " ")
+    } else {
+        ""
+    }
+
+    private fun getMultiFactorIdAccessText(
+        context: Context,
+        isMultiFactorIdEnabled: Boolean,
+    ): String = if (isMultiFactorIdEnabled) {
+        listOf(
+            ",",
+            context.getString(R.string.consent_credentials_access),
+        ).joinToString(separator = " ")
+    } else {
+        ""
+    }
+
+    private fun getMultiFactorIdSharingText(
+        context: Context,
+        isMultiFactorIdEnabled: Boolean,
+    ): String = if (isMultiFactorIdEnabled) {
+        listOf(
+            ",",
+            context.getString(R.string.consent_biometric_concat_modalities),
+            context.getString(R.string.consent_credentials_your_id),
+        ).joinToString(separator = " ")
+    } else {
+        ""
+    }
 }
diff --git a/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/ParentalConsentTextHelper.kt b/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/ParentalConsentTextHelper.kt
index bf73ec7eb4..76514c03ad 100644
--- a/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/ParentalConsentTextHelper.kt
+++ b/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/ParentalConsentTextHelper.kt
@@ -10,6 +10,7 @@ internal data class ParentalConsentTextHelper(
     private val config: ConsentConfiguration,
     private val modalities: List<Modality>,
     private val consentType: ConsentType,
+    private val isMultiFactorIdEnabled: Boolean,
 ) {
     // TODO All the `getString(id).format(arg,arg)` calls should be `getString(id,arg,arg)` one strings are fixed
 
@@ -17,10 +18,13 @@ internal data class ParentalConsentTextHelper(
     fun assembleText(context: Context): String = StringBuilder()
         .apply {
             val modalityUseCase = getModalitySpecificUseCaseText(context, modalities)
-            val modalityAccess = getModalitySpecificAccessText(context, modalities)
+            val modalityAccess =
+                getModalitySpecificAccessText(context, modalities) + getMultiFactorIdAccessText(context, isMultiFactorIdEnabled)
 
-            filterAppRequestForParentalConsent(context, consentType, config, modalityUseCase)
-            extractDataSharingOptions(context, config, modalityUseCase, modalityAccess)
+            val requestModalityUseCase = modalityUseCase + getMultiFactorIdUseCaseText(context, isMultiFactorIdEnabled)
+            val dataSharingModalityUseCase = modalityUseCase + getMultiFactorIdSharingText(context, isMultiFactorIdEnabled)
+            filterAppRequestForParentalConsent(context, consentType, config, requestModalityUseCase)
+            extractDataSharingOptions(context, config, dataSharingModalityUseCase, modalityAccess)
         }.toString()
 
     private fun StringBuilder.filterAppRequestForParentalConsent(
@@ -136,4 +140,42 @@ internal data class ParentalConsentTextHelper(
         Modality.FINGERPRINT -> context.getString(R.string.consent_biometrics_access_fingerprint)
         else -> ""
     }
+
+    private fun getMultiFactorIdAccessText(
+        context: Context,
+        isMultiFactorIdEnabled: Boolean,
+    ): String = if (isMultiFactorIdEnabled) {
+        listOf(
+            ",",
+            context.getString(R.string.consent_credentials_parental_access),
+        ).joinToString(separator = " ")
+    } else {
+        ""
+    }
+
+    private fun getMultiFactorIdUseCaseText(
+        context: Context,
+        isMultiFactorIdEnabled: Boolean,
+    ): String = if (isMultiFactorIdEnabled) {
+        listOf(
+            ",",
+            context.getString(R.string.consent_biometric_concat_modalities),
+            context.getString(R.string.consent_credentials_parental_general),
+        ).joinToString(separator = " ")
+    } else {
+        ""
+    }
+
+    private fun getMultiFactorIdSharingText(
+        context: Context,
+        isMultiFactorIdEnabled: Boolean,
+    ): String = if (isMultiFactorIdEnabled) {
+        listOf(
+            ",",
+            context.getString(R.string.consent_biometric_concat_modalities),
+            context.getString(R.string.consent_credentials_parental_your_id),
+        ).joinToString(separator = " ")
+    } else {
+        ""
+    }
 }
diff --git a/infra/resources/src/main/res/values/strings.xml b/infra/resources/src/main/res/values/strings.xml
index 8609d13fe0..e6031e4bed 100644
--- a/infra/resources/src/main/res/values/strings.xml
+++ b/infra/resources/src/main/res/values/strings.xml
@@ -29,9 +29,15 @@
     <string name="consent_biometric_general_face">take photographs of your face</string>
     <string name="consent_biometrics_access_fingerprint">fingerprint information</string>
     <string name="consent_biometrics_access_face">photographs</string>
+    <string name="consent_credentials_general">scan your national ID document or other external credentials with their unique number(s)</string>
+    <string name="consent_credentials_access">national ID details</string>
+    <string name="consent_credentials_your_id">capture your national ID or other external credential information</string>
     <string name="consent_biometrics_access_fingerprint_face">fingerprint information, photographs</string>
     <string name="consent_biometrics_parental_fingerprint">use your child\'s fingerprints</string>
     <string name="consent_biometrics_parental_face">take photographs of your child\'s face</string>
+    <string name="consent_credentials_parental_general">scan your child\'s national ID document or other external credentials with their unique number(s)</string>
+    <string name="consent_credentials_parental_access">child\'s national ID details</string>
+    <string name="consent_credentials_parental_your_id">capture your child\'s national ID or other external credential information</string>
     <string name="consent_biometric_concat_modalities">and</string>
     <string name="consent_decline_button">Decline</string>
     <string name="consent_accept_button">Accept</string>

From 927f18d904ee4f400cc5d257c78d0f418b477913 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Wed, 15 Oct 2025 17:52:36 +0300
Subject: [PATCH 4/6] [MS-1166] Removing old tests, updating existing tests of
 ExternalCredentialViewModelTest.kt

---
 .../ExternalCredentialViewModelTest.kt        | 43 +++++++++++-
 .../ExternalCredentialSelectViewModelTest.kt  | 65 -------------------
 2 files changed, 42 insertions(+), 66 deletions(-)
 delete mode 100644 feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModelTest.kt

diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModelTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModelTest.kt
index 572bb5a34a..6bb1ac635d 100644
--- a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModelTest.kt
+++ b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModelTest.kt
@@ -7,7 +7,14 @@ import com.simprints.core.domain.common.FlowType
 import com.simprints.core.domain.externalcredential.ExternalCredentialType
 import com.simprints.feature.externalcredential.ExternalCredentialSearchResult
 import com.simprints.feature.externalcredential.model.ExternalCredentialParams
+import com.simprints.infra.config.sync.ConfigManager
+import com.simprints.testtools.common.coroutines.TestCoroutineRule
+import io.mockk.MockKAnnotations
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
 import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -16,11 +23,17 @@ internal class ExternalCredentialViewModelTest {
     @get:Rule
     val rule = InstantTaskExecutorRule()
 
+    @get:Rule
+    val testCoroutineRule = TestCoroutineRule()
+
+    @MockK
+    private lateinit var configManager: ConfigManager
     private lateinit var viewModel: ExternalCredentialViewModel
 
     @Before
     fun setUp() {
-        viewModel = ExternalCredentialViewModel()
+        MockKAnnotations.init(this, relaxed = true)
+        viewModel = ExternalCredentialViewModel(configManager = configManager)
     }
 
     @Test
@@ -83,6 +96,34 @@ internal class ExternalCredentialViewModelTest {
         assertThat(observer.value()?.peekContent()).isEqualTo(mockResult)
     }
 
+    @Test
+    fun `init block loads allowed external credentials from config`() = runTest {
+        val allowedCredentials = listOf(
+            ExternalCredentialType.NHISCard,
+            ExternalCredentialType.GhanaIdCard,
+        )
+        setupProjectConfig(allowedCredentials = allowedCredentials)
+        val viewModel = ExternalCredentialViewModel(configManager = configManager)
+        val observer = viewModel.externalCredentialTypes.test()
+        assertThat(observer.value()).isEqualTo(allowedCredentials)
+    }
+
+    @Test
+    fun `init block sets empty list if no allowed credentials configured`() = runTest {
+        setupProjectConfig(allowedCredentials = emptyList())
+        val viewModel = ExternalCredentialViewModel(configManager = configManager)
+        val observer = viewModel.externalCredentialTypes.test()
+        assertThat(observer.value()).isEmpty()
+    }
+
+    private fun setupProjectConfig(allowedCredentials: List<ExternalCredentialType>) {
+        coEvery { configManager.getProjectConfiguration() } returns mockk {
+            every { multifactorId } returns mockk {
+                every { allowedExternalCredentials } returns allowedCredentials
+            }
+        }
+    }
+
     private fun createParams(
         subjectId: String,
         flowType: FlowType,
diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModelTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModelTest.kt
deleted file mode 100644
index af188d8863..0000000000
--- a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModelTest.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.simprints.feature.externalcredential.screens.select
-
-import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.google.common.truth.Truth.*
-import com.jraska.livedata.test
-import com.simprints.core.domain.externalcredential.ExternalCredentialType
-import com.simprints.infra.config.sync.ConfigManager
-import com.simprints.testtools.common.coroutines.TestCoroutineRule
-import io.mockk.*
-import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-
-class ExternalCredentialSelectViewModelTest {
-    @get:Rule
-    val rule = InstantTaskExecutorRule()
-
-    @get:Rule
-    val testCoroutineRule = TestCoroutineRule()
-
-    @MockK
-    private lateinit var configManager: ConfigManager
-
-    private lateinit var viewModel: ExternalCredentialSelectViewModel
-
-    @Before
-    fun setUp() {
-        MockKAnnotations.init(this, relaxed = true)
-        viewModel = ExternalCredentialSelectViewModel(configManager)
-    }
-
-    @Test
-    fun `loads allowed external credentials`() = runTest {
-        val expected = listOf(
-            ExternalCredentialType.NHISCard,
-            ExternalCredentialType.GhanaIdCard,
-        )
-        coEvery { configManager.getProjectConfiguration() } returns mockk {
-            every { multifactorId } returns mockk {
-                every { allowedExternalCredentials } returns expected
-            }
-        }
-
-        val observer = viewModel.externalCredentialTypes.test()
-        viewModel.loadExternalCredentials()
-
-        assertThat(observer.value()).isEqualTo(expected)
-    }
-
-    @Test
-    fun `sets empty list if no allowed credentials`() = runTest {
-        coEvery { configManager.getProjectConfiguration() } returns mockk {
-            every { multifactorId } returns mockk {
-                every { allowedExternalCredentials } returns emptyList()
-            }
-        }
-
-        val observer = viewModel.externalCredentialTypes.test()
-        viewModel.loadExternalCredentials()
-
-        assertThat(observer.value()).isEmpty()
-    }
-}

From 5d1e59e803ab2d51c051221781cdae596a4599bd Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Wed, 15 Oct 2025 18:24:42 +0300
Subject: [PATCH 5/6] [MS-1189] Adding test coverage for updated MFID consent
 wording

---
 .../helpers/GeneralConsentTextHelperTest.kt   | 92 +++++++++++++++++++
 .../helpers/ParentalConsentTextHelperTest.kt  | 80 ++++++++++++++++
 2 files changed, 172 insertions(+)

diff --git a/feature/consent/src/test/java/com/simprints/feature/consent/screens/consent/helpers/GeneralConsentTextHelperTest.kt b/feature/consent/src/test/java/com/simprints/feature/consent/screens/consent/helpers/GeneralConsentTextHelperTest.kt
index 985d9c4087..cda8dba7b1 100644
--- a/feature/consent/src/test/java/com/simprints/feature/consent/screens/consent/helpers/GeneralConsentTextHelperTest.kt
+++ b/feature/consent/src/test/java/com/simprints/feature/consent/screens/consent/helpers/GeneralConsentTextHelperTest.kt
@@ -40,6 +40,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.ENROL,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -63,6 +64,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT, GeneralConfiguration.Modality.FACE),
             ConsentType.ENROL,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -86,6 +88,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FACE),
             ConsentType.ENROL,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -109,6 +112,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT, GeneralConfiguration.Modality.FACE),
             ConsentType.ENROL,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -132,6 +136,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.VERIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -155,6 +160,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -178,6 +184,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT, GeneralConfiguration.Modality.FACE),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -201,6 +208,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -225,6 +233,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FACE),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -249,6 +258,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT, GeneralConfiguration.Modality.FACE),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -273,6 +283,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -296,6 +307,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -318,6 +330,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -340,6 +353,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -362,6 +376,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -384,6 +399,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -407,6 +423,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -429,6 +446,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         assertThat(generalConsentText).doesNotContainMatch("\\.\\w")
@@ -448,6 +466,7 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         assertThat(generalConsentText).doesNotContainMatch("^\\s.*")
@@ -467,11 +486,84 @@ class GeneralConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         assertThat(generalConsentText).doesNotContain("  ")
     }
 
+    @Test
+    fun `should add multi-factor ID use case text when isMultiFactorIdEnabled is true`() {
+        val generalConsentText = GeneralConsentTextHelper(
+            configWithPrompt(
+                ConsentConfiguration.ConsentPromptConfiguration(
+                    enrolmentVariant = ConsentConfiguration.ConsentEnrolmentVariant.STANDARD,
+                    dataSharedWithPartner = false,
+                    dataUsedForRAndD = false,
+                    privacyRights = false,
+                    confirmation = false,
+                ),
+            ),
+            listOf(GeneralConfiguration.Modality.FINGERPRINT),
+            ConsentType.ENROL,
+            isMultiFactorIdEnabled = true,
+        ).assembleText(context)
+
+        val expectedText = String.format(
+            ", %s %s",
+            context.getString(R.string.consent_biometric_concat_modalities),
+            context.getString(R.string.consent_credentials_general),
+        )
+
+        assertThat(generalConsentText).contains(expectedText)
+    }
+
+    @Test
+    fun `should add multi-factor ID sharing text when isMultiFactorIdEnabled is true`() {
+        val generalConsentText = GeneralConsentTextHelper(
+            configWithPrompt(
+                ConsentConfiguration.ConsentPromptConfiguration(
+                    enrolmentVariant = ConsentConfiguration.ConsentEnrolmentVariant.STANDARD,
+                    dataSharedWithPartner = true,
+                    dataUsedForRAndD = false,
+                    privacyRights = false,
+                    confirmation = false,
+                ),
+            ),
+            listOf(GeneralConfiguration.Modality.FINGERPRINT),
+            ConsentType.IDENTIFY,
+            isMultiFactorIdEnabled = true,
+        ).assembleText(context)
+
+        // Just check for the key identifying phrase from the credentials text
+        assertThat(generalConsentText).contains("national ID document or other external credentials")
+    }
+
+    @Test
+    fun `should add multi-factor ID access text when isMultiFactorIdEnabled is true`() {
+        val generalConsentText = GeneralConsentTextHelper(
+            configWithPrompt(
+                ConsentConfiguration.ConsentPromptConfiguration(
+                    enrolmentVariant = ConsentConfiguration.ConsentEnrolmentVariant.STANDARD,
+                    dataSharedWithPartner = false,
+                    dataUsedForRAndD = false,
+                    privacyRights = false,
+                    confirmation = false,
+                ),
+            ),
+            listOf(GeneralConfiguration.Modality.FINGERPRINT),
+            ConsentType.IDENTIFY,
+            isMultiFactorIdEnabled = true,
+        ).assembleText(context)
+
+        val expectedText = String.format(
+            ", %s",
+            context.getString(R.string.consent_credentials_access),
+        )
+
+        assertThat(generalConsentText).contains(expectedText)
+    }
+
     private fun configWithPrompt(prompt: ConsentConfiguration.ConsentPromptConfiguration) = ConsentConfiguration(
         programName = PROGRAM_NAME,
         organizationName = ORGANIZATION_NAME,
diff --git a/feature/consent/src/test/java/com/simprints/feature/consent/screens/consent/helpers/ParentalConsentTextHelperTest.kt b/feature/consent/src/test/java/com/simprints/feature/consent/screens/consent/helpers/ParentalConsentTextHelperTest.kt
index 7fe9694c79..542eae823a 100644
--- a/feature/consent/src/test/java/com/simprints/feature/consent/screens/consent/helpers/ParentalConsentTextHelperTest.kt
+++ b/feature/consent/src/test/java/com/simprints/feature/consent/screens/consent/helpers/ParentalConsentTextHelperTest.kt
@@ -40,6 +40,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.ENROL,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -63,6 +64,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT, GeneralConfiguration.Modality.FACE),
             ConsentType.ENROL,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -86,6 +88,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FACE),
             ConsentType.ENROL,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -109,6 +112,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT, GeneralConfiguration.Modality.FACE),
             ConsentType.ENROL,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -132,6 +136,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.VERIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -155,6 +160,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -178,6 +184,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT, GeneralConfiguration.Modality.FACE),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -201,6 +208,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -225,6 +233,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FACE),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -249,6 +258,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT, GeneralConfiguration.Modality.FACE),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -273,6 +283,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -296,6 +307,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -318,6 +330,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -340,6 +353,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -362,6 +376,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -384,6 +399,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -407,6 +423,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         val expectedString = context
@@ -429,6 +446,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         assertThat(parentalConsentText).doesNotContainMatch("\\.\\w")
@@ -448,6 +466,7 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         assertThat(parentalConsentText).doesNotContainMatch("^\\s.*")
@@ -467,11 +486,72 @@ class ParentalConsentTextHelperTest {
             ),
             listOf(GeneralConfiguration.Modality.FINGERPRINT),
             ConsentType.IDENTIFY,
+            false,
         ).assembleText(context)
 
         assertThat(parentalConsentText).doesNotContain("  ")
     }
 
+    @Test
+    fun `should add multi-factor ID use case text when isMultiFactorIdEnabled is true`() {
+        val parentalConsentText = ParentalConsentTextHelper(
+            configWithPrompt(
+                ConsentConfiguration.ConsentPromptConfiguration(
+                    enrolmentVariant = ConsentConfiguration.ConsentEnrolmentVariant.STANDARD,
+                    dataSharedWithPartner = false,
+                    dataUsedForRAndD = false,
+                    privacyRights = false,
+                    confirmation = false,
+                ),
+            ),
+            listOf(GeneralConfiguration.Modality.FINGERPRINT),
+            ConsentType.ENROL,
+            isMultiFactorIdEnabled = true,
+        ).assembleText(context)
+
+        assertThat(parentalConsentText).contains(context.getString(R.string.consent_credentials_parental_general))
+    }
+
+    @Test
+    fun `should add multi-factor ID access text when isMultiFactorIdEnabled is true`() {
+        val parentalConsentText = ParentalConsentTextHelper(
+            configWithPrompt(
+                ConsentConfiguration.ConsentPromptConfiguration(
+                    enrolmentVariant = ConsentConfiguration.ConsentEnrolmentVariant.STANDARD,
+                    dataSharedWithPartner = false,
+                    dataUsedForRAndD = false,
+                    privacyRights = false,
+                    confirmation = false,
+                ),
+            ),
+            listOf(GeneralConfiguration.Modality.FINGERPRINT),
+            ConsentType.IDENTIFY,
+            isMultiFactorIdEnabled = true,
+        ).assembleText(context)
+
+        assertThat(parentalConsentText).contains(context.getString(R.string.consent_credentials_parental_access))
+    }
+
+    @Test
+    fun `should add multi-factor ID sharing text when isMultiFactorIdEnabled is true`() {
+        val parentalConsentText = ParentalConsentTextHelper(
+            configWithPrompt(
+                ConsentConfiguration.ConsentPromptConfiguration(
+                    enrolmentVariant = ConsentConfiguration.ConsentEnrolmentVariant.STANDARD,
+                    dataSharedWithPartner = true,
+                    dataUsedForRAndD = false,
+                    privacyRights = false,
+                    confirmation = false,
+                ),
+            ),
+            listOf(GeneralConfiguration.Modality.FINGERPRINT),
+            ConsentType.IDENTIFY,
+            isMultiFactorIdEnabled = true,
+        ).assembleText(context)
+
+        assertThat(parentalConsentText).contains("child's national ID document or other external credentials")
+    }
+
     private fun configWithPrompt(prompt: ConsentConfiguration.ConsentPromptConfiguration) = ConsentConfiguration(
         programName = PROGRAM_NAME,
         organizationName = ORGANIZATION_NAME,

From b562fb689a1811ee7aeba03124ef663a31eb8373 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Mon, 20 Oct 2025 14:30:25 +0300
Subject: [PATCH 6/6] [MS-1189] Removing outdated comments

---
 .../consent/screens/consent/helpers/GeneralConsentTextHelper.kt  | 1 -
 .../consent/screens/consent/helpers/ParentalConsentTextHelper.kt | 1 -
 2 files changed, 2 deletions(-)

diff --git a/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/GeneralConsentTextHelper.kt b/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/GeneralConsentTextHelper.kt
index 257ce7f42b..c8e234d80e 100644
--- a/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/GeneralConsentTextHelper.kt
+++ b/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/GeneralConsentTextHelper.kt
@@ -14,7 +14,6 @@ internal data class GeneralConsentTextHelper(
 ) {
     // TODO All the `getString(id).format(arg,arg)` calls should be `getString(id,arg,arg)` one strings are fixed
 
-    // First argument in consent text should always be program name, second is modality specific access/use case text
     fun assembleText(context: Context) = StringBuilder()
         .apply {
             val modalityUseCase = getModalitySpecificUseCaseText(context, modalities)
diff --git a/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/ParentalConsentTextHelper.kt b/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/ParentalConsentTextHelper.kt
index 76514c03ad..66ae44a2f7 100644
--- a/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/ParentalConsentTextHelper.kt
+++ b/feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/ParentalConsentTextHelper.kt
@@ -14,7 +14,6 @@ internal data class ParentalConsentTextHelper(
 ) {
     // TODO All the `getString(id).format(arg,arg)` calls should be `getString(id,arg,arg)` one strings are fixed
 
-    // First argument in consent text should always be program name, second is modality specific access/use case text
     fun assembleText(context: Context): String = StringBuilder()
         .apply {
             val modalityUseCase = getModalitySpecificUseCaseText(context, modalities)