From 3d65653aadf66db8522d13df0489e507c4ed318c Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Tue, 7 Oct 2025 12:57:57 +0300
Subject: [PATCH 1/9] =?UTF-8?q?[MS-1170]=20MF-ID:=20Initial=20implementati?=
 =?UTF-8?q?on=20of=20the=20'Confirm=20Identity'=20flow=20with=20ability=20?=
 =?UTF-8?q?to=20add=20external=20credential=CB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../externalcredential/ext/ResourceExt.kt     |  18 ++-
 .../feature/externalcredential/ext/ViewExt.kt |  50 -------
 .../externalcredential/model/BoundingBox.kt   |   4 +-
 .../model/CredentialMatch.kt                  |   2 +-
 .../ExternalCredentialControllerFragment.kt   |   9 +-
 .../controller/ExternalCredentialViewModel.kt |  15 --
 .../ExternalCredentialScanOcrFragment.kt      |  24 ++--
 .../ExternalCredentialScanOcrViewModel.kt     |  41 +++---
 .../ExternalCredentialScanQrFragment.kt       |  22 +--
 .../ExternalCredentialScanQrViewModel.kt      |   1 -
 .../ExternalCredentialSearchFragment.kt       |  39 ++---
 .../ExternalCredentialSearchViewModel.kt      |  47 +++---
 .../screens/search/model/ScannedCredential.kt |  11 +-
 .../ExternalCredentialSelectFragment.kt       |   5 +-
 .../view/ScannedCredentialDialog.kt           | 135 ++++++++++++++++++
 .../res/layout/dialog_scanned_credential.xml  |  95 ++++++++++++
 .../main/res/layout/item_scanned_image.xml    |  24 ++++
 .../externalcredential/ext/ResourceExtTest.kt |  44 ++++++
 .../ExternalCredentialViewModelTest.kt        |  19 +--
 .../search/model/ScannedCredentialTest.kt     |  35 +++++
 .../orchestrator/OrchestratorViewModel.kt     |  16 ++-
 .../feature/orchestrator/steps/Step.kt        |   1 +
 .../response/CreateEnrolResponseUseCase.kt    |  13 +-
 .../response/CreateIdentifyResponseUseCase.kt |  87 ++++++-----
 .../usecases/steps/BuildStepsUseCase.kt       |  27 ++--
 .../orchestrator/OrchestratorViewModelTest.kt |  75 +++++++---
 ...reateConfirmIdentityResponseUseCaseTest.kt |   2 +-
 .../CreateEnrolResponseUseCaseTest.kt         |  12 +-
 .../CreateIdentifyResponseUseCaseTest.kt      | 106 +++++++-------
 .../usecases/steps/BuildStepsUseCaseTest.kt   |  93 ++++++++----
 feature/select-subject/build.gradle.kts       |   4 +
 .../selectsubject/SelectSubjectContract.kt    |   5 +-
 .../selectsubject/SelectSubjectParams.kt      |   2 +
 .../selectsubject/SelectSubjectResult.kt      |   4 +-
 .../selectsubject/model/SelectSubjectState.kt |  23 +++
 .../screen/SelectSubjectFragment.kt           | 110 +++++++++++++-
 .../screen/SelectSubjectViewModel.kt          | 106 ++++++++++++--
 .../AddExternalCredentialToSubjectUseCase.kt  |  27 ++++
 .../main/res/drawable/rounded_image_bg.xml    |   4 +
 .../res/layout/fragment_select_subject.xml    |  96 +++++++++----
 .../store/models/ProjectConfiguration.kt      |  11 +-
 .../store/models/ProjectConfigurationTest.kt  |  16 ++-
 .../ExternalCredentialType.kt                 |   4 +-
 .../RoomEnrolmentRecordLocalDataSource.kt     |   3 +-
 .../RoomEnrolmentRecordLocalDataSourceTest.kt |  50 +++++--
 .../resources/src/main/res/values/strings.xml |   4 +
 .../src/main/res/values/styles-text.xml       |   9 ++
 .../simprints/infra/uibase/view/View.ext.kt   |  46 ++++++
 48 files changed, 1181 insertions(+), 415 deletions(-)
 delete mode 100644 feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ext/ViewExt.kt
 create mode 100644 feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt
 create mode 100644 feature/external-credential/src/main/res/layout/dialog_scanned_credential.xml
 create mode 100644 feature/external-credential/src/main/res/layout/item_scanned_image.xml
 create mode 100644 feature/external-credential/src/test/java/com/simprints/feature/externalcredential/ext/ResourceExtTest.kt
 create mode 100644 feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/search/model/ScannedCredentialTest.kt
 create mode 100644 feature/select-subject/src/main/java/com/simprints/feature/selectsubject/model/SelectSubjectState.kt
 create mode 100644 feature/select-subject/src/main/java/com/simprints/feature/selectsubject/usecase/AddExternalCredentialToSubjectUseCase.kt
 create mode 100644 feature/select-subject/src/main/res/drawable/rounded_image_bg.xml

diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ext/ResourceExt.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ext/ResourceExt.kt
index acaa6ed77f..fe00b7ee70 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ext/ResourceExt.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ext/ResourceExt.kt
@@ -4,6 +4,7 @@ import android.content.res.Resources
 import androidx.annotation.PluralsRes
 import androidx.annotation.StringRes
 import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import com.simprints.infra.resources.R as IDR
 
 fun Resources.getQuantityCredentialString(
     @PluralsRes id: Int,
@@ -20,6 +21,21 @@ fun Resources.getQuantityCredentialString(
     return getQuantityString(
         id,
         credentialsAmount,
-        getString(documentTypeRes)
+        getString(documentTypeRes),
     )
 }
+
+fun Resources.getCredentialFieldTitle(type: ExternalCredentialType): String = when (type) {
+    ExternalCredentialType.NHISCard -> IDR.string.mfid_nhis_card_credential_field
+    ExternalCredentialType.GhanaIdCard -> IDR.string.mfid_ghana_id_credential_field
+    ExternalCredentialType.QRCode -> IDR.string.mfid_qr_credential_field
+}.run(::getString)
+
+fun Resources.getCredentialTypeString(type: ExternalCredentialType?): String = getCredentialTypeRes(type).run(::getString)
+
+fun Resources.getCredentialTypeRes(type: ExternalCredentialType?): Int = when (type) {
+    ExternalCredentialType.NHISCard -> IDR.string.mfid_type_nhis_card
+    ExternalCredentialType.GhanaIdCard -> IDR.string.mfid_type_ghana_id_card
+    ExternalCredentialType.QRCode -> IDR.string.mfid_type_qr_code
+    null -> IDR.string.mfid_type_any_document
+}
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ext/ViewExt.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ext/ViewExt.kt
deleted file mode 100644
index a801914d63..0000000000
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ext/ViewExt.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.simprints.feature.externalcredential.ext
-
-import android.view.View
-import android.view.ViewPropertyAnimator
-import android.view.animation.AccelerateInterpolator
-import android.view.animation.DecelerateInterpolator
-import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import com.simprints.infra.uibase.annotations.ExcludedFromGeneratedTestCoverageReports
-
-@ExcludedFromGeneratedTestCoverageReports("View animation")
-fun View.animateOut(
-    duration: Long,
-    scaleX: Boolean,
-    fragment: Fragment,
-): ViewPropertyAnimator {
-    return animate()
-        .alpha(0f)
-        .setDuration(duration)
-        .setInterpolator(DecelerateInterpolator())
-        .withEndAction {
-            if (fragment.isAdded) {
-                this.isVisible = false
-            }
-        }.also {
-            if (scaleX) {
-                it.scaleX(0f)
-            }
-            it.start()
-        }
-}
-
-@ExcludedFromGeneratedTestCoverageReports("View animation")
-fun View.animateIn(
-    duration: Long,
-    onComplete: (() -> Unit)?,
-    fragment: Fragment,
-): ViewPropertyAnimator {
-    return animate()
-        .alpha(1f)
-        .setInterpolator(AccelerateInterpolator())
-        .setDuration(duration)
-        .withEndAction {
-            if (fragment.isAdded) {
-                this.isVisible = true
-                onComplete?.invoke()
-            }
-        }
-        .also { it.start() }
-}
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/model/BoundingBox.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/model/BoundingBox.kt
index f8ad0e13d7..d0d622dba3 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/model/BoundingBox.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/model/BoundingBox.kt
@@ -16,6 +16,6 @@ data class BoundingBox(
     val bottom: Int,
 ) : Serializable
 
-internal fun Rect.toBoundingBox(): BoundingBox = BoundingBox(left, top, right, bottom)
+fun Rect.toBoundingBox(): BoundingBox = BoundingBox(left, top, right, bottom)
 
-internal fun BoundingBox.toRect(): Rect = Rect(left, top, right, bottom)
+fun BoundingBox.toRect(): Rect = Rect(left, top, right, bottom)
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/model/CredentialMatch.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/model/CredentialMatch.kt
index 94d40d09fe..a628729173 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/model/CredentialMatch.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/model/CredentialMatch.kt
@@ -14,7 +14,7 @@ data class CredentialMatch(
     val matchResult: MatchResultItem,
     val verificationThreshold: Float,
     val faceBioSdk: FaceConfiguration.BioSdk?,
-    val fingerprintBioSdk: FingerprintConfiguration.BioSdk?
+    val fingerprintBioSdk: FingerprintConfiguration.BioSdk?,
 ) {
     val isVerificationSuccessful = matchResult.confidence >= verificationThreshold
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialControllerFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialControllerFragment.kt
index 744994403b..9c6f7dda13 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialControllerFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialControllerFragment.kt
@@ -33,7 +33,10 @@ internal class ExternalCredentialControllerFragment : Fragment(R.layout.fragment
     private val currentlyDisplayedInternalFragment: Fragment?
         get() = hostFragment?.childFragmentManager?.fragments?.first()
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         viewModel.init(params)
@@ -49,7 +52,7 @@ internal class ExternalCredentialControllerFragment : Fragment(R.layout.fragment
             } else {
                 internalNavController?.navigateSafely(
                     currentlyDisplayedInternalFragment,
-                    GraphExternalCredentialInternalDirections.actionGlobalExternalCredentialSelect()
+                    GraphExternalCredentialInternalDirections.actionGlobalExternalCredentialSelect(),
                 )
             }
         }
@@ -66,7 +69,7 @@ internal class ExternalCredentialControllerFragment : Fragment(R.layout.fragment
             viewLifecycleOwner,
             LiveDataEventWithContentObserver { result ->
                 findNavController().finishWithResult(this, result)
-            }
+            },
         )
     }
 
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 7b8cd1cfa0..751dd4b5db 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
@@ -14,7 +14,6 @@ import com.simprints.infra.resources.R as IDR
 
 @HiltViewModel
 internal class ExternalCredentialViewModel @Inject internal constructor() : ViewModel() {
-
     private var isInitialized = false
     lateinit var params: ExternalCredentialParams
         private set
@@ -49,20 +48,6 @@ internal class ExternalCredentialViewModel @Inject internal constructor() : View
         }
     }
 
-
-    fun mapTypeToStringResource(type: ExternalCredentialType?) = when (type) {
-        ExternalCredentialType.NHISCard -> IDR.string.mfid_type_nhis_card
-        ExternalCredentialType.GhanaIdCard -> IDR.string.mfid_type_ghana_id_card
-        ExternalCredentialType.QRCode -> IDR.string.mfid_type_qr_code
-        null -> IDR.string.mfid_type_any_document
-    }
-
-    fun mapTypeToCredentialFieldResource(type: ExternalCredentialType) = when (type) {
-        ExternalCredentialType.NHISCard -> IDR.string.mfid_nhis_card_credential_field
-        ExternalCredentialType.GhanaIdCard -> IDR.string.mfid_ghana_id_credential_field
-        ExternalCredentialType.QRCode -> IDR.string.mfid_qr_credential_field
-    }
-
     fun finish(result: ExternalCredentialSearchResult) {
         _finishEvent.send(result)
     }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrFragment.kt
index c305b67cc8..eb438a8bcf 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrFragment.kt
@@ -29,8 +29,6 @@ import com.simprints.core.tools.extentions.getCurrentPermissionStatus
 import com.simprints.core.tools.extentions.permissionFromResult
 import com.simprints.feature.externalcredential.R
 import com.simprints.feature.externalcredential.databinding.FragmentExternalCredentialScanOcrBinding
-import com.simprints.feature.externalcredential.ext.animateIn
-import com.simprints.feature.externalcredential.ext.animateOut
 import com.simprints.feature.externalcredential.screens.controller.ExternalCredentialViewModel
 import com.simprints.feature.externalcredential.screens.scanocr.model.OcrCropConfig
 import com.simprints.feature.externalcredential.screens.scanocr.usecase.BuildOcrCropConfigUseCase
@@ -39,6 +37,8 @@ import com.simprints.feature.externalcredential.screens.search.model.ScannedCred
 import com.simprints.infra.logging.LoggingConstants.CrashReportTag.MULTI_FACTOR_ID
 import com.simprints.infra.logging.Simber
 import com.simprints.infra.uibase.navigation.navigateSafely
+import com.simprints.infra.uibase.view.animateIn
+import com.simprints.infra.uibase.view.animateOut
 import com.simprints.infra.uibase.view.applySystemBarInsets
 import com.simprints.infra.uibase.viewbinding.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
@@ -96,7 +96,10 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
     @DispatcherBG
     lateinit var bgDispatcher: CoroutineDispatcher
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
         applySystemBarInsets(view)
         Simber.i("ExternalCredentialScanOcrFragment started", tag = MULTI_FACTOR_ID)
@@ -124,7 +127,6 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
                 renderNoPermission(shouldOpenPhoneSettings = true)
             }
         }
-
     }
 
     override fun onDestroy() {
@@ -148,7 +150,6 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
                 startOcr()
             }
         })
-
     }
 
     private fun initObservers() {
@@ -171,7 +172,7 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
             viewLifecycleOwner,
             LiveDataEventWithContentObserver { scannedCredential ->
                 scheduleFinish(scannedCredential)
-            }
+            },
         )
     }
 
@@ -189,7 +190,7 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
             onImageAnalysisReady = {
                 imageAnalysis = it
                 onComplete()
-            }
+            },
         )
         cameraProviderFuture.addListener(cameraListener, ContextCompat.getMainExecutor(requireContext()))
     }
@@ -260,7 +261,7 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
                                 "package:${requireActivity().packageName}".toUri(),
                             ),
                         )
-                    }
+                    },
                 )
             } else {
                 permissionRequestView.init(
@@ -269,7 +270,7 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
                     buttonText = IDR.string.face_capture_permission_action,
                     onClickListener = {
                         launchPermissionRequest.launch(CAMERA)
-                    }
+                    },
                 )
             }
             permissionRequestView.isVisible = true
@@ -289,7 +290,7 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
                     val cropConfig: OcrCropConfig = buildOcrCropConfigUseCase(
                         rotationDegrees = imageInfo.rotationDegrees,
                         cameraPreview = binding.preview,
-                        documentScannerArea = binding.documentScannerArea
+                        documentScannerArea = binding.documentScannerArea,
                     )
                     viewModel.runOcrOnFrame(frame = bitmap, cropConfig)
                 } finally {
@@ -323,7 +324,7 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
         val navigationAction = {
             findNavController().navigateSafely(
                 this@ExternalCredentialScanOcrFragment,
-                ExternalCredentialScanOcrFragmentDirections.actionExternalCredentialScanOcrToExternalCredentialSearch(credential)
+                ExternalCredentialScanOcrFragmentDirections.actionExternalCredentialScanOcrToExternalCredentialSearch(credential),
             )
         }
         if (isAnimatingCompletion) {
@@ -332,5 +333,4 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
             navigationAction.invoke()
         }
     }
-
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModel.kt
index 475eb3450e..7993ff0492 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModel.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModel.kt
@@ -46,7 +46,7 @@ internal class ExternalCredentialScanOcrViewModel @AssistedInject constructor(
     private val tokenizationProcessor: TokenizationProcessor,
     private val authStore: AuthStore,
     private val configManager: ConfigManager,
-    @DispatcherBG private val bgDispatcher: CoroutineDispatcher
+    @DispatcherBG private val bgDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
     @AssistedFactory
     interface Factory {
@@ -83,12 +83,15 @@ internal class ExternalCredentialScanOcrViewModel @AssistedInject constructor(
             ScanOcrState.ScanningInProgress(
                 ocrDocumentType = ocrDocumentType,
                 successfulCaptures = 0,
-                scansRequired = SUCCESSFUL_SCANS_REQUIRED
+                scansRequired = SUCCESSFUL_SCANS_REQUIRED,
             )
         }
     }
 
-    fun runOcrOnFrame(frame: Bitmap, cropConfig: OcrCropConfig) {
+    fun runOcrOnFrame(
+        frame: Bitmap,
+        cropConfig: OcrCropConfig,
+    ) {
         viewModelScope.launch(bgDispatcher) {
             try {
                 Simber.d("started OCR")
@@ -101,7 +104,7 @@ internal class ExternalCredentialScanOcrViewModel @AssistedInject constructor(
                     ScanOcrState.ScanningInProgress(
                         ocrDocumentType = ocrDocumentType,
                         successfulCaptures = detectedBlocks.size,
-                        scansRequired = SUCCESSFUL_SCANS_REQUIRED
+                        scansRequired = SUCCESSFUL_SCANS_REQUIRED,
                     )
                 }
             } finally {
@@ -128,28 +131,26 @@ internal class ExternalCredentialScanOcrViewModel @AssistedInject constructor(
                 credentialType = credentialType,
                 documentImagePath = detectedBlock.imagePath,
                 zoomedCredentialImagePath = zoomedCredentialImagePath,
-                credentialBoundingBox = blockBoundingBox
+                credentialBoundingBox = blockBoundingBox,
             )
             _finishOcrEvent.send(scannedCredential)
             detectedBlocks = emptyList()
         }
     }
 
-    private fun buildZoomedImagePath(detectedBlock: DetectedOcrBlock): String? {
-        return try {
-            saveScannedImageUseCase(
-                bitmap = zoomOntoCredentialUseCase(detectedBlock.imagePath, detectedBlock.blockBoundingBox),
-                documentType = detectedBlock.documentType,
-                imageType = ZoomedInCredential
-            )
-        } catch (e: Exception) {
-            Simber.e(
-                "Unable to zoom into bounding box [${detectedBlock.blockBoundingBox}] of ${detectedBlock.documentType} image ${detectedBlock.imagePath}",
-                e,
-                MULTI_FACTOR_ID
-            )
-            null
-        }
+    private fun buildZoomedImagePath(detectedBlock: DetectedOcrBlock): String? = try {
+        saveScannedImageUseCase(
+            bitmap = zoomOntoCredentialUseCase(detectedBlock.imagePath, detectedBlock.blockBoundingBox),
+            documentType = detectedBlock.documentType,
+            imageType = ZoomedInCredential,
+        )
+    } catch (e: Exception) {
+        Simber.e(
+            "Unable to zoom into bounding box [${detectedBlock.blockBoundingBox}] of ${detectedBlock.documentType} image ${detectedBlock.imagePath}",
+            e,
+            MULTI_FACTOR_ID,
+        )
+        null
     }
 
     fun ocrOnFrameStarted() {
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
index 818b5d66b3..2f02b6e221 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
@@ -48,7 +48,6 @@ import com.simprints.infra.resources.R as IDR
 
 @AndroidEntryPoint
 internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_external_credential_scan_qr) {
-
     private val binding by viewBinding(FragmentExternalCredentialScanQrBinding::bind)
     private val crashReportTag = MULTI_FACTOR_ID
     private val mainViewModel: ExternalCredentialViewModel by activityViewModels()
@@ -74,12 +73,14 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
         viewModel.updateCameraPermissionStatus(cameraPermissionStatus)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
         applySystemBarInsets(view)
         Simber.i("ExternalCredentialScanQrFragment started", tag = MULTI_FACTOR_ID)
 
-
         initObservers()
 
         if (!requireActivity().hasPermission(CAMERA)) {
@@ -146,7 +147,7 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
                 )
                 findNavController().navigateSafely(
                     this@ExternalCredentialScanQrFragment,
-                    ExternalCredentialScanQrFragmentDirections.actionExternalCredentialSelectScanQrToExternalCredentialSearch(args)
+                    ExternalCredentialScanQrFragmentDirections.actionExternalCredentialSelectScanQrToExternalCredentialSearch(args),
                 )
             } else {
                 showInvalidQrCodeFormatDialog(
@@ -154,7 +155,7 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
                     onDismiss = {
                         dismissDialog()
                         viewModel.updateCapturedValue(null)
-                    }
+                    },
                 )
             }
         }
@@ -166,7 +167,8 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
     ) {
         dismissDialog()
         dialog = BottomSheetDialog(requireContext()).also {
-            val view = layoutInflater.inflate(R.layout.dialog_qr_wrong_value, null)
+            val view = layoutInflater
+                .inflate(R.layout.dialog_qr_wrong_value, null)
                 .also { view ->
                     val qrValueTextView = view.findViewById<TextView>(R.id.qrValue)
                     val buttonRescan = view.findViewById<Button>(R.id.buttonRescan)
@@ -223,7 +225,7 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
             qrScannerArea.left,
             qrScannerArea.top,
             qrScannerArea.right,
-            qrScannerArea.bottom
+            qrScannerArea.bottom,
         )
         val orientation = resources.configuration.orientation
         val previewWidth = qrScannerPreview.width
@@ -232,7 +234,7 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
             rect = qrScannerArea,
             orientation = orientation,
             rootViewWidth = previewWidth,
-            rootViewHeight = previewHeight
+            rootViewHeight = previewHeight,
         )
     }
 
@@ -252,7 +254,7 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
                             "package:${requireActivity().packageName}".toUri(),
                         ),
                     )
-                }
+                },
             )
         } else {
             permissionRequestView.init(
@@ -261,7 +263,7 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
                 buttonText = IDR.string.face_capture_permission_action,
                 onClickListener = {
                     launchPermissionRequest.launch(CAMERA)
-                }
+                },
             )
         }
         permissionRequestView.isVisible = true
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModel.kt
index 7fb318f55b..033a18bd92 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModel.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModel.kt
@@ -23,7 +23,6 @@ internal class ExternalCredentialScanQrViewModel @Inject constructor(
     private val configManager: ConfigManager,
     private val tokenizationProcessor: TokenizationProcessor,
 ) : ViewModel() {
-
     private var state: ScanQrState = ScanQrState.ReadyToScan
         set(value) {
             field = value
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchFragment.kt
index 7f43d5ede7..673fefcf16 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchFragment.kt
@@ -21,11 +21,13 @@ import com.simprints.core.livedata.LiveDataEventWithContentObserver
 import com.simprints.core.tools.extentions.hideKeyboard
 import com.simprints.feature.externalcredential.R
 import com.simprints.feature.externalcredential.databinding.FragmentExternalCredentialSearchBinding
+import com.simprints.feature.externalcredential.ext.getCredentialFieldTitle
+import com.simprints.feature.externalcredential.ext.getCredentialTypeString
 import com.simprints.feature.externalcredential.screens.controller.ExternalCredentialViewModel
+import com.simprints.feature.externalcredential.screens.scanocr.usecase.ZoomOntoCredentialUseCase
 import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
 import com.simprints.feature.externalcredential.screens.search.model.SearchCredentialState
 import com.simprints.feature.externalcredential.screens.search.model.SearchState
-import com.simprints.feature.externalcredential.screens.scanocr.usecase.ZoomOntoCredentialUseCase
 import com.simprints.infra.logging.LoggingConstants.CrashReportTag.MULTI_FACTOR_ID
 import com.simprints.infra.logging.Simber
 import com.simprints.infra.uibase.navigation.navigateSafely
@@ -45,7 +47,7 @@ internal class ExternalCredentialSearchFragment : Fragment(R.layout.fragment_ext
                 @Suppress("UNCHECKED_CAST")
                 return viewModelFactory.create(
                     scannedCredential = args.scannedCredential,
-                    externalCredentialParams = mainViewModel.params
+                    externalCredentialParams = mainViewModel.params,
                 ) as T
             }
         }
@@ -54,13 +56,14 @@ internal class ExternalCredentialSearchFragment : Fragment(R.layout.fragment_ext
     @Inject
     lateinit var viewModelFactory: ExternalCredentialSearchViewModel.Factory
 
-
     @Inject
     lateinit var zoomOntoCredentialUseCase: ZoomOntoCredentialUseCase
     private var isEditingCredential: Boolean = false
 
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
         initObservers()
     }
@@ -80,17 +83,19 @@ internal class ExternalCredentialSearchFragment : Fragment(R.layout.fragment_ext
             viewLifecycleOwner,
             LiveDataEventWithContentObserver { result ->
                 mainViewModel.finish(result)
-            }
+            },
         )
     }
 
     private fun renderCredentialCard(state: SearchCredentialState) = with(binding) {
         val credential = state.displayedCredential?.value.orEmpty()
         val credentialType = state.scannedCredential.credentialType
-        val credentialField = getString(mainViewModel.mapTypeToCredentialFieldResource(credentialType))
+        val credentialField = resources.getCredentialFieldTitle(credentialType)
         val currentEditTextValue = credentialEditText.text.toString()
         renderImage(state.scannedCredential)
-        credential.takeIf { currentEditTextValue.isEmpty() }?.let { credentialEditText.setText(it) /*Setting only once at the start*/ }
+        credential.takeIf { currentEditTextValue.isEmpty() }?.let {
+            credentialEditText.setText(it) // Setting only once at the start
+        }
         documentTypeTitle.text = credentialField
         credentialEditText.inputType = viewModel.getKeyBoardInputType()
         credentialEditText.hint = credentialField
@@ -111,7 +116,11 @@ internal class ExternalCredentialSearchFragment : Fragment(R.layout.fragment_ext
         }
     }
 
-    private fun renderSearchProgress(searchState: SearchState, credentialType: ExternalCredentialType, flowType: FlowType) = with(binding) {
+    private fun renderSearchProgress(
+        searchState: SearchState,
+        credentialType: ExternalCredentialType,
+        flowType: FlowType,
+    ) = with(binding) {
         when (searchState) {
             SearchState.Searching -> {
                 searchProgressCard.isVisible = true
@@ -147,7 +156,7 @@ internal class ExternalCredentialSearchFragment : Fragment(R.layout.fragment_ext
     private fun renderEnrolCredentialLinked(credentialType: ExternalCredentialType) = with(binding) {
         iconSearchResult.setImageResource(R.drawable.ic_warning)
         iconSearchResult.isVisible = true
-        val credentialField = getString(mainViewModel.mapTypeToCredentialFieldResource(credentialType))
+        val credentialField = resources.getCredentialTypeString(credentialType)
         val searchResultText = getString(IDR.string.mfid_search_found_enrol, credentialField)
         textSearchResult.text = searchResultText
         textSearchResult.setTextColor(ContextCompat.getColor(requireContext(), IDR.color.simprints_red))
@@ -163,7 +172,7 @@ internal class ExternalCredentialSearchFragment : Fragment(R.layout.fragment_ext
     private fun renderIdentifyCredentialVerificationFailed(credentialType: ExternalCredentialType) = with(binding) {
         iconSearchResult.setImageResource(R.drawable.ic_warning)
         iconSearchResult.isVisible = true
-        val credential = getString(mainViewModel.mapTypeToStringResource(credentialType))
+        val credential = resources.getCredentialTypeString(credentialType)
         textSearchResult.text = getString(IDR.string.mfid_search_found_identification_low_match_score, credential)
         textSearchResult.setTextColor(ContextCompat.getColor(requireContext(), IDR.color.simprints_red))
     }
@@ -175,8 +184,8 @@ internal class ExternalCredentialSearchFragment : Fragment(R.layout.fragment_ext
     private fun renderIdentifyCredentialNotFound(credentialType: ExternalCredentialType) = with(binding) {
         searchResultCard.isVisible = true
         iconSearchResult.isVisible = false
-        val credential = getString(mainViewModel.mapTypeToStringResource(credentialType))
-        val credentialField = getString(mainViewModel.mapTypeToCredentialFieldResource(credentialType))
+        val credential = resources.getCredentialTypeString(credentialType)
+        val credentialField = resources.getCredentialFieldTitle(credentialType)
         val searchResultText = getString(IDR.string.mfid_search_not_found_identification, credentialField, credential)
         textSearchResult.text = searchResultText
         val textColor = IDR.color.simprints_black
@@ -195,7 +204,7 @@ internal class ExternalCredentialSearchFragment : Fragment(R.layout.fragment_ext
         buttonRecapture.setOnClickListener {
             findNavController().navigateSafely(
                 this@ExternalCredentialSearchFragment,
-                ExternalCredentialSearchFragmentDirections.actionExternalCredentialSearchToExternalCredentialSelectFragment()
+                ExternalCredentialSearchFragmentDirections.actionExternalCredentialSearchToExternalCredentialSelectFragment(),
             )
         }
     }
@@ -205,7 +214,6 @@ internal class ExternalCredentialSearchFragment : Fragment(R.layout.fragment_ext
         binding.documentPreview.isVisible = documentImagePath != null
         if (documentImagePath == null) return
 
-
         try {
             val imagePath: String = credential.zoomedCredentialImagePath ?: documentImagePath
             val displayedImage = BitmapFactory.decodeFile(imagePath)
@@ -213,7 +221,6 @@ internal class ExternalCredentialSearchFragment : Fragment(R.layout.fragment_ext
         } catch (e: Exception) {
             Simber.e("Unable to get [$documentImagePath] OCR image", e, tag = MULTI_FACTOR_ID)
         }
-
     }
 
     private fun toggleCredentialEdit() = with(binding) {
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModel.kt
index ab02761ec2..af0e88921c 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModel.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModel.kt
@@ -37,16 +37,14 @@ internal class ExternalCredentialSearchViewModel @AssistedInject constructor(
     private val tokenizationProcessor: TokenizationProcessor,
     private val enrolmentRecordRepository: EnrolmentRecordRepository,
 ) : ViewModel() {
-
     @AssistedFactory
     interface Factory {
         fun create(
             scannedCredential: ScannedCredential,
-            externalCredentialParams: ExternalCredentialParams
+            externalCredentialParams: ExternalCredentialParams,
         ): ExternalCredentialSearchViewModel
     }
 
-
     val finishEvent: LiveData<LiveDataEventWithContent<ExternalCredentialSearchResult>>
         get() = _finishEvent
     private val _finishEvent = MutableLiveData<LiveDataEventWithContent<ExternalCredentialSearchResult>>()
@@ -58,6 +56,7 @@ internal class ExternalCredentialSearchViewModel @AssistedInject constructor(
         }
     private val _stateLiveData = MutableLiveData(state)
     val stateLiveData: LiveData<SearchCredentialState> = _stateLiveData
+
     private fun updateState(state: (SearchCredentialState) -> SearchCredentialState) {
         this.state = state(this.state)
     }
@@ -85,34 +84,36 @@ internal class ExternalCredentialSearchViewModel @AssistedInject constructor(
                 currentState.copy(
                     isConfirmed = false,
                     scannedCredential = currentState.scannedCredential.copy(
-                        credential = encryptedCredential
+                        credential = encryptedCredential,
                     ),
-                    displayedCredential = updatedCredential
+                    displayedCredential = updatedCredential,
                 )
             }
             searchSubjectsLinkedToCredential(encryptedCredential)
         }
     }
 
-    fun getButtonTextResource(searchState: SearchState, flowType: FlowType): Int? =
-        when (searchState) {
-            SearchState.Searching -> null // button is not displayed during search
-            is SearchState.CredentialLinked -> when (flowType) {
-                FlowType.ENROL -> IDR.string.mfid_action_enrol_anyway
-                else -> {
-                    if (searchState.hasSuccessfulVerifications) {
-                        IDR.string.mfid_action_go_to_record
-                    } else {
-                        IDR.string.mfid_action_continue
-                    }
+    fun getButtonTextResource(
+        searchState: SearchState,
+        flowType: FlowType,
+    ): Int? = when (searchState) {
+        SearchState.Searching -> null // button is not displayed during search
+        is SearchState.CredentialLinked -> when (flowType) {
+            FlowType.ENROL -> IDR.string.mfid_action_enrol_anyway
+            else -> {
+                if (searchState.hasSuccessfulVerifications) {
+                    IDR.string.mfid_action_go_to_record
+                } else {
+                    IDR.string.mfid_action_continue
                 }
             }
+        }
 
-            SearchState.CredentialNotFound -> when (flowType) {
-                FlowType.ENROL -> IDR.string.mfid_action_enrol
-                else -> IDR.string.mfid_continue
-            }
+        SearchState.CredentialNotFound -> when (flowType) {
+            FlowType.ENROL -> IDR.string.mfid_action_enrol
+            else -> IDR.string.mfid_continue
         }
+    }
 
     private suspend fun decryptCredentialToDisplay(credential: TokenizableString.Tokenized) {
         val project = configManager.getProject(authStore.signedInProjectId)
@@ -151,7 +152,8 @@ internal class ExternalCredentialSearchViewModel @AssistedInject constructor(
     fun finish(searchState: SearchState) {
         val matches = when (searchState) {
             SearchState.Searching,
-            SearchState.CredentialNotFound -> emptyList()
+            SearchState.CredentialNotFound,
+            -> emptyList()
 
             is SearchState.CredentialLinked -> searchState.matchResults
         }
@@ -160,8 +162,7 @@ internal class ExternalCredentialSearchViewModel @AssistedInject constructor(
                 flowType = externalCredentialParams.flowType,
                 scannedCredential = scannedCredential,
                 matchResults = matches,
-            )
+            ),
         )
     }
-
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/model/ScannedCredential.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/model/ScannedCredential.kt
index a2d33b4440..6c623eb6c5 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/model/ScannedCredential.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/model/ScannedCredential.kt
@@ -1,10 +1,12 @@
 package com.simprints.feature.externalcredential.screens.search.model
 
 import androidx.annotation.Keep
+import com.simprints.core.domain.externalcredential.ExternalCredential
 import com.simprints.core.domain.externalcredential.ExternalCredentialType
 import com.simprints.core.domain.tokenization.TokenizableString
 import com.simprints.feature.externalcredential.model.BoundingBox
 import java.io.Serializable
+import java.util.UUID
 
 @Keep
 data class ScannedCredential(
@@ -12,5 +14,12 @@ data class ScannedCredential(
     val credentialType: ExternalCredentialType,
     val documentImagePath: String?,
     val zoomedCredentialImagePath: String?,
-    val credentialBoundingBox: BoundingBox?
+    val credentialBoundingBox: BoundingBox?,
 ) : Serializable
+
+fun ScannedCredential.toExternalCredential(subjectId: String) = ExternalCredential(
+    id = UUID.randomUUID().toString(),
+    value = credential,
+    subjectId = subjectId,
+    type = credentialType,
+)
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 3a2213f10b..35a80da450 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
@@ -15,6 +15,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.simprints.core.domain.externalcredential.ExternalCredentialType
 import com.simprints.feature.externalcredential.R
 import com.simprints.feature.externalcredential.databinding.FragmentExternalCredentialSelectBinding
+import com.simprints.feature.externalcredential.ext.getCredentialTypeRes
 import com.simprints.feature.externalcredential.ext.getQuantityCredentialString
 import com.simprints.feature.externalcredential.screens.controller.ExternalCredentialViewModel
 import com.simprints.feature.externalcredential.screens.scanocr.model.OcrDocumentType
@@ -75,7 +76,7 @@ internal class ExternalCredentialSelectFragment : Fragment(R.layout.fragment_ext
     private fun initViews(types: List<ExternalCredentialType>) {
         binding.title.text = resources.getQuantityCredentialString(
             id = IDR.plurals.mfid_scan_action,
-            specificCredentialRes = mainViewModel.mapTypeToStringResource(types.firstOrNull()),
+            specificCredentialRes = resources.getCredentialTypeRes(types.firstOrNull()),
             multipleCredentialsRes = IDR.string.mfid_type_any_document,
             credentialTypes = types,
         )
@@ -136,7 +137,7 @@ internal class ExternalCredentialSelectFragment : Fragment(R.layout.fragment_ext
                     bodyText.text = resources.getQuantityCredentialString(
                         id = IDR.plurals.mfid_dialog_skip_scan_body,
                         credentialTypes = credentialTypes,
-                        specificCredentialRes = mainViewModel.mapTypeToStringResource(credentialTypes.firstOrNull()),
+                        specificCredentialRes = resources.getCredentialTypeRes(credentialTypes.firstOrNull()),
                         multipleCredentialsRes = IDR.string.mfid_type_any_document
                     )
 
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt
new file mode 100644
index 0000000000..d13fa770b2
--- /dev/null
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt
@@ -0,0 +1,135 @@
+package com.simprints.feature.externalcredential.view
+
+import android.content.Context
+import android.graphics.BitmapFactory
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.simprints.core.domain.tokenization.TokenizableString
+import com.simprints.feature.externalcredential.R
+import com.simprints.feature.externalcredential.databinding.DialogScannedCredentialBinding
+import com.simprints.feature.externalcredential.databinding.ItemScannedImageBinding
+import com.simprints.feature.externalcredential.ext.getCredentialFieldTitle
+import com.simprints.feature.externalcredential.ext.getCredentialTypeString
+import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
+import com.simprints.infra.uibase.annotations.ExcludedFromGeneratedTestCoverageReports
+import com.simprints.infra.resources.R as IDR
+
+@ExcludedFromGeneratedTestCoverageReports("UI class")
+class ScannedCredentialDialog(
+    context: Context,
+    private val credential: ScannedCredential,
+    private val displayedCredential: TokenizableString.Raw,
+    private val onConfirm: () -> Unit,
+    private val onSkip: () -> Unit,
+) : BottomSheetDialog(context) {
+    private val binding: DialogScannedCredentialBinding =
+        DialogScannedCredentialBinding.inflate(LayoutInflater.from(context))
+
+    init {
+        setContentView(binding.root)
+        setCancelable(false)
+        setCanceledOnTouchOutside(false)
+
+        behavior.state = BottomSheetBehavior.STATE_EXPANDED
+        behavior.isDraggable = false
+        behavior.skipCollapsed = true
+
+        initViews()
+        setupRecyclerView()
+    }
+
+    private fun initViews() = with(binding) {
+        val credentialType = credential.credentialType
+        val credential = context.resources.getCredentialTypeString(credentialType)
+        val credentialField = context.resources.getCredentialFieldTitle(credentialType)
+
+        documentField.text = credentialField
+        title.text = context.getString(IDR.string.mfid_add_document_title, credential)
+        credentialValue.text = displayedCredential.value
+        confirmCredentialCheckbox.text =
+            context.getString(IDR.string.mfid_confirmation_checkbox_text, credentialField)
+        confirmCredentialCheckbox.setOnCheckedChangeListener { _, isChecked ->
+            buttonConfirm.isEnabled = isChecked
+        }
+        buttonSkip.setOnClickListener { onSkip() }
+        buttonConfirm.setOnClickListener { onConfirm() }
+    }
+
+    private fun setupRecyclerView() = with(binding) {
+        val imagePaths = buildList {
+            credential.zoomedCredentialImagePath?.let { add(it) }
+            this@ScannedCredentialDialog.credential.documentImagePath?.let { add(it) }
+        }
+
+        if (imagePaths.isEmpty()) {
+            documentsRecyclerView.isVisible = false
+        } else {
+            documentsRecyclerView.layoutManager =
+                LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
+            documentsRecyclerView.adapter = ImageAdapter(imagePaths)
+            documentsRecyclerView.overScrollMode = View.OVER_SCROLL_NEVER
+            documentsRecyclerView.isVisible = true
+        }
+    }
+
+    private inner class ImageAdapter(
+        private val imagePaths: List<String>,
+    ) : RecyclerView.Adapter<ImageAdapter.ImageViewHolder>() {
+        override fun onCreateViewHolder(
+            parent: ViewGroup,
+            viewType: Int,
+        ): ImageViewHolder {
+            val view = LayoutInflater
+                .from(parent.context)
+                .inflate(R.layout.item_scanned_image, parent, false)
+            return ImageViewHolder(view)
+        }
+
+        override fun onBindViewHolder(
+            holder: ImageViewHolder,
+            position: Int,
+        ) {
+            holder.bind(imagePaths[position], position)
+        }
+
+        override fun getItemCount() = imagePaths.size
+
+        inner class ImageViewHolder(
+            itemView: View,
+        ) : RecyclerView.ViewHolder(itemView) {
+            private val binding = ItemScannedImageBinding.bind(itemView)
+
+            fun bind(
+                imagePath: String,
+                position: Int,
+            ) = with(binding) {
+                val bitmap = BitmapFactory.decodeFile(imagePath)
+                documentImage.setImageBitmap(bitmap)
+
+                itemView.post {
+                    val recyclerWidth = (itemView.parent as? RecyclerView)?.width ?: 0
+                    if (recyclerWidth > 0) {
+                        val imageWidth = (recyclerWidth * 0.8).toInt()
+                        val imageHeight = (imageWidth * 10 / 16)
+                        val layoutParams = documentImage.layoutParams
+                        layoutParams.width = imageWidth
+                        layoutParams.height = imageHeight
+                        documentImage.layoutParams = layoutParams
+                    }
+                }
+
+                val params = itemView.layoutParams as ViewGroup.MarginLayoutParams
+                if (position == imagePaths.size - 1) {
+                    params.marginEnd = context.resources.getDimensionPixelSize(IDR.dimen.margin_large)
+                }
+                itemView.layoutParams = params
+            }
+        }
+    }
+}
diff --git a/feature/external-credential/src/main/res/layout/dialog_scanned_credential.xml b/feature/external-credential/src/main/res/layout/dialog_scanned_credential.xml
new file mode 100644
index 0000000000..5a1ec274d8
--- /dev/null
+++ b/feature/external-credential/src/main/res/layout/dialog_scanned_credential.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:layout_gravity="bottom">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/title"
+            style="@style/Text.Headline5.Blue.Bold"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingHorizontal="@dimen/margin_large"
+            android:paddingTop="@dimen/padding_default"
+            android:paddingBottom="@dimen/margin_default"
+            tools:text="Add this document?" />
+
+        <View
+            android:id="@+id/bottomDivider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginHorizontal="@dimen/margin_large"
+            android:background="@color/simprints_grey_light" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/documentsRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:itemCount="4"
+            tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/item_scanned_image"
+            tools:orientation="horizontal" />
+
+        <TextView
+            android:id="@+id/documentField"
+            style="@style/Text.Body2.Secondary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="@dimen/margin_large"
+            tools:text="Membership number:" />
+
+        <TextView
+            android:id="@+id/credentialValue"
+            style="@style/Text.Headline4.Bold"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/margin_large"
+            android:paddingHorizontal="@dimen/margin_large"
+            android:textColor="@color/simprints_text_black"
+            tools:text="GHA-123456789-0" />
+
+        <CheckBox
+            android:id="@+id/confirmCredentialCheckbox"
+            style="@style/Text.Body2.Secondary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="10dp"
+            android:layout_marginBottom="@dimen/margin_large"
+            android:buttonTint="@color/simprints_blue"
+            android:checked="false"
+            android:paddingStart="@dimen/margin_default"
+            tools:text="I confirm that the external credential is scanned correctly" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/margin_large"
+            android:paddingVertical="@dimen/margin_default">
+
+            <Button
+                android:id="@+id/buttonSkip"
+                style="@style/Widget.Simprints.Button.TextButton.Red"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/mfid_action_skip" />
+
+            <Button
+                android:id="@+id/buttonConfirm"
+                style="@style/Widget.Simprints.Button.Blue"
+                android:enabled="false"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/margin_large"
+                android:layout_weight="1"
+                android:text="@string/mfid_action_add" />
+        </LinearLayout>
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
diff --git a/feature/external-credential/src/main/res/layout/item_scanned_image.xml b/feature/external-credential/src/main/res/layout/item_scanned_image.xml
new file mode 100644
index 0000000000..801e358c70
--- /dev/null
+++ b/feature/external-credential/src/main/res/layout/item_scanned_image.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView 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="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginVertical="4dp"
+    android:layout_marginStart="16dp"
+    android:clipToPadding="true"
+    app:cardUseCompatPadding="true"
+    android:theme="@style/Theme.Simprints"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="4dp">
+
+    <ImageView
+
+        android:id="@+id/documentImage"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        tools:src="@tools:sample/avatars" />
+
+
+</com.google.android.material.card.MaterialCardView>
diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/ext/ResourceExtTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/ext/ResourceExtTest.kt
new file mode 100644
index 0000000000..59e57b844e
--- /dev/null
+++ b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/ext/ResourceExtTest.kt
@@ -0,0 +1,44 @@
+package com.simprints.feature.externalcredential.ext
+
+import android.content.res.Resources
+import com.google.common.truth.Truth.*
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import io.mockk.*
+import org.junit.Test
+import com.simprints.infra.resources.R as IDR
+
+class ResourceExtTest {
+    private val mockResources = mockk<Resources>(relaxed = true)
+
+    @Test
+    fun `getCredentialTypeRes returns correct resource ids`() {
+        assertThat(mockResources.getCredentialTypeRes(ExternalCredentialType.NHISCard))
+            .isEqualTo(IDR.string.mfid_type_nhis_card)
+        assertThat(mockResources.getCredentialTypeRes(ExternalCredentialType.GhanaIdCard))
+            .isEqualTo(IDR.string.mfid_type_ghana_id_card)
+        assertThat(mockResources.getCredentialTypeRes(ExternalCredentialType.QRCode))
+            .isEqualTo(IDR.string.mfid_type_qr_code)
+        assertThat(mockResources.getCredentialTypeRes(null))
+            .isEqualTo(IDR.string.mfid_type_any_document)
+    }
+
+    @Test
+    fun `getCredentialFieldTitle returns correct resource ids for each type`() {
+        every { mockResources.getString(any()) } returns ""
+        mockResources.getCredentialFieldTitle(ExternalCredentialType.NHISCard)
+        verify { mockResources.getString(IDR.string.mfid_nhis_card_credential_field) }
+        mockResources.getCredentialFieldTitle(ExternalCredentialType.GhanaIdCard)
+        verify { mockResources.getString(IDR.string.mfid_ghana_id_credential_field) }
+        mockResources.getCredentialFieldTitle(ExternalCredentialType.QRCode)
+        verify { mockResources.getString(IDR.string.mfid_qr_credential_field) }
+    }
+
+    @Test
+    fun `getCredentialTypeString calls getString with correct resource id`() {
+        val expected = "expected"
+        every { mockResources.getString(any()) } returns expected
+        val result = mockResources.getCredentialTypeString(ExternalCredentialType.NHISCard)
+        verify { mockResources.getString(IDR.string.mfid_type_nhis_card) }
+        assertThat(result).isEqualTo(expected)
+    }
+}
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 bfe18ba9af..a2a8668eb8 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
@@ -8,13 +8,11 @@ import com.simprints.core.domain.externalcredential.ExternalCredentialType
 import com.simprints.feature.externalcredential.ExternalCredentialSearchResult
 import com.simprints.feature.externalcredential.model.ExternalCredentialParams
 import io.mockk.mockk
-import com.simprints.infra.resources.R as IDR
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
 internal class ExternalCredentialViewModelTest {
-
     @get:Rule
     val rule = InstantTaskExecutorRule()
 
@@ -49,16 +47,6 @@ internal class ExternalCredentialViewModelTest {
         assertThat(observer.value()?.selectedType).isNull()
     }
 
-    @Test
-    fun `mapTypeToStringResource returns correct string ids`() {
-        assertThat(viewModel.mapTypeToStringResource(ExternalCredentialType.NHISCard))
-            .isEqualTo(IDR.string.mfid_type_nhis_card)
-        assertThat(viewModel.mapTypeToStringResource(ExternalCredentialType.GhanaIdCard))
-            .isEqualTo(IDR.string.mfid_type_ghana_id_card)
-        assertThat(viewModel.mapTypeToStringResource(ExternalCredentialType.QRCode))
-            .isEqualTo(IDR.string.mfid_type_qr_code)
-    }
-
     @Test
     fun `setExternalCredentialValue updates state`() {
         val observer = viewModel.stateLiveData.test()
@@ -95,12 +83,15 @@ internal class ExternalCredentialViewModelTest {
         assertThat(observer.value()?.peekContent()).isEqualTo(mockResult)
     }
 
-    private fun emptyParams(subjectId: String, flowType: FlowType) = ExternalCredentialParams(
+    private fun emptyParams(
+        subjectId: String,
+        flowType: FlowType,
+    ) = ExternalCredentialParams(
         subjectId = subjectId,
         flowType = flowType,
         ageGroup = null,
         probeReferenceId = null,
         faceSamples = emptyList(),
-        fingerprintSamples = emptyList()
+        fingerprintSamples = emptyList(),
     )
 }
diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/search/model/ScannedCredentialTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/search/model/ScannedCredentialTest.kt
new file mode 100644
index 0000000000..b18c3c3724
--- /dev/null
+++ b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/search/model/ScannedCredentialTest.kt
@@ -0,0 +1,35 @@
+package com.simprints.feature.externalcredential.screens.search.model
+
+import com.google.common.truth.Truth.*
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import com.simprints.core.domain.tokenization.asTokenizableEncrypted
+import io.mockk.*
+import org.junit.Before
+import org.junit.Test
+import java.util.UUID
+
+class ScannedCredentialTest {
+    private val testUuid = "testUuid"
+    private val subjectId = "subjectId"
+
+    @Before
+    fun setup() {
+        mockkStatic(UUID::class)
+        every { UUID.randomUUID().toString() } returns testUuid
+    }
+
+    @Test
+    fun `toExternalCredential maps fields correctly`() {
+        val tokenizedValue = "tokenizedValue".asTokenizableEncrypted()
+        val scannedCredential = mockk<ScannedCredential> {
+            every { credential } returns tokenizedValue
+            every { credentialType } returns ExternalCredentialType.NHISCard
+        }
+        val result = scannedCredential.toExternalCredential(subjectId)
+
+        assertThat(result.id).isEqualTo(testUuid)
+        assertThat(result.value).isEqualTo(tokenizedValue)
+        assertThat(result.subjectId).isEqualTo(subjectId)
+        assertThat(result.type).isEqualTo(ExternalCredentialType.NHISCard)
+    }
+}
diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorViewModel.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorViewModel.kt
index ffbaeea079..19aad77128 100644
--- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorViewModel.kt
+++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorViewModel.kt
@@ -90,10 +90,13 @@ internal class OrchestratorViewModel @Inject constructor(
             // In case of a follow-up action, we should restore completed steps from cache
             // and add new ones to the list. This way all session steps are available throughout
             // the app for reference (i.e. have we already captured face in this session?)
-            steps = cache.steps + stepsBuilder.build(
+            val cachedSteps = cache.steps
+            val cachedExternalCredentialResponse = getCachedCredentialResponse(cachedSteps)
+            steps = cachedSteps + stepsBuilder.build(
                 action = action,
                 projectConfiguration = projectConfiguration,
-                enrolmentSubjectId = enrolmentSubjectId
+                enrolmentSubjectId = enrolmentSubjectId,
+                cachedScannedCredential = cachedExternalCredentialResponse?.scannedCredential,
             )
             Simber.i("Steps to execute: ${steps.joinToString { it.id.toString() }}", tag = ORCHESTRATION)
         } catch (_: SubjectAgeNotSupportedException) {
@@ -104,6 +107,15 @@ internal class OrchestratorViewModel @Inject constructor(
         doNextStep()
     }
 
+    private fun getCachedCredentialResponse(steps: List<Step>): ExternalCredentialSearchResult? {
+        steps.forEach { step ->
+            if (step.id == StepId.EXTERNAL_CREDENTIAL) {
+                return step.result as? ExternalCredentialSearchResult
+            }
+        }
+        return null
+    }
+
     fun handleResult(result: StepResult) = viewModelScope.launch {
         Simber.i("Handling step result: ${result.javaClass.simpleName}", tag = ORCHESTRATION)
         Simber.d(result.toString(), tag = ORCHESTRATION)
diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt
index d4e72a7160..8d0199f78e 100644
--- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt
+++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt
@@ -73,6 +73,7 @@ import java.io.Serializable
     JsonSubTypes.Type(value = ExitFormResult::class, name = "ExitFormResult"),
     JsonSubTypes.Type(value = ValidateSubjectPoolResult::class, name = "ValidateSubjectPoolResult"),
     JsonSubTypes.Type(value = SelectSubjectAgeGroupResult::class, name = "SelectSubjectAgeGroupResult"),
+    JsonSubTypes.Type(value = ExternalCredentialSearchResult::class, name = "ExternalCredentialSearchResult"),
 )
 abstract class StepResultMixin : StepResult
 
diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateEnrolResponseUseCase.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateEnrolResponseUseCase.kt
index 168bc779f1..6491432a49 100644
--- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateEnrolResponseUseCase.kt
+++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateEnrolResponseUseCase.kt
@@ -1,10 +1,9 @@
 package com.simprints.feature.orchestrator.usecases.response
 
-import com.simprints.core.domain.externalcredential.ExternalCredential
 import com.simprints.core.domain.response.AppErrorReason
 import com.simprints.face.capture.FaceCaptureResult
 import com.simprints.feature.externalcredential.ExternalCredentialSearchResult
-import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
+import com.simprints.feature.externalcredential.screens.search.model.toExternalCredential
 import com.simprints.fingerprint.capture.FingerprintCaptureResult
 import com.simprints.infra.config.store.models.Project
 import com.simprints.infra.eventsync.sync.common.SubjectFactory
@@ -15,7 +14,6 @@ import com.simprints.infra.orchestration.data.responses.AppEnrolResponse
 import com.simprints.infra.orchestration.data.responses.AppErrorResponse
 import com.simprints.infra.orchestration.data.responses.AppResponse
 import java.io.Serializable
-import java.util.UUID
 import javax.inject.Inject
 
 internal class CreateEnrolResponseUseCase @Inject constructor(
@@ -51,13 +49,4 @@ internal class CreateEnrolResponseUseCase @Inject constructor(
             AppErrorResponse(AppErrorReason.UNEXPECTED_ERROR)
         }
     }
-
-    private fun ScannedCredential.toExternalCredential(subjectId: String): ExternalCredential? {
-        return ExternalCredential(
-            id = UUID.randomUUID().toString(),
-            value = credential,
-            subjectId = subjectId,
-            type = credentialType
-        )
-    }
 }
diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCase.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCase.kt
index e42b348fa1..d72392e65f 100644
--- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCase.kt
+++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCase.kt
@@ -2,15 +2,20 @@ package com.simprints.feature.orchestrator.usecases.response
 
 import com.simprints.core.domain.response.AppMatchConfidence
 import com.simprints.feature.externalcredential.ExternalCredentialSearchResult
+import com.simprints.infra.config.store.models.DecisionPolicy
 import com.simprints.infra.config.store.models.ProjectConfiguration
 import com.simprints.infra.events.session.SessionEventRepository
 import com.simprints.infra.matching.FaceMatchResult
 import com.simprints.infra.matching.FingerprintMatchResult
+import com.simprints.infra.matching.MatchResultItem
 import com.simprints.infra.orchestration.data.responses.AppIdentifyResponse
 import com.simprints.infra.orchestration.data.responses.AppMatchResult
 import com.simprints.infra.orchestration.data.responses.AppResponse
 import java.io.Serializable
 import javax.inject.Inject
+import kotlin.collections.ifEmpty
+import kotlin.collections.map
+import kotlin.collections.take
 
 internal class CreateIdentifyResponseUseCase @Inject constructor(
     private val eventRepository: SessionEventRepository,
@@ -19,8 +24,8 @@ internal class CreateIdentifyResponseUseCase @Inject constructor(
         projectConfiguration: ProjectConfiguration,
         results: List<Serializable>,
     ): AppResponse {
-        val credentialFaceMatchResults = credentialResultsMapper(results, isFace = true)
-        val credentialFingerprintMatchResults = credentialResultsMapper(results, isFace = false)
+        val credentialFaceMatchResults = credentialResultsMapper(results, projectConfiguration, isFace = true)
+        val credentialFingerprintMatchResults = credentialResultsMapper(results, projectConfiguration, isFace = false)
 
         val currentSessionId = eventRepository.getCurrentSessionScope().id
 
@@ -49,16 +54,7 @@ internal class CreateIdentifyResponseUseCase @Inject constructor(
             ?.getSdkConfiguration(fingerprintMatchResult.sdk)
             ?.decisionPolicy
             ?.let { fingerprintDecisionPolicy ->
-                val matches = fingerprintMatchResult.results
-                val goodResults = matches
-                    .filter { it.confidence >= fingerprintDecisionPolicy.low }
-                    .sortedByDescending { it.confidence }
-                // Attempt to include only high confidence matches
-                goodResults
-                    .filter { it.confidence >= fingerprintDecisionPolicy.high }
-                    .ifEmpty { goodResults }
-                    .take(projectConfiguration.identification.maxNbOfReturnedCandidates)
-                    .map { AppMatchResult(it.subjectId, it.confidence, fingerprintDecisionPolicy) }
+                fingerprintMatchResult.results.mapToMatchResults(fingerprintDecisionPolicy, projectConfiguration)
             }
     } ?: emptyList()
 
@@ -70,19 +66,25 @@ internal class CreateIdentifyResponseUseCase @Inject constructor(
             ?.getSdkConfiguration(faceMatchResult.sdk)
             ?.decisionPolicy
             ?.let { faceDecisionPolicy ->
-                val matches = faceMatchResult.results
-                val goodResults = matches
-                    .filter { it.confidence >= faceDecisionPolicy.low }
-                    .sortedByDescending { it.confidence }
-                // Attempt to include only high confidence matches
-                goodResults
-                    .filter { it.confidence >= faceDecisionPolicy.high }
-                    .ifEmpty { goodResults }
-                    .take(projectConfiguration.identification.maxNbOfReturnedCandidates)
-                    .map { AppMatchResult(it.subjectId, it.confidence, faceDecisionPolicy) }
+                faceMatchResult.results.mapToMatchResults(faceDecisionPolicy, projectConfiguration)
             }
     } ?: emptyList()
 
+    private fun List<MatchResultItem>.mapToMatchResults(
+        decisionPolicy: DecisionPolicy,
+        projectConfiguration: ProjectConfiguration,
+    ): List<AppMatchResult> {
+        val goodResults = this
+            .filter { it.confidence >= decisionPolicy.low }
+            .sortedByDescending { it.confidence }
+        // Attempt to include only high confidence matches
+        return goodResults
+            .filter { it.confidence >= decisionPolicy.high }
+            .ifEmpty { goodResults }
+            .take(projectConfiguration.identification.maxNbOfReturnedCandidates)
+            .map { AppMatchResult(it.subjectId, it.confidence, decisionPolicy) }
+    }
+
     /**
      * Checks if any of the [results] items is an instance of [ExternalCredentialSearchResult]. If such item is found, then returns a list
      * of candidates whose verification matching score  between the taken biometric probe, and a biometric probe linked to is above
@@ -92,25 +94,32 @@ internal class CreateIdentifyResponseUseCase @Inject constructor(
      */
     private fun credentialResultsMapper(
         results: List<Serializable>,
+        projectConfiguration: ProjectConfiguration,
         isFace: Boolean,
-    ): List<AppMatchResult> = results.filterIsInstance<ExternalCredentialSearchResult>()
+    ) = results
+        .filterIsInstance<ExternalCredentialSearchResult>()
         .firstOrNull()
-        ?.matchResults
-        ?.filter {
-            if (isFace) {
-                it.faceBioSdk != null
+        ?.let { credentialSearchResult ->
+            val credentialMatchItems = credentialSearchResult.matchResults.map { it.matchResult }
+            val faceMatchItems = credentialMatchItems.filterIsInstance<FaceMatchResult.Item>()
+            val fingerMatchItems = credentialMatchItems.filterIsInstance<FingerprintMatchResult.Item>()
+            val decisionPolicy = if (isFace) {
+                credentialSearchResult.matchResults.find { it.faceBioSdk != null }?.faceBioSdk?.let { sdk ->
+                    projectConfiguration.face
+                        ?.getSdkConfiguration(sdk)
+                        ?.decisionPolicy
+                }
             } else {
-                it.fingerprintBioSdk != null
+                credentialSearchResult.matchResults.find { it.fingerprintBioSdk != null }?.fingerprintBioSdk?.let { sdk ->
+                    projectConfiguration.fingerprint
+                        ?.getSdkConfiguration(sdk)
+                        ?.decisionPolicy
+                }
             }
-        }
-        ?.map {
-            AppMatchResult(
-                guid = it.matchResult.subjectId,
-                confidenceScore = it.matchResult.confidence.toInt(),
-                matchConfidence = AppMatchConfidence.HIGH,
-                verificationSuccess = true
-            )
-        }
-        ?.sortedByDescending(AppMatchResult::confidenceScore)
-        .orEmpty()
+            if (decisionPolicy == null) return@let emptyList()
+            val matches = if (isFace) faceMatchItems else fingerMatchItems
+            return@let matches
+                .mapToMatchResults(decisionPolicy, projectConfiguration)
+                .sortedByDescending(AppMatchResult::confidenceScore)
+        }.orEmpty()
 }
diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCase.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCase.kt
index 57f28d219e..c9ec1371a4 100644
--- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCase.kt
+++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCase.kt
@@ -6,6 +6,7 @@ import com.simprints.feature.consent.ConsentContract
 import com.simprints.feature.consent.ConsentType
 import com.simprints.feature.enrollast.EnrolLastBiometricContract
 import com.simprints.feature.externalcredential.ExternalCredentialContract
+import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
 import com.simprints.feature.fetchsubject.FetchSubjectContract
 import com.simprints.feature.orchestrator.R
 import com.simprints.feature.orchestrator.cache.OrchestratorCache
@@ -45,6 +46,7 @@ internal class BuildStepsUseCase @Inject constructor(
         action: ActionRequest,
         projectConfiguration: ProjectConfiguration,
         enrolmentSubjectId: String,
+        cachedScannedCredential: ScannedCredential?,
     ) = when (action) {
         is ActionRequest.EnrolActionRequest -> listOf(
             buildSetupStep(),
@@ -70,7 +72,7 @@ internal class BuildStepsUseCase @Inject constructor(
                     action = action,
                     projectConfiguration = projectConfiguration,
                     subjectQuery = subjectQuery,
-                    enrolmentSubjectId = enrolmentSubjectId
+                    enrolmentSubjectId = enrolmentSubjectId,
                 ),
             )
         }
@@ -94,7 +96,7 @@ internal class BuildStepsUseCase @Inject constructor(
         )
 
         is ActionRequest.ConfirmIdentityActionRequest -> listOf(
-            buildConfirmIdentityStep(action),
+            buildConfirmIdentityStep(action, cachedScannedCredential),
         )
     }.flatten()
 
@@ -108,7 +110,7 @@ internal class BuildStepsUseCase @Inject constructor(
             action,
             projectConfiguration,
             ageGroup,
-            enrolmentSubjectId
+            enrolmentSubjectId,
         )
 
         is ActionRequest.IdentifyActionRequest -> buildCaptureAndMatchStepsForIdentify(
@@ -116,7 +118,7 @@ internal class BuildStepsUseCase @Inject constructor(
             projectConfiguration = projectConfiguration,
             ageGroup = ageGroup,
             subjectQuery = buildMatcherSubjectQuery(projectConfiguration, action),
-            enrolmentSubjectId = enrolmentSubjectId
+            enrolmentSubjectId = enrolmentSubjectId,
         )
 
         is ActionRequest.VerifyActionRequest -> buildCaptureAndMatchStepsForVerify(
@@ -132,7 +134,7 @@ internal class BuildStepsUseCase @Inject constructor(
         ageGroup: AgeGroup?,
         enrolmentSubjectId: String,
         projectConfiguration: ProjectConfiguration,
-        flowType: FlowType
+        flowType: FlowType,
     ): List<Step> {
         val isExternalCredentialEnabled = projectConfiguration.multifactorId?.allowedExternalCredentials?.isNotEmpty() ?: false
         if (!isExternalCredentialEnabled) return emptyList()
@@ -149,7 +151,7 @@ internal class BuildStepsUseCase @Inject constructor(
                             flowType = flowType,
                             ageGroup = ageGroup,
                         ),
-                    )
+                    ),
                 )
             }
 
@@ -177,7 +179,7 @@ internal class BuildStepsUseCase @Inject constructor(
                 ageGroup = ageGroup,
                 enrolmentSubjectId = enrolmentSubjectId,
                 projectConfiguration = projectConfiguration,
-                flowType = enrolFlowType
+                flowType = enrolFlowType,
             )
         }
         val matcherSteps = if (projectConfiguration.general.duplicateBiometricEnrolmentCheck) {
@@ -202,7 +204,7 @@ internal class BuildStepsUseCase @Inject constructor(
         projectConfiguration: ProjectConfiguration,
         ageGroup: AgeGroup? = null,
         subjectQuery: SubjectQuery,
-        enrolmentSubjectId: String
+        enrolmentSubjectId: String,
     ): List<Step> {
         val action = fallbackToCommCareDataSourceIfNeeded(action, projectConfiguration)
         val resolvedAgeGroup = ageGroup ?: ageGroupFromSubjectAge(action, projectConfiguration)
@@ -218,7 +220,7 @@ internal class BuildStepsUseCase @Inject constructor(
                 ageGroup = ageGroup,
                 enrolmentSubjectId = enrolmentSubjectId,
                 projectConfiguration = projectConfiguration,
-                flowType = identifyFlowType
+                flowType = identifyFlowType,
             )
         }
         val matcherSteps = buildMatcherSteps(
@@ -529,7 +531,10 @@ internal class BuildStepsUseCase @Inject constructor(
         )
     }
 
-    private fun buildConfirmIdentityStep(action: ActionRequest.ConfirmIdentityActionRequest) = listOf(
+    private fun buildConfirmIdentityStep(
+        action: ActionRequest.ConfirmIdentityActionRequest,
+        cachedScannedCredential: ScannedCredential?,
+    ) = listOf(
         Step(
             id = StepId.CONFIRM_IDENTITY,
             navigationActionId = R.id.action_orchestratorFragment_to_selectSubject,
@@ -537,11 +542,11 @@ internal class BuildStepsUseCase @Inject constructor(
             params = SelectSubjectContract.getParams(
                 projectId = action.projectId,
                 subjectId = action.selectedGuid,
+                scannedCredential = cachedScannedCredential,
             ),
         ),
     )
 
-
     private fun ageGroupFromSubjectAge(
         action: ActionRequest,
         projectConfiguration: ProjectConfiguration,
diff --git a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/OrchestratorViewModelTest.kt b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/OrchestratorViewModelTest.kt
index faaa772417..f0b7c47a4e 100644
--- a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/OrchestratorViewModelTest.kt
+++ b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/OrchestratorViewModelTest.kt
@@ -15,6 +15,7 @@ import com.simprints.feature.enrollast.EnrolLastBiometricParams
 import com.simprints.feature.enrollast.EnrolLastBiometricStepResult
 import com.simprints.feature.externalcredential.ExternalCredentialSearchResult
 import com.simprints.feature.externalcredential.model.ExternalCredentialParams
+import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
 import com.simprints.feature.orchestrator.cache.OrchestratorCache
 import com.simprints.feature.orchestrator.exceptions.SubjectAgeNotSupportedException
 import com.simprints.feature.orchestrator.steps.MatchStepStubPayload
@@ -114,7 +115,7 @@ internal class OrchestratorViewModelTest {
 
     @Test
     fun `Starts executing steps when action when received`() = runTest {
-        coEvery { stepsBuilder.build(any(), any(), any()) } returns listOf(
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns listOf(
             createMockStep(StepId.SETUP),
         )
 
@@ -127,7 +128,7 @@ internal class OrchestratorViewModelTest {
 
     @Test
     fun `Executes next steps after step result`() = runTest {
-        coEvery { stepsBuilder.build(any(), any(), any()) } returns listOf(
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns listOf(
             createMockStep(StepId.SETUP),
             createMockStep(StepId.CONSENT),
         )
@@ -144,7 +145,7 @@ internal class OrchestratorViewModelTest {
 
     @Test
     fun `Returns response when all steps executed`() = runTest {
-        coEvery { stepsBuilder.build(any(), any(), any()) } returns listOf(
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns listOf(
             createMockStep(StepId.SETUP),
             createMockStep(StepId.CONSENT),
         )
@@ -162,7 +163,7 @@ internal class OrchestratorViewModelTest {
 
     @Test
     fun `Returns response when error result received`() = runTest {
-        coEvery { stepsBuilder.build(any(), any(), any()) } returns listOf(
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns listOf(
             createMockStep(StepId.SETUP),
             createMockStep(StepId.CONSENT),
         )
@@ -176,7 +177,7 @@ internal class OrchestratorViewModelTest {
 
     @Test
     fun `Returns AGE_GROUP_NOT_SUPPORTED response when step builder throws SubjectAgeNotSupportedException`() = runTest {
-        coEvery { stepsBuilder.build(any(), any(), any()) } throws SubjectAgeNotSupportedException()
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } throws SubjectAgeNotSupportedException()
 
         viewModel.handleAction(mockk())
 
@@ -189,7 +190,7 @@ internal class OrchestratorViewModelTest {
 
     @Test
     fun `Appends capture and match steps upon receiving SelectSubjectAgeGroupResult`() = runTest {
-        coEvery { stepsBuilder.build(any(), any(), any()) } returns listOf(
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns listOf(
             createMockStep(StepId.SELECT_SUBJECT_AGE),
         )
         coEvery { mapRefusalOrErrorResult(any(), any()) } returns null
@@ -217,7 +218,7 @@ internal class OrchestratorViewModelTest {
 
     @Test
     fun `Updates face matcher step payload when receiving face capture`() = runTest {
-        coEvery { stepsBuilder.build(any(), any(), any()) } returns listOf(
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns listOf(
             createMockStep(StepId.FACE_CAPTURE),
             createMockStep(
                 StepId.FACE_MATCHER,
@@ -240,7 +241,7 @@ internal class OrchestratorViewModelTest {
 
     @Test
     fun `Updates fingerprint matcher step payload when receiving fingerprint capture`() = runTest {
-        coEvery { stepsBuilder.build(any(), any(), any()) } returns listOf(
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns listOf(
             createMockStep(StepId.FINGERPRINT_CAPTURE),
             createMockStep(
                 StepId.FINGERPRINT_MATCHER,
@@ -263,7 +264,7 @@ internal class OrchestratorViewModelTest {
 
     @Test
     fun `Updates the correct fingerprint match step when multiple fingerprint SDKs are used`() = runTest {
-        coEvery { stepsBuilder.build(any(), any(), any()) } returns listOf(
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns listOf(
             createMockStep(
                 StepId.FINGERPRINT_CAPTURE,
                 FingerprintCaptureContract.getParams(
@@ -352,7 +353,7 @@ internal class OrchestratorViewModelTest {
         val originalSteps = listOf(
             createMockStep(StepId.FINGERPRINT_CAPTURE),
         )
-        coEvery { stepsBuilder.build(any(), any(), any()) } returns originalSteps
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns originalSteps
         val savedSteps = listOf(
             createMockStep(StepId.SETUP),
             createMockStep(StepId.CONSENT),
@@ -416,7 +417,7 @@ internal class OrchestratorViewModelTest {
             TokenizableString.Tokenized("moduleId"),
             listOf(mockk<EnrolLastBiometricStepResult>()),
         )
-        coEvery { stepsBuilder.build(any(), any(), any()) } returns listOf(
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns listOf(
             captureStep,
             enrolLastStep,
         )
@@ -465,9 +466,9 @@ internal class OrchestratorViewModelTest {
             every { copy(probeReferenceId = any(), fingerprintSamples = any()) } returns this
         }
 
-        coEvery { stepsBuilder.build(any(), any(), any()) } returns listOf(
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns listOf(
             createMockStep(StepId.FINGERPRINT_CAPTURE),
-            createMockStep(StepId.EXTERNAL_CREDENTIAL, externalCredentialParams)
+            createMockStep(StepId.EXTERNAL_CREDENTIAL, externalCredentialParams),
         )
         coEvery { mapRefusalOrErrorResult(any(), any()) } returns null
 
@@ -475,19 +476,19 @@ internal class OrchestratorViewModelTest {
         viewModel.handleResult(
             FingerprintCaptureResult(
                 fingerprintReferenceId,
-                listOf(fingerprintItem1, fingerprintItem2)
-            )
+                listOf(fingerprintItem1, fingerprintItem2),
+            ),
         )
 
         val expectedFingerprintSamples = listOf(
             MatchParams.FingerprintSample(fingerId1, format1, template1),
-            MatchParams.FingerprintSample(fingerId2, format2, template2)
+            MatchParams.FingerprintSample(fingerId2, format2, template2),
         )
 
         verify {
             externalCredentialParams.copy(
                 probeReferenceId = fingerprintReferenceId,
-                fingerprintSamples = expectedFingerprintSamples
+                fingerprintSamples = expectedFingerprintSamples,
             )
         }
     }
@@ -499,11 +500,11 @@ internal class OrchestratorViewModelTest {
             every { goodMatches } returns listOf(mockk())
         }
 
-        coEvery { stepsBuilder.build(any(), any(), any()) } returns listOf(
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns listOf(
             createMockStep(StepId.FACE_CAPTURE),
             createMockStep(StepId.FINGERPRINT_CAPTURE),
             createMockStep(StepId.FACE_MATCHER),
-            createMockStep(StepId.FINGERPRINT_MATCHER)
+            createMockStep(StepId.FINGERPRINT_MATCHER),
         )
         coEvery { mapRefusalOrErrorResult(any(), any()) } returns null
 
@@ -523,7 +524,7 @@ internal class OrchestratorViewModelTest {
             every { goodMatches } returns listOf(mockk())
         }
 
-        coEvery { stepsBuilder.build(any(), any(), any()) } returns listOf(
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns listOf(
             createMockStep(StepId.FACE_CAPTURE),
             createMockStep(StepId.FACE_MATCHER),
         )
@@ -538,6 +539,40 @@ internal class OrchestratorViewModelTest {
         assertThat(allStepIds).contains(StepId.FACE_MATCHER)
     }
 
+    @Test
+    fun `Passes cached scanned credential to steps builder when external credential step exists in cache`() = runTest {
+        val mockScannedCredential = mockk<ScannedCredential>(relaxed = true)
+        val externalCredentialResult = mockk<ExternalCredentialSearchResult> {
+            every { scannedCredential } returns mockScannedCredential
+        }
+
+        val externalCredentialStep = createMockStep(StepId.EXTERNAL_CREDENTIAL).apply {
+            status = StepStatus.COMPLETED
+            result = externalCredentialResult
+        }
+
+        val cachedSteps = listOf(
+            createMockStep(StepId.SETUP).apply { status = StepStatus.COMPLETED },
+            externalCredentialStep,
+        )
+
+        every { cache.steps } returns cachedSteps
+        coEvery { stepsBuilder.build(any(), any(), any(), any()) } returns listOf(
+            createMockStep(StepId.CONFIRM_IDENTITY),
+        )
+
+        viewModel.handleAction(mockk(relaxed = true))
+
+        coVerify {
+            stepsBuilder.build(
+                action = any(),
+                projectConfiguration = any(),
+                enrolmentSubjectId = any(),
+                cachedScannedCredential = mockScannedCredential,
+            )
+        }
+    }
+
     private fun createMockStep(
         stepId: Int,
         params: StepParams? = null,
diff --git a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateConfirmIdentityResponseUseCaseTest.kt b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateConfirmIdentityResponseUseCaseTest.kt
index e58d0661b6..1db75a3f40 100644
--- a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateConfirmIdentityResponseUseCaseTest.kt
+++ b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateConfirmIdentityResponseUseCaseTest.kt
@@ -21,7 +21,7 @@ class CreateConfirmIdentityResponseUseCaseTest {
         assertThat(
             useCase(
                 listOf(
-                    SelectSubjectResult(true),
+                    SelectSubjectResult(true, mockk()),
                     mockk(),
                 ),
             ),
diff --git a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateEnrolResponseUseCaseTest.kt b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateEnrolResponseUseCaseTest.kt
index a16cb9b9da..8b3480774e 100644
--- a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateEnrolResponseUseCaseTest.kt
+++ b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateEnrolResponseUseCaseTest.kt
@@ -80,7 +80,7 @@ internal class CreateEnrolResponseUseCaseTest {
                     mockk(),
                 ),
                 project = project,
-                enrolmentSubjectId = enrolmentSubjectId
+                enrolmentSubjectId = enrolmentSubjectId,
             ),
         ).isInstanceOf(AppEnrolResponse::class.java)
     }
@@ -95,7 +95,7 @@ internal class CreateEnrolResponseUseCaseTest {
                 moduleId = any(),
                 fingerprintResponse = null,
                 faceResponse = null,
-                externalCredential = null
+                externalCredential = null,
             )
         } throws MissingCaptureException()
 
@@ -105,7 +105,7 @@ internal class CreateEnrolResponseUseCaseTest {
     @Test
     fun `correctly processes external credential result`() = runTest {
         val externalCredentialType = ExternalCredentialType.GhanaIdCard
-        val scannedCredentialMock = mockk<ScannedCredential>() {
+        val scannedCredentialMock = mockk<ScannedCredential> {
             every { credential } returns credentialEncrypted
             every { credentialType } returns externalCredentialType
         }
@@ -129,10 +129,10 @@ internal class CreateEnrolResponseUseCaseTest {
             request = action,
             results = listOf(
                 FingerprintCaptureResult("", emptyList()),
-                credentialSearchResult
+                credentialSearchResult,
             ),
             project = project,
-            enrolmentSubjectId = enrolmentSubjectId
+            enrolmentSubjectId = enrolmentSubjectId,
         )
 
         verify {
@@ -143,7 +143,7 @@ internal class CreateEnrolResponseUseCaseTest {
                 moduleId = any(),
                 fingerprintResponse = any(),
                 faceResponse = null,
-                externalCredential = match { it.value == credentialEncrypted && it.type == externalCredentialType }
+                externalCredential = match { it.value == credentialEncrypted && it.type == externalCredentialType },
             )
         }
     }
diff --git a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCaseTest.kt b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCaseTest.kt
index d91f37517d..bba4630fe7 100644
--- a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCaseTest.kt
+++ b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCaseTest.kt
@@ -7,9 +7,9 @@ import com.simprints.infra.config.store.models.DecisionPolicy
 import com.simprints.infra.config.store.models.FaceConfiguration
 import com.simprints.infra.config.store.models.FingerprintConfiguration
 import com.simprints.infra.events.session.SessionEventRepository
-import com.simprints.infra.orchestration.data.responses.AppIdentifyResponse
 import com.simprints.infra.matching.FaceMatchResult
 import com.simprints.infra.matching.FingerprintMatchResult
+import com.simprints.infra.orchestration.data.responses.AppIdentifyResponse
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
 import io.mockk.every
@@ -200,44 +200,45 @@ class CreateIdentifyResponseUseCaseTest {
         val (faceBigConfidence, bigConfidence) = "faceBigConfidence" to 99f
         val faceMatches = listOf<CredentialMatch>(
             mockk {
-                every { matchResult } returns mockk {
-                    every { subjectId } returns faceSmallConfidence
-                    every { confidence } returns smallConfidence
-                }
+                every { matchResult } returns FaceMatchResult.Item(
+                    subjectId = faceSmallConfidence,
+                    confidence = smallConfidence,
+                )
                 every { faceBioSdk } returns FaceConfiguration.BioSdk.RANK_ONE
                 every { fingerprintBioSdk } returns null
             },
             mockk {
-                every { matchResult } returns mockk {
-                    every { subjectId } returns faceBigConfidence
-                    every { confidence } returns bigConfidence
-                }
+                every { matchResult } returns FaceMatchResult.Item(
+                    subjectId = faceBigConfidence,
+                    confidence = bigConfidence,
+                )
                 every { faceBioSdk } returns FaceConfiguration.BioSdk.RANK_ONE
                 every { fingerprintBioSdk } returns null
-            }
+            },
         )
 
         val fingerprintMatches = listOf<CredentialMatch>(
             mockk {
-                every { matchResult } returns mockk {
-                    every { subjectId } returns "fingerprint"
-                    every { confidence } returns 90f
-                }
+                every { matchResult } returns FingerprintMatchResult.Item(
+                    subjectId = "fingerprintSubjectId",
+                    confidence = 90f,
+                )
                 every { faceBioSdk } returns null
                 every { fingerprintBioSdk } returns FingerprintConfiguration.BioSdk.SECUGEN_SIM_MATCHER
-            }
+            },
         )
 
         val result = useCase(
             mockk {
                 every { identification.maxNbOfReturnedCandidates } returns 5
-                every { face?.getSdkConfiguration((any()))?.decisionPolicy } returns null
-                every { fingerprint?.getSdkConfiguration((any()))?.decisionPolicy } returns null
+                every { face?.getSdkConfiguration(FaceConfiguration.BioSdk.RANK_ONE)?.decisionPolicy } returns DecisionPolicy(20, 50, 100)
+                every { fingerprint?.getSdkConfiguration(FingerprintConfiguration.BioSdk.SECUGEN_SIM_MATCHER)?.decisionPolicy } returns
+                    DecisionPolicy(20, 50, 100)
             },
             results = listOf(
                 mockk<ExternalCredentialSearchResult> {
                     every { matchResults } returns faceMatches + fingerprintMatches
-                }
+                },
             ),
         )
 
@@ -245,50 +246,52 @@ class CreateIdentifyResponseUseCaseTest {
         assertThat(result.identifications.map { it.guid }).isEqualTo(listOf(faceBigConfidence, faceSmallConfidence))
         assertThat(result.identifications.map { it.confidenceScore }).isEqualTo(listOf(bigConfidence.toInt(), smallConfidence.toInt()))
     }
+
     @Test
     fun `Returns only fingerprint credential results sorted by confidence descending`() = runTest {
         val (fingerprintSmallConfidence, smallConfidence) = "fingerprintSmallConfidence" to 50f
         val (fingerprintBigConfidence, bigConfidence) = "fingerprintBigConfidence" to 99f
         val fingerprintMatches = listOf<CredentialMatch>(
             mockk {
-                every { matchResult } returns mockk {
-                    every { subjectId } returns fingerprintSmallConfidence
-                    every { confidence } returns smallConfidence
-                }
+                every { matchResult } returns FingerprintMatchResult.Item(
+                    subjectId = fingerprintSmallConfidence,
+                    confidence = smallConfidence,
+                )
                 every { faceBioSdk } returns null
                 every { fingerprintBioSdk } returns FingerprintConfiguration.BioSdk.SECUGEN_SIM_MATCHER
             },
             mockk {
-                every { matchResult } returns mockk {
-                    every { subjectId } returns fingerprintBigConfidence
-                    every { confidence } returns bigConfidence
-                }
+                every { matchResult } returns FingerprintMatchResult.Item(
+                    subjectId = fingerprintBigConfidence,
+                    confidence = bigConfidence,
+                )
                 every { faceBioSdk } returns null
                 every { fingerprintBioSdk } returns FingerprintConfiguration.BioSdk.SECUGEN_SIM_MATCHER
-            }
+            },
         )
 
         val faceMatches = listOf<CredentialMatch>(
             mockk {
-                every { matchResult } returns mockk {
-                    every { subjectId } returns "face1"
-                    every { confidence } returns 90f
-                }
+                every { matchResult } returns FaceMatchResult.Item(
+                    subjectId = "faceSubjectId",
+                    confidence = 90f,
+                )
                 every { faceBioSdk } returns FaceConfiguration.BioSdk.RANK_ONE
                 every { fingerprintBioSdk } returns null
-            }
+            },
         )
 
         val result = useCase(
             mockk {
                 every { identification.maxNbOfReturnedCandidates } returns 5
-                every { face?.getSdkConfiguration((any()))?.decisionPolicy } returns null
-                every { fingerprint?.getSdkConfiguration((any()))?.decisionPolicy } returns null
+                every { face?.getSdkConfiguration(FaceConfiguration.BioSdk.RANK_ONE)?.decisionPolicy } returns DecisionPolicy(20, 50, 100)
+                every { fingerprint?.getSdkConfiguration(FingerprintConfiguration.BioSdk.SECUGEN_SIM_MATCHER)?.decisionPolicy } returns
+                    DecisionPolicy(20, 50, 100)
             },
             results = listOf(
                 mockk<ExternalCredentialSearchResult> {
                     every { matchResults } returns fingerprintMatches + faceMatches
-                }
+                },
             ),
         )
 
@@ -305,19 +308,19 @@ class CreateIdentifyResponseUseCaseTest {
 
         val credentialFaceMatches = listOf<CredentialMatch>(
             mockk {
-                every { matchResult } returns mockk {
-                    every { subjectId } returns sharedGuid
-                    every { confidence } returns credentialConfidence
-                }
+                every { matchResult } returns FaceMatchResult.Item(
+                    subjectId = sharedGuid,
+                    confidence = credentialConfidence,
+                )
                 every { faceBioSdk } returns FaceConfiguration.BioSdk.RANK_ONE
                 every { fingerprintBioSdk } returns null
-            }
+            },
         )
 
         val result = useCase(
             mockk {
                 every { identification.maxNbOfReturnedCandidates } returns 5
-                every { face?.getSdkConfiguration((any()))?.decisionPolicy } returns DecisionPolicy(20, 50, 100)
+                every { face?.getSdkConfiguration(FaceConfiguration.BioSdk.RANK_ONE)?.decisionPolicy } returns DecisionPolicy(20, 50, 100)
                 every { fingerprint?.getSdkConfiguration((any()))?.decisionPolicy } returns null
             },
             results = listOf(
@@ -326,10 +329,10 @@ class CreateIdentifyResponseUseCaseTest {
                 },
                 FaceMatchResult(
                     listOf(
-                        FaceMatchResult.Item(subjectId = sharedGuid, confidence = faceConfidence)
+                        FaceMatchResult.Item(subjectId = sharedGuid, confidence = faceConfidence),
                     ),
                     FaceConfiguration.BioSdk.RANK_ONE,
-                )
+                ),
             ),
         )
 
@@ -346,20 +349,21 @@ class CreateIdentifyResponseUseCaseTest {
 
         val credentialFingerprintMatches = listOf<CredentialMatch>(
             mockk {
-                every { matchResult } returns mockk {
-                    every { subjectId } returns sharedGuid
-                    every { confidence } returns credentialConfidence
-                }
+                every { matchResult } returns FingerprintMatchResult.Item(
+                    subjectId = sharedGuid,
+                    confidence = credentialConfidence,
+                )
                 every { faceBioSdk } returns null
                 every { fingerprintBioSdk } returns FingerprintConfiguration.BioSdk.SECUGEN_SIM_MATCHER
-            }
+            },
         )
 
         val result = useCase(
             mockk {
                 every { identification.maxNbOfReturnedCandidates } returns 5
                 every { face?.getSdkConfiguration((any()))?.decisionPolicy } returns null
-                every { fingerprint?.getSdkConfiguration((any()))?.decisionPolicy } returns DecisionPolicy(20, 50, 100)
+                every { fingerprint?.getSdkConfiguration(FingerprintConfiguration.BioSdk.SECUGEN_SIM_MATCHER)?.decisionPolicy } returns
+                    DecisionPolicy(20, 50, 100)
             },
             results = listOf(
                 mockk<ExternalCredentialSearchResult> {
@@ -367,10 +371,10 @@ class CreateIdentifyResponseUseCaseTest {
                 },
                 FingerprintMatchResult(
                     listOf(
-                        FingerprintMatchResult.Item(subjectId = sharedGuid, confidence = fingerprintConfidence)
+                        FingerprintMatchResult.Item(subjectId = sharedGuid, confidence = fingerprintConfidence),
                     ),
                     FingerprintConfiguration.BioSdk.SECUGEN_SIM_MATCHER,
-                )
+                ),
             ),
         )
 
diff --git a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCaseTest.kt b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCaseTest.kt
index f74d4cee84..ea0aa5ed5c 100644
--- a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCaseTest.kt
+++ b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCaseTest.kt
@@ -1,11 +1,14 @@
 package com.simprints.feature.orchestrator.usecases.steps
 
+import com.google.common.truth.Truth.assertThat
 import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
 import com.simprints.feature.orchestrator.cache.OrchestratorCache
 import com.simprints.feature.orchestrator.exceptions.SubjectAgeNotSupportedException
 import com.simprints.feature.orchestrator.steps.Step
 import com.simprints.feature.orchestrator.steps.StepId
 import com.simprints.feature.orchestrator.usecases.MapStepsForLastBiometricEnrolUseCase
+import com.simprints.feature.selectsubject.SelectSubjectParams
 import com.simprints.infra.config.store.models.AgeGroup
 import com.simprints.infra.config.store.models.FaceConfiguration
 import com.simprints.infra.config.store.models.Finger
@@ -47,6 +50,9 @@ class BuildStepsUseCaseTest {
     @RelaxedMockK
     private lateinit var nec: FingerprintConfiguration.FingerprintSdkConfiguration
 
+    @RelaxedMockK
+    private lateinit var cachedScannedCredential: ScannedCredential
+
     private lateinit var useCase: BuildStepsUseCase
     private lateinit var enrolmentSubjectId: String
 
@@ -112,7 +118,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.EnrolActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -132,7 +138,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.EnrolActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -151,7 +157,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.EnrolActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -175,7 +181,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.EnrolActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -195,7 +201,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.IdentifyActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -218,7 +224,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.IdentifyActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -237,7 +243,7 @@ class BuildStepsUseCaseTest {
         every { action.getSubjectAgeIfAvailable() } returns null
         every { projectConfiguration.experimental().idPoolValidationEnabled } returns true
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -260,7 +266,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.VerifyActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -284,7 +290,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.VerifyActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -303,7 +309,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.ConfirmIdentityActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -322,7 +328,7 @@ class BuildStepsUseCaseTest {
             Step(StepId.FACE_CAPTURE, mockk(relaxed = true), mockk(relaxed = true), mockk(relaxed = true)),
         )
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -341,7 +347,7 @@ class BuildStepsUseCaseTest {
             Step(StepId.FACE_CAPTURE, mockk(relaxed = true), mockk(relaxed = true), mockk(relaxed = true)),
         )
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -362,7 +368,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.EnrolActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -383,7 +389,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.IdentifyActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -404,7 +410,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.VerifyActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -426,7 +432,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.EnrolActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns 25 // Subject age within the supported range
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -450,7 +456,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.EnrolActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns 25 // Subject age within the supported range
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -476,7 +482,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.IdentifyActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns 25 // Subject age within the supported range
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -503,7 +509,7 @@ class BuildStepsUseCaseTest {
             every { getSubjectAgeIfAvailable() } returns 25
             every { biometricDataSource } returns "COMMCARE"
         }
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -529,7 +535,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.VerifyActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns 25 // Subject age within the supported range
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -556,7 +562,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.VerifyActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns 25 // Subject age within the supported range
         every { action.biometricDataSource } returns "COMMCARE"
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -584,7 +590,7 @@ class BuildStepsUseCaseTest {
         every { action.getSubjectAgeIfAvailable() } returns 20 // Subject age not supported by any SDK
 
         assertThrows(SubjectAgeNotSupportedException::class.java) {
-            runBlocking { useCase.build(action, projectConfiguration, enrolmentSubjectId) }
+            runBlocking { useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential) }
         }
     }
 
@@ -600,7 +606,7 @@ class BuildStepsUseCaseTest {
         every { action.getSubjectAgeIfAvailable() } returns 20 // Subject age not supported by any SDK
 
         assertThrows(SubjectAgeNotSupportedException::class.java) {
-            runBlocking { useCase.build(action, projectConfiguration, enrolmentSubjectId) }
+            runBlocking { useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential) }
         }
     }
 
@@ -616,7 +622,7 @@ class BuildStepsUseCaseTest {
         every { action.getSubjectAgeIfAvailable() } returns 20 // Subject age not supported by any SDK
 
         assertThrows(SubjectAgeNotSupportedException::class.java) {
-            runBlocking { useCase.build(action, projectConfiguration, enrolmentSubjectId) }
+            runBlocking { useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential) }
         }
     }
 
@@ -766,7 +772,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.EnrolActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         // Should not contain EXTERNAL_CREDENTIAL step
         assertStepOrder(
@@ -787,7 +793,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.EnrolActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -808,7 +814,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.IdentifyActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         assertStepOrder(
             steps,
@@ -832,7 +838,7 @@ class BuildStepsUseCaseTest {
         val action = mockk<ActionRequest.VerifyActionRequest>(relaxed = true)
         every { action.getSubjectAgeIfAvailable() } returns null
 
-        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId)
+        val steps = useCase.build(action, projectConfiguration, enrolmentSubjectId, cachedScannedCredential)
 
         // Should not contain EXTERNAL_CREDENTIAL step for VERIFY flow
         assertStepOrder(
@@ -848,4 +854,35 @@ class BuildStepsUseCaseTest {
             StepId.FACE_MATCHER,
         )
     }
+
+    @Test
+    fun `build confirm identity action - cachedScannedCredential is passed correctly`() = runTest {
+        val testProjectId = "projectId"
+        val guid = "guid"
+        val projectConfiguration = mockCommonProjectConfiguration()
+        val cachedScannedCredential = mockk<ScannedCredential>(relaxed = true)
+
+        val action = mockk<ActionRequest.ConfirmIdentityActionRequest>(relaxed = true) {
+            every { projectId } returns testProjectId
+            every { selectedGuid } returns guid
+            every { getSubjectAgeIfAvailable() } returns null
+        }
+
+        val steps = useCase.build(
+            action = action,
+            projectConfiguration = projectConfiguration,
+            enrolmentSubjectId = enrolmentSubjectId,
+            cachedScannedCredential = cachedScannedCredential,
+        )
+
+        assertStepOrder(steps, StepId.CONFIRM_IDENTITY)
+
+        val confirmIdentityStep = steps.first()
+        val params = confirmIdentityStep.params as? SelectSubjectParams
+
+        assertThat(params).isNotNull()
+        assertThat(params?.projectId).isEqualTo(testProjectId)
+        assertThat(params?.subjectId).isEqualTo(guid)
+        assertThat(params?.scannedCredential).isEqualTo(cachedScannedCredential)
+    }
 }
diff --git a/feature/select-subject/build.gradle.kts b/feature/select-subject/build.gradle.kts
index 948238d649..b7b9aaaeec 100644
--- a/feature/select-subject/build.gradle.kts
+++ b/feature/select-subject/build.gradle.kts
@@ -10,4 +10,8 @@ android {
 dependencies {
     implementation(project(":infra:events"))
     implementation(project(":infra:auth-store"))
+    implementation(project(":infra:enrolment-records:repository"))
+    implementation(project(":infra:config-sync"))
+    implementation(project(":infra:config-store"))
+    implementation(project(":feature:external-credential"))
 }
diff --git a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectContract.kt b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectContract.kt
index 920e368487..d56ce2d789 100644
--- a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectContract.kt
+++ b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectContract.kt
@@ -1,10 +1,13 @@
 package com.simprints.feature.selectsubject
 
+import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
+
 object SelectSubjectContract {
     val DESTINATION = R.id.selectSubjectFragment
 
     fun getParams(
         projectId: String,
         subjectId: String,
-    ) = SelectSubjectParams(projectId, subjectId)
+        scannedCredential: ScannedCredential?
+    ) = SelectSubjectParams(projectId, subjectId, scannedCredential)
 }
diff --git a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectParams.kt b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectParams.kt
index ecb6e06887..538a185b7e 100644
--- a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectParams.kt
+++ b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectParams.kt
@@ -2,9 +2,11 @@ package com.simprints.feature.selectsubject
 
 import androidx.annotation.Keep
 import com.simprints.core.domain.step.StepParams
+import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
 
 @Keep
 data class SelectSubjectParams(
     val projectId: String,
     val subjectId: String,
+    val scannedCredential: ScannedCredential?,
 ) : StepParams
diff --git a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectResult.kt b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectResult.kt
index 2cf2df730e..ddd60cd628 100644
--- a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectResult.kt
+++ b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectResult.kt
@@ -2,8 +2,10 @@ package com.simprints.feature.selectsubject
 
 import androidx.annotation.Keep
 import com.simprints.core.domain.step.StepResult
+import com.simprints.core.domain.tokenization.TokenizableString
 
 @Keep
 data class SelectSubjectResult(
-    val success: Boolean,
+    val isSubjectIdSaved: Boolean,
+    val savedCredential: TokenizableString.Tokenized?,
 ) : StepResult
diff --git a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/model/SelectSubjectState.kt b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/model/SelectSubjectState.kt
new file mode 100644
index 0000000000..d2c3f93dc0
--- /dev/null
+++ b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/model/SelectSubjectState.kt
@@ -0,0 +1,23 @@
+package com.simprints.feature.selectsubject.model
+
+import androidx.annotation.Keep
+import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
+import com.simprints.core.domain.tokenization.TokenizableString
+import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
+
+@Keep
+@ExcludedFromGeneratedTestCoverageReports("Data struct")
+internal sealed class SelectSubjectState {
+    data object SavingSubjectId : SelectSubjectState()
+
+    data object SavingExternalCredential : SelectSubjectState()
+
+    data class CredentialDialogDisplayed(
+        val scannedCredential: ScannedCredential,
+        val displayedCredential: TokenizableString.Raw,
+    ) : SelectSubjectState()
+
+    companion object {
+        val EMPTY = SelectSubjectState.SavingSubjectId
+    }
+}
diff --git a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectFragment.kt b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectFragment.kt
index c4cf6ecd24..c4a7e694dd 100644
--- a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectFragment.kt
+++ b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectFragment.kt
@@ -1,24 +1,55 @@
 package com.simprints.feature.selectsubject.screen
 
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.ObjectAnimator
 import android.os.Bundle
 import android.view.View
+import android.view.animation.DecelerateInterpolator
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.simprints.core.domain.tokenization.TokenizableString
+import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
+import com.simprints.feature.externalcredential.view.ScannedCredentialDialog
 import com.simprints.feature.selectsubject.R
 import com.simprints.feature.selectsubject.SelectSubjectParams
 import com.simprints.feature.selectsubject.SelectSubjectResult
+import com.simprints.feature.selectsubject.databinding.FragmentSelectSubjectBinding
+import com.simprints.feature.selectsubject.model.SelectSubjectState
 import com.simprints.infra.logging.LoggingConstants.CrashReportTag.ORCHESTRATION
 import com.simprints.infra.logging.Simber
 import com.simprints.infra.uibase.navigation.finishWithResult
 import com.simprints.infra.uibase.navigation.navigationParams
 import com.simprints.infra.uibase.view.applySystemBarInsets
+import com.simprints.infra.uibase.viewbinding.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
 @AndroidEntryPoint
 internal class SelectSubjectFragment : Fragment(R.layout.fragment_select_subject) {
-    private val viewModel: SelectSubjectViewModel by viewModels()
     private val params: SelectSubjectParams by navigationParams()
+    private val binding by viewBinding(FragmentSelectSubjectBinding::bind)
+    private val viewModel by viewModels<SelectSubjectViewModel> {
+        object : ViewModelProvider.Factory {
+            override fun <T : ViewModel> create(modelClass: Class<T>): T {
+                @Suppress("UNCHECKED_CAST")
+                return viewModelFactory.create(params) as T
+            }
+        }
+    }
+
+    private var isAnimatingCompletion: Boolean = false
+    private var pendingFinishAction: (() -> Unit)? = null
+    private var progressAnimator: ObjectAnimator? = null
+
+    @Inject
+    lateinit var viewModelFactory: SelectSubjectViewModel.Factory
+    private var dialog: BottomSheetDialog? = null
 
     override fun onViewCreated(
         view: View,
@@ -28,13 +59,84 @@ internal class SelectSubjectFragment : Fragment(R.layout.fragment_select_subject
         applySystemBarInsets(view)
         Simber.i("SelectSubjectFragment started", tag = ORCHESTRATION)
 
+        initObservers()
+    }
+
+    override fun onDestroyView() {
+        clearAnimations()
+        dismissDialog()
+        super.onDestroyView()
+    }
+
+    private fun clearAnimations() {
+        pendingFinishAction = null
+        isAnimatingCompletion = false
+        progressAnimator?.cancel()
+    }
+
+    private fun dismissDialog() {
+        dialog?.dismiss()
+        dialog = null
+    }
+
+    private fun initObservers() {
+        viewModel.stateLiveData.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                is SelectSubjectState.CredentialDialogDisplayed -> {
+                    displayCredentialDialog(state.scannedCredential, state.displayedCredential)
+                }
+
+                SelectSubjectState.SavingExternalCredential -> renderSavingCredential()
+                SelectSubjectState.SavingSubjectId -> renderSavingSubjectId()
+            }
+        }
         viewModel.finish.observe(viewLifecycleOwner) {
             it.getContentIfNotHandled()?.let(::finishWithResult)
         }
-        viewModel.saveGuidSelection(params.projectId, params.subjectId)
     }
 
-    private fun finishWithResult(success: Boolean) {
-        findNavController().finishWithResult(this, SelectSubjectResult(success))
+    private fun renderSavingCredential() = with(binding) {
+        saveCredentialProgressContainer.isVisible = true
+        confirmationSentContainer.isVisible = false
+        startCredentialSaveAnimation()
+    }
+
+    private fun renderSavingSubjectId() = with(binding) {
+        saveCredentialProgressContainer.isVisible = false
+        confirmationSentContainer.isVisible = true
+    }
+
+    private fun displayCredentialDialog(scannedCredential: ScannedCredential, displayedCredential: TokenizableString.Raw) {
+        dialog = ScannedCredentialDialog(
+            context = requireActivity(),
+            credential = scannedCredential,
+            displayedCredential = displayedCredential,
+            onConfirm = { viewModel.saveCredential(scannedCredential) },
+            onSkip = (viewModel::finishWithoutSavingCredential)
+        ).also(ScannedCredentialDialog::show)
+    }
+
+    private fun startCredentialSaveAnimation() = with(binding) {
+        progressAnimator = ObjectAnimator.ofInt(progressBar, "progress", 0, 100).apply {
+            this.duration = PROGRESS_BAR_DURATION_MS
+            interpolator = DecelerateInterpolator()
+            addListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    isAnimatingCompletion = false
+                    // Execute any pending action after the animation. Currently used is for next fragment navigation
+                    pendingFinishAction?.invoke()
+                    pendingFinishAction = null
+                }
+            })
+        }
+        progressAnimator?.start()
+    }
+
+    private fun finishWithResult(result: SelectSubjectResult) {
+        findNavController().finishWithResult(this, result)
+    }
+
+    companion object {
+        private const val PROGRESS_BAR_DURATION_MS = 1500L
     }
 }
diff --git a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
index 14f4b02a4d..49fac1d07d 100644
--- a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
+++ b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
@@ -4,52 +4,134 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.simprints.core.SessionCoroutineScope
+import com.simprints.core.domain.tokenization.TokenizableString
 import com.simprints.core.livedata.LiveDataEventWithContent
 import com.simprints.core.livedata.send
 import com.simprints.core.tools.time.TimeHelper
+import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
+import com.simprints.feature.selectsubject.SelectSubjectParams
+import com.simprints.feature.selectsubject.SelectSubjectResult
+import com.simprints.feature.selectsubject.model.SelectSubjectState
+import com.simprints.feature.selectsubject.usecase.AddExternalCredentialToSubjectUseCase
 import com.simprints.infra.authstore.AuthStore
+import com.simprints.infra.config.store.models.TokenKeyType
+import com.simprints.infra.config.store.tokenization.TokenizationProcessor
+import com.simprints.infra.config.sync.ConfigManager
+import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository
+import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery
 import com.simprints.infra.events.event.domain.models.GuidSelectionEvent
 import com.simprints.infra.events.session.SessionEventRepository
 import com.simprints.infra.logging.LoggingConstants.CrashReportTag.SESSION
 import com.simprints.infra.logging.Simber
-import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
-@HiltViewModel
-internal class SelectSubjectViewModel @Inject constructor(
+internal class SelectSubjectViewModel @AssistedInject constructor(
+    @Assisted private val params: SelectSubjectParams,
     private val timeHelper: TimeHelper,
     private val authStore: AuthStore,
     private val eventRepository: SessionEventRepository,
+    private val configManager: ConfigManager,
+    private val addExternalCredentialToSubjectUseCase: AddExternalCredentialToSubjectUseCase,
+    private val enrolmentRecordRepository: EnrolmentRecordRepository,
+    private val tokenizationProcessor: TokenizationProcessor,
     @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
 ) : ViewModel() {
-    val finish: LiveData<LiveDataEventWithContent<Boolean>>
+    @AssistedFactory
+    interface Factory {
+        fun create(selectSubjectParams: SelectSubjectParams): SelectSubjectViewModel
+    }
+
+    private var state: SelectSubjectState = SelectSubjectState.EMPTY
+        set(value) {
+            field = value
+            _stateLiveData.postValue(value)
+        }
+    private val _stateLiveData = MutableLiveData<SelectSubjectState>()
+    val stateLiveData: LiveData<SelectSubjectState> = _stateLiveData
+    val finish: LiveData<LiveDataEventWithContent<SelectSubjectResult>>
         get() = _finish
-    private var _finish = MutableLiveData<LiveDataEventWithContent<Boolean>>()
+    private var _finish = MutableLiveData<LiveDataEventWithContent<SelectSubjectResult>>()
 
-    fun saveGuidSelection(
+    private fun updateState(state: (SelectSubjectState) -> SelectSubjectState) {
+        this.state = state(this.state)
+    }
+
+    init {
+        sessionCoroutineScope.launch {
+            saveGuidSelection(projectId = params.projectId, subjectId = params.subjectId, scannedCredential = params.scannedCredential)
+        }
+    }
+
+    private suspend fun saveGuidSelection(
         projectId: String,
         subjectId: String,
+        scannedCredential: ScannedCredential?,
     ) {
+        updateState { SelectSubjectState.SavingSubjectId }
         if (authStore.isProjectIdSignedIn(projectId)) {
-            saveSelectionEvent(subjectId)
+            val isSubjectIdSaved = saveSelectionEvent(subjectId)
+            if (isSubjectIdSaved && scannedCredential != null) {
+                val credential = scannedCredential.credential
+                val project = configManager.getProject(authStore.signedInProjectId)
+                val shouldDisplayAddCredentialDialog = enrolmentRecordRepository
+                    .load(
+                        SubjectQuery(
+                            projectId = project.id,
+                            subjectId = subjectId,
+                            externalCredential = credential,
+                        ),
+                    ).isEmpty()
+                if (shouldDisplayAddCredentialDialog) {
+                    val decrypted = tokenizationProcessor.decrypt(
+                        encrypted = credential,
+                        tokenKeyType = TokenKeyType.ExternalCredential,
+                        project = project,
+                    ) as TokenizableString.Raw
+                    updateState {
+                        SelectSubjectState.CredentialDialogDisplayed(scannedCredential = scannedCredential, displayedCredential = decrypted)
+                    }
+                }
+            } else {
+                _finish.send(SelectSubjectResult(isSubjectIdSaved = isSubjectIdSaved, savedCredential = null))
+            }
         } else {
-            _finish.send(false)
+            _finish.send(SelectSubjectResult(isSubjectIdSaved = false, savedCredential = null))
+        }
+    }
+
+    fun saveCredential(scannedCredential: ScannedCredential) {
+        updateState { SelectSubjectState.SavingExternalCredential }
+        sessionCoroutineScope.launch {
+            val addedCredential = try {
+                addExternalCredentialToSubjectUseCase(scannedCredential, subjectId = params.subjectId, projectId = params.projectId)
+                scannedCredential
+            } catch (e: Exception) {
+                Simber.e("Failed to attach scanned credential", e, tag = SESSION)
+                null
+            }
+            _finish.send(SelectSubjectResult(isSubjectIdSaved = true, savedCredential = addedCredential?.credential))
         }
     }
 
-    private fun saveSelectionEvent(subjectId: String) = sessionCoroutineScope.launch {
+    fun finishWithoutSavingCredential() {
+        _finish.send(SelectSubjectResult(isSubjectIdSaved = true, savedCredential = null))
+    }
+
+    private suspend fun saveSelectionEvent(subjectId: String): Boolean {
         try {
             val event = GuidSelectionEvent(timeHelper.now(), subjectId)
             eventRepository.addOrUpdateEvent(event)
 
             Simber.i("Added Guid Selection Event", tag = SESSION)
-            _finish.send(true)
+            return true
         } catch (t: Throwable) {
             // It doesn't matter if it was an error, we always return a result
             Simber.e("Failed to save Guid Selection Event", t, tag = SESSION)
-            _finish.send(false)
+            return false
         }
     }
 }
diff --git a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/usecase/AddExternalCredentialToSubjectUseCase.kt b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/usecase/AddExternalCredentialToSubjectUseCase.kt
new file mode 100644
index 0000000000..4e181f8ebc
--- /dev/null
+++ b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/usecase/AddExternalCredentialToSubjectUseCase.kt
@@ -0,0 +1,27 @@
+package com.simprints.feature.selectsubject.usecase
+
+import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
+import com.simprints.feature.externalcredential.screens.search.model.toExternalCredential
+import com.simprints.infra.config.sync.ConfigManager
+import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository
+import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction
+import javax.inject.Inject
+
+internal class AddExternalCredentialToSubjectUseCase @Inject() constructor(
+    private val enrolmentRecordRepository: EnrolmentRecordRepository,
+    private val configManager: ConfigManager,
+) {
+    suspend operator fun invoke(scannedCredential: ScannedCredential, subjectId: String, projectId: String) {
+        val project = configManager.getProject(projectId)
+        val updateActions = listOf(
+            SubjectAction.Update(
+                subjectId = subjectId,
+                externalCredentialsToAdd = listOf(scannedCredential.toExternalCredential(subjectId)),
+                faceSamplesToAdd = emptyList(),
+                fingerprintSamplesToAdd = emptyList(),
+                referenceIdsToRemove = emptyList()
+            )
+        )
+        enrolmentRecordRepository.performActions(updateActions, project)
+    }
+}
diff --git a/feature/select-subject/src/main/res/drawable/rounded_image_bg.xml b/feature/select-subject/src/main/res/drawable/rounded_image_bg.xml
new file mode 100644
index 0000000000..9f0bfd180b
--- /dev/null
+++ b/feature/select-subject/src/main/res/drawable/rounded_image_bg.xml
@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="16dp" />
+</shape>
diff --git a/feature/select-subject/src/main/res/layout/fragment_select_subject.xml b/feature/select-subject/src/main/res/layout/fragment_select_subject.xml
index 6f302072f9..c15d3c0cb1 100644
--- a/feature/select-subject/src/main/res/layout/fragment_select_subject.xml
+++ b/feature/select-subject/src/main/res/layout/fragment_select_subject.xml
@@ -6,44 +6,78 @@
     android:layout_height="match_parent"
     android:background="@color/simprints_blue">
 
-    <TextView
-        android:id="@+id/confirmationSent"
-        style="@style/Text.Headline5.White"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawablePadding="8dp"
-        android:text="@string/select_subject_confirmation_sent"
-        app:drawableStartCompat="@drawable/ic_checked_green_large"
-        app:layout_constraintBottom_toTopOf="@+id/redirectingBack"
+    <ImageView
+        android:id="@+id/loginImageViewLogo"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/simprints_logo"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/redirectingBack"
-        style="@style/Text.Subtitle1.White"
-        android:layout_width="wrap_content"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/confirmationSentContainer"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical"
         android:layout_margin="16dp"
-        android:text="@string/select_subject_redirecting_back"
-        app:layout_constraintBottom_toTopOf="@+id/loginImageViewLogo"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/confirmationSent"
-        tools:visibility="visible" />
+        app:layout_constraintTop_toBottomOf="@+id/loginImageViewLogo"
+        tools:visibility="visible">
 
-    <ImageView
-        android:id="@+id/loginImageViewLogo"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:src="@drawable/simprints_logo"
-        app:layout_constraintBottom_toBottomOf="parent"
+        <TextView
+            style="@style/Text.Headline5.White"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawablePadding="8dp"
+            android:text="@string/select_subject_confirmation_sent"
+            app:drawableStartCompat="@drawable/ic_checked_green_large"
+            app:layout_constraintBottom_toTopOf="@+id/redirectingBack"
+            tools:visibility="visible" />
+
+        <TextView
+            android:id="@+id/redirectingBack"
+            style="@style/Text.Subtitle1.White"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/select_subject_redirecting_back"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/saveCredentialProgressContainer"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="@dimen/padding_default"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/redirectingBack" />
+        app:layout_constraintTop_toBottomOf="@+id/loginImageViewLogo"
+        tools:layout_constraintTop_toBottomOf="@+id/confirmationSentContainer"
+        tools:visibility="visible">
+
+        <com.google.android.material.progressindicator.LinearProgressIndicator
+            android:id="@+id/progressBar"
+            style="@style/Widget.Simprints.LinearProgressIndicator.White.Large"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            tools:progress="43" />
+
+        <TextView
+            android:id="@+id/credentialSaveProgressText"
+            style="@style/Text.Headline5.White"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            tools:text="Adding document to the record" />
+
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/infra/config-store/src/main/java/com/simprints/infra/config/store/models/ProjectConfiguration.kt b/infra/config-store/src/main/java/com/simprints/infra/config/store/models/ProjectConfiguration.kt
index 35f8f52496..dbed745a4c 100644
--- a/infra/config-store/src/main/java/com/simprints/infra/config/store/models/ProjectConfiguration.kt
+++ b/infra/config-store/src/main/java/com/simprints/infra/config/store/models/ProjectConfiguration.kt
@@ -38,8 +38,7 @@ fun ProjectConfiguration.canSyncBiometricDataToSimprints(): Boolean =
 fun ProjectConfiguration.canSyncAnalyticsDataToSimprints(): Boolean =
     synchronization.up.simprints.kind == UpSynchronizationConfiguration.UpSynchronizationKind.ONLY_ANALYTICS
 
-fun ProjectConfiguration.isSimprintsEventDownSyncAllowed(): Boolean =
-    synchronization.down.simprints != null &&
+fun ProjectConfiguration.isSimprintsEventDownSyncAllowed(): Boolean = synchronization.down.simprints != null &&
     synchronization.down.simprints.frequency != Frequency.ONLY_PERIODICALLY_UP_SYNC
 
 fun ProjectConfiguration.isCommCareEventDownSyncAllowed(): Boolean = synchronization.down.commCare != null
@@ -89,9 +88,7 @@ fun ProjectConfiguration.isProjectWithPeriodicallyUpSync(): Boolean =
 
 fun ProjectConfiguration.isModuleSelectionAvailable(): Boolean = isProjectWithModuleSync() && !isProjectWithPeriodicallyUpSync()
 
-fun ProjectConfiguration.determineFaceSDKs(
-    ageGroup: AgeGroup?
-): List<FaceConfiguration.BioSdk> {
+fun ProjectConfiguration.determineFaceSDKs(ageGroup: AgeGroup?): List<FaceConfiguration.BioSdk> {
     if (!isAgeRestricted()) {
         return face?.allowedSDKs.orEmpty()
     }
@@ -108,9 +105,7 @@ fun ProjectConfiguration.determineFaceSDKs(
     }
 }
 
-fun ProjectConfiguration.determineFingerprintSDKs(
-    ageGroup: AgeGroup?
-): List<FingerprintConfiguration.BioSdk> {
+fun ProjectConfiguration.determineFingerprintSDKs(ageGroup: AgeGroup?): List<FingerprintConfiguration.BioSdk> {
     if (!isAgeRestricted()) {
         return fingerprint?.allowedSDKs.orEmpty()
     }
diff --git a/infra/config-store/src/test/java/com/simprints/infra/config/store/models/ProjectConfigurationTest.kt b/infra/config-store/src/test/java/com/simprints/infra/config/store/models/ProjectConfigurationTest.kt
index 5adc872fe3..01cb447485 100644
--- a/infra/config-store/src/test/java/com/simprints/infra/config/store/models/ProjectConfigurationTest.kt
+++ b/infra/config-store/src/test/java/com/simprints/infra/config/store/models/ProjectConfigurationTest.kt
@@ -232,7 +232,7 @@ class ProjectConfigurationTest {
         val config = projectConfiguration.copy(
             synchronization = synchronizationConfiguration.copy(
                 down = synchronizationConfiguration.down.copy(
-                    simprints = null
+                    simprints = null,
                 ),
             ),
         )
@@ -245,7 +245,7 @@ class ProjectConfigurationTest {
         val config = projectConfiguration.copy(
             synchronization = synchronizationConfiguration.copy(
                 down = synchronizationConfiguration.down.copy(
-                    commCare = DownSynchronizationConfiguration.CommCareDownSynchronizationConfiguration
+                    commCare = DownSynchronizationConfiguration.CommCareDownSynchronizationConfiguration,
                 ),
             ),
         )
@@ -258,7 +258,7 @@ class ProjectConfigurationTest {
         val config = projectConfiguration.copy(
             synchronization = synchronizationConfiguration.copy(
                 down = synchronizationConfiguration.down.copy(
-                    commCare = null
+                    commCare = null,
                 ),
             ),
         )
@@ -695,7 +695,10 @@ class ProjectConfigurationTest {
         ),
     )
 
-    private fun createAgeRestrictedFaceConfig(rankOneRange: AgeGroup, simFaceRange: AgeGroup) = projectConfiguration.copy(
+    private fun createAgeRestrictedFaceConfig(
+        rankOneRange: AgeGroup,
+        simFaceRange: AgeGroup,
+    ) = projectConfiguration.copy(
         face = faceConfiguration.copy(
             rankOne = faceSdkConfiguration.copy(allowedAgeRange = rankOneRange),
             simFace = faceSdkConfiguration.copy(allowedAgeRange = simFaceRange),
@@ -710,7 +713,10 @@ class ProjectConfigurationTest {
         ),
     )
 
-    private fun createAgeRestrictedFingerprintConfig(secugenRange: AgeGroup, necRange: AgeGroup) = projectConfiguration.copy(
+    private fun createAgeRestrictedFingerprintConfig(
+        secugenRange: AgeGroup,
+        necRange: AgeGroup,
+    ) = projectConfiguration.copy(
         fingerprint = fingerprintConfiguration.copy(
             secugenSimMatcher = fingerprintConfiguration.secugenSimMatcher?.copy(allowedAgeRange = secugenRange),
             nec = fingerprintConfiguration.nec?.copy(allowedAgeRange = necRange),
diff --git a/infra/core/src/main/java/com/simprints/core/domain/externalcredential/ExternalCredentialType.kt b/infra/core/src/main/java/com/simprints/core/domain/externalcredential/ExternalCredentialType.kt
index 1481ce4af3..f813d876d5 100644
--- a/infra/core/src/main/java/com/simprints/core/domain/externalcredential/ExternalCredentialType.kt
+++ b/infra/core/src/main/java/com/simprints/core/domain/externalcredential/ExternalCredentialType.kt
@@ -1,5 +1,7 @@
 package com.simprints.core.domain.externalcredential
 
 enum class ExternalCredentialType {
-    NHISCard, GhanaIdCard, QRCode
+    NHISCard,
+    GhanaIdCard,
+    QRCode,
 }
diff --git a/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/RoomEnrolmentRecordLocalDataSource.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/RoomEnrolmentRecordLocalDataSource.kt
index f954dcd052..e215a7fcc7 100644
--- a/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/RoomEnrolmentRecordLocalDataSource.kt
+++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/RoomEnrolmentRecordLocalDataSource.kt
@@ -307,7 +307,8 @@ internal class RoomEnrolmentRecordLocalDataSource @Inject constructor(
             require(
                 referencesToDelete.size != dbSubject.biometricTemplates.size ||
                     action.faceSamplesToAdd.isNotEmpty() ||
-                    action.fingerprintSamplesToAdd.isNotEmpty(),
+                    action.fingerprintSamplesToAdd.isNotEmpty() ||
+                    action.externalCredentialsToAdd.isNotEmpty()
             ) {
                 val errorMsg =
                     "Cannot delete all samples for subject ${action.subjectId} without adding new ones"
diff --git a/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/local/RoomEnrolmentRecordLocalDataSourceTest.kt b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/local/RoomEnrolmentRecordLocalDataSourceTest.kt
index 464f53e411..7c8c63193b 100644
--- a/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/local/RoomEnrolmentRecordLocalDataSourceTest.kt
+++ b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/local/RoomEnrolmentRecordLocalDataSourceTest.kt
@@ -76,10 +76,9 @@ class RoomEnrolmentRecordLocalDataSourceTest {
         id = "id",
         value = "value".asTokenizableEncrypted(),
         subjectId = "subjectId",
-        type = ExternalCredentialType.NHISCard
+        type = ExternalCredentialType.NHISCard,
     )
 
-
     // Samples defined first
     private val faceSample1 = FaceSample(
         template = byteArrayOf(1, 2, 3),
@@ -131,7 +130,7 @@ class RoomEnrolmentRecordLocalDataSourceTest {
         fingerprintSamples = emptyList(),
         createdAt = date,
         updatedAt = date,
-        externalCredentials = listOf(getExternalCredential("subj-001"))
+        externalCredentials = listOf(getExternalCredential("subj-001")),
     )
     private val subject2P1WithFinger = Subject(
         subjectId = "subj-002",
@@ -142,7 +141,7 @@ class RoomEnrolmentRecordLocalDataSourceTest {
         fingerprintSamples = listOf(fingerprintSample1),
         createdAt = date,
         updatedAt = date,
-        externalCredentials = listOf(getExternalCredential("subj-002"))
+        externalCredentials = listOf(getExternalCredential("subj-002")),
     )
     private val subject3P1WithBoth = Subject(
         subjectId = "subj-003",
@@ -151,7 +150,7 @@ class RoomEnrolmentRecordLocalDataSourceTest {
         moduleId = MODULE_2_ID,
         faceSamples = listOf(faceSample2),
         fingerprintSamples = listOf(fingerprintSample2),
-        externalCredentials = listOf(getExternalCredential("subj-003"))
+        externalCredentials = listOf(getExternalCredential("subj-003")),
     )
     private val subject4P2WithBoth = Subject(
         subjectId = "subj-004",
@@ -162,7 +161,7 @@ class RoomEnrolmentRecordLocalDataSourceTest {
         fingerprintSamples = listOf(fingerprintSample3),
         createdAt = date,
         updatedAt = date,
-        externalCredentials = listOf(getExternalCredential("subj-004"))
+        externalCredentials = listOf(getExternalCredential("subj-004")),
     )
     private val subject5P2WithFace = Subject(
         // Added subject
@@ -174,7 +173,7 @@ class RoomEnrolmentRecordLocalDataSourceTest {
         fingerprintSamples = emptyList(),
         createdAt = Date(date.time + 1000), // Slightly different time
         updatedAt = Date(date.time + 1000),
-        externalCredentials = listOf(getExternalCredential("subj-005"))
+        externalCredentials = listOf(getExternalCredential("subj-005")),
     )
     private val subject6P2WithFinger = Subject(
         // Added subject
@@ -186,7 +185,7 @@ class RoomEnrolmentRecordLocalDataSourceTest {
         fingerprintSamples = listOf(fingerprintSample3.copy(id = UUID.randomUUID().toString())),
         createdAt = Date(date.time + 2000), // Different time
         updatedAt = Date(date.time + 2000),
-        externalCredentials = listOf(getExternalCredential("subj-006"))
+        externalCredentials = listOf(getExternalCredential("subj-006")),
     )
     private val subjectInvalidNoSamples = Subject(
         subjectId = "subj-invalid",
@@ -195,7 +194,7 @@ class RoomEnrolmentRecordLocalDataSourceTest {
         moduleId = MODULE_1_ID,
         createdAt = date,
         updatedAt = date,
-        externalCredentials = listOf(getExternalCredential("subj-invalid"))
+        externalCredentials = listOf(getExternalCredential("subj-invalid")),
     )
 
     private val project: Project = mockk()
@@ -242,7 +241,7 @@ class RoomEnrolmentRecordLocalDataSourceTest {
         id = "id",
         value = "value".asTokenizableEncrypted(),
         subjectId = subjectId,
-        type = ExternalCredentialType.NHISCard
+        type = ExternalCredentialType.NHISCard,
     )
 
     private suspend fun setupInitialData() {
@@ -1641,4 +1640,35 @@ class RoomEnrolmentRecordLocalDataSourceTest {
         // Then
         verify { mockedDb.close() }
     }
+
+    @Test
+    fun `performActions - Update - should succeed when removing all samples but adding external credentials`() = runTest {
+        dataSource.performActions(listOf(SubjectAction.Creation(subject3P1WithBoth)), project)
+        val initial = dataSource.load(SubjectQuery(subjectId = subject3P1WithBoth.subjectId)).first()
+        assertThat(initial.faceSamples).hasSize(1)
+        assertThat(initial.fingerprintSamples).hasSize(1)
+        assertThat(initial.externalCredentials).hasSize(1)
+
+        val newExternalCredential = ExternalCredential(
+            id = "new-credential-id",
+            value = "new-value".asTokenizableEncrypted(),
+            subjectId = subject3P1WithBoth.subjectId,
+            type = ExternalCredentialType.NHISCard,
+        )
+
+        val updateAction = SubjectAction.Update(
+            subjectId = subject3P1WithBoth.subjectId,
+            faceSamplesToAdd = listOf(),
+            fingerprintSamplesToAdd = listOf(),
+            referenceIdsToRemove = listOf(faceSample2.referenceId, fingerprintSample2.referenceId), // Remove all samples
+            externalCredentialsToAdd = listOf(newExternalCredential),
+        )
+
+        dataSource.performActions(listOf(updateAction), project)
+        val loaded = dataSource.load(SubjectQuery(subjectId = subject3P1WithBoth.subjectId)).first()
+        assertThat(loaded.faceSamples).isEmpty()
+        assertThat(loaded.fingerprintSamples).isEmpty()
+        assertThat(loaded.externalCredentials).hasSize(2)
+        assertThat(loaded.externalCredentials).contains(newExternalCredential)
+    }
 }
diff --git a/infra/resources/src/main/res/values/strings.xml b/infra/resources/src/main/res/values/strings.xml
index 4f3ef49dfd..8609d13fe0 100644
--- a/infra/resources/src/main/res/values/strings.xml
+++ b/infra/resources/src/main/res/values/strings.xml
@@ -516,6 +516,8 @@
     <string name="mfid_action_go_to_record">Go to record</string>
     <string name="mfid_action_enrol">Enrol</string>
     <string name="mfid_action_enrol_anyway">Enrol anyway</string>
+    <string name="mfid_action_add">Add</string>
+    <string name="mfid_action_skip">Skip</string>
     <string name="mfid_action_continue">Continue</string>
     <string name="mfid_searching">Searching…</string>
 
@@ -524,6 +526,8 @@
     <string name="mfid_search_found_identification_low_match_score">This %1$s might be linked to another patient</string>
     <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>
+
 
 
 </resources>
diff --git a/infra/resources/src/main/res/values/styles-text.xml b/infra/resources/src/main/res/values/styles-text.xml
index 85edd69ac2..8376de22f0 100644
--- a/infra/resources/src/main/res/values/styles-text.xml
+++ b/infra/resources/src/main/res/values/styles-text.xml
@@ -150,6 +150,15 @@
         <item name="android:textStyle">bold</item>
     </style>
 
+
+    <style name="Text.Headline5.Blue">
+        <item name="android:textColor">@color/simprints_blue</item>
+    </style>
+
+    <style name="Text.Headline5.Blue.Bold">
+        <item name="android:textStyle">bold</item>
+    </style>
+
     <!-- H6 variants -->
 
     <style name="Text.Headline6" parent="Widget.MaterialComponents.TextView">
diff --git a/infra/ui-base/src/main/java/com/simprints/infra/uibase/view/View.ext.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/view/View.ext.kt
index b5944a4b27..c3a6a6ff67 100644
--- a/infra/ui-base/src/main/java/com/simprints/infra/uibase/view/View.ext.kt
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/view/View.ext.kt
@@ -2,7 +2,13 @@ package com.simprints.infra.uibase.view
 
 import android.animation.ObjectAnimator
 import android.view.View
+import android.view.ViewPropertyAnimator
 import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.AccelerateInterpolator
+import android.view.animation.DecelerateInterpolator
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import com.simprints.infra.uibase.annotations.ExcludedFromGeneratedTestCoverageReports
 
 fun View.setPulseAnimation(isEnabled: Boolean) {
     (tag as? ObjectAnimator?)?.run {
@@ -26,6 +32,46 @@ fun View.setPulseAnimation(isEnabled: Boolean) {
         }
     tag = progressBarPulseAnimator
 }
+@ExcludedFromGeneratedTestCoverageReports("View animation")
+fun View.animateOut(
+    duration: Long,
+    scaleX: Boolean,
+    fragment: Fragment,
+): ViewPropertyAnimator {
+    return animate()
+        .alpha(0f)
+        .setDuration(duration)
+        .setInterpolator(DecelerateInterpolator())
+        .withEndAction {
+            if (fragment.isAdded) {
+                this.isVisible = false
+            }
+        }.also {
+            if (scaleX) {
+                it.scaleX(0f)
+            }
+            it.start()
+        }
+}
+
+@ExcludedFromGeneratedTestCoverageReports("View animation")
+fun View.animateIn(
+    duration: Long,
+    onComplete: (() -> Unit)?,
+    fragment: Fragment,
+): ViewPropertyAnimator {
+    return animate()
+        .alpha(1f)
+        .setInterpolator(AccelerateInterpolator())
+        .setDuration(duration)
+        .withEndAction {
+            if (fragment.isAdded) {
+                this.isVisible = true
+                onComplete?.invoke()
+            }
+        }
+        .also { it.start() }
+}
 
 private const val PULSE_ANIMATION_ALPHA_FULL = 1.0f
 private const val PULSE_ANIMATION_ALPHA_INTERMEDIATE = 0.9f

From c710edc85154e7111d9500b1ef50080464596639 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Tue, 7 Oct 2025 21:39:38 +0300
Subject: [PATCH 2/9] [MS-1170] MF-ID: Secondary implementation of the 'Confirm
 Identity' flow with ability to add external credential

---
 .github/workflows/pr-checks.yml               |   1 +
 .../feature/clientapi/ClientApiViewModel.kt   |   1 +
 .../response/LibSimprintsResponseMapper.kt    |  32 ++-
 .../clientapi/ClientApiViewModelTest.kt       |  15 +-
 .../response/ActionToIntentMapperTest.kt      |   4 +-
 .../response/CommCareResponseMapperTest.kt    |   5 +-
 .../LibSimprintsResponseMapperTest.kt         |  16 ++
 .../mappers/response/OdkResponseMapperTest.kt |   5 +-
 feature/external-credential/build.gradle.kts  |   1 +
 .../ExternalCredentialScanOcrViewModel.kt     |  11 +-
 .../GetCredentialCoordinatesUseCase.kt        |  18 +-
 .../KeepOnlyBestDetectedBlockUseCase.kt       |  13 +-
 .../usecase/SaveScannedImageUseCase.kt        |  35 ---
 .../ExternalCredentialSearchFragment.kt       |   2 +-
 .../ExternalCredentialSearchViewModel.kt      |   6 +-
 .../ExternalCredentialScanOcrViewModelTest.kt |  11 +-
 .../KeepOnlyBestDetectedBlockUseCaseTest.kt   |  34 +--
 .../usecase/SaveScannedImageUseCaseTest.kt    |  42 ----
 .../ExternalCredentialSearchViewModelTest.kt  |  24 +-
 .../CreateConfirmIdentityResponseUseCase.kt   |   2 +-
 .../usecases/AddCallbackEventUseCaseTest.kt   |  10 +-
 .../selectsubject/SelectSubjectResult.kt      |   4 +-
 .../screen/SelectSubjectViewModel.kt          |  82 +++---
 .../screen/SelectSubjectViewModelTest.kt      | 238 ++++++++++++++++--
 infra/credential-store/README.md              |   0
 infra/credential-store/build.gradle.kts       |  11 +
 .../src/main/AndroidManifest.xml              |   4 +
 .../store/CredentialImageRepository.kt        |  70 ++++++
 .../store/model/CredentialScanImageType.kt    |   6 +
 .../store/CredentialImageRepositoryTest.kt    |  86 +++++++
 infra/events/build.gradle.kts                 |   1 +
 .../session/SessionEventRepositoryImpl.kt     |   3 +
 .../session/SessionEventRepositoryImplTest.kt |  18 +-
 .../orchestration/data/ActionResponse.kt      |   2 +
 .../data/responses/AppConfirmationResponse.kt |   2 +
 settings.gradle.kts                           |   1 +
 36 files changed, 593 insertions(+), 223 deletions(-)
 delete mode 100644 feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/SaveScannedImageUseCase.kt
 delete mode 100644 feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/SaveScannedImageUseCaseTest.kt
 create mode 100644 infra/credential-store/README.md
 create mode 100644 infra/credential-store/build.gradle.kts
 create mode 100644 infra/credential-store/src/main/AndroidManifest.xml
 create mode 100644 infra/credential-store/src/main/java/com/simprints/infra/credential/store/CredentialImageRepository.kt
 create mode 100644 infra/credential-store/src/main/java/com/simprints/infra/credential/store/model/CredentialScanImageType.kt
 create mode 100644 infra/credential-store/src/test/java/com/simprints/infra/credential/store/CredentialImageRepositoryTest.kt

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index b9a72b2466..73ff2ec7d4 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -36,6 +36,7 @@ jobs:
                 infra:recent-user-activity
                 infra:config-store
                 infra:config-sync
+                infra:credential-store
                 infra:sync
             reportsId: infra1
 
diff --git a/feature/client-api/src/main/java/com/simprints/feature/clientapi/ClientApiViewModel.kt b/feature/client-api/src/main/java/com/simprints/feature/clientapi/ClientApiViewModel.kt
index c829d71410..8be4960140 100644
--- a/feature/client-api/src/main/java/com/simprints/feature/clientapi/ClientApiViewModel.kt
+++ b/feature/client-api/src/main/java/com/simprints/feature/clientapi/ClientApiViewModel.kt
@@ -161,6 +161,7 @@ class ClientApiViewModel @Inject internal constructor(
                     actionIdentifier = action.actionIdentifier,
                     sessionId = currentSessionId,
                     confirmed = confirmResponse.identificationOutcome,
+                    externalCredential = confirmResponse.externalCredential,
                 ),
             ),
         )
diff --git a/feature/client-api/src/main/java/com/simprints/feature/clientapi/mappers/response/LibSimprintsResponseMapper.kt b/feature/client-api/src/main/java/com/simprints/feature/clientapi/mappers/response/LibSimprintsResponseMapper.kt
index 9e91614421..1a40f0eab3 100644
--- a/feature/client-api/src/main/java/com/simprints/feature/clientapi/mappers/response/LibSimprintsResponseMapper.kt
+++ b/feature/client-api/src/main/java/com/simprints/feature/clientapi/mappers/response/LibSimprintsResponseMapper.kt
@@ -5,7 +5,6 @@ import androidx.core.os.bundleOf
 import com.simprints.core.DeviceID
 import com.simprints.core.PackageVersionName
 import com.simprints.core.domain.response.AppErrorReason
-import com.simprints.infra.events.event.domain.models.scope.Device
 import com.simprints.infra.orchestration.data.ActionResponse
 import com.simprints.libsimprints.Constants
 import com.simprints.libsimprints.contracts.VersionsList
@@ -15,6 +14,7 @@ import com.simprints.libsimprints.contracts.data.Identification
 import com.simprints.libsimprints.contracts.data.Identification.Companion.toJson
 import com.simprints.libsimprints.contracts.data.RefusalForm
 import com.simprints.libsimprints.contracts.data.Verification
+import org.json.JSONObject
 import javax.inject.Inject
 import com.simprints.libsimprints.Identification as LegacyIdentification
 import com.simprints.libsimprints.RefusalForm as LegacyRefusalForm
@@ -66,12 +66,26 @@ internal class LibSimprintsResponseMapper @Inject constructor(
             }
         }
 
-        is ActionResponse.ConfirmActionResponse -> bundleOf(
-            Constants.SIMPRINTS_SESSION_ID to response.sessionId,
-            Constants.SIMPRINTS_DEVICE_ID to deviceId,
-            Constants.SIMPRINTS_APP_VERSION_NAME to appVersionName,
-            Constants.SIMPRINTS_BIOMETRICS_COMPLETE_CHECK to true,
-        )
+        is ActionResponse.ConfirmActionResponse -> {
+            bundleOf(
+                Constants.SIMPRINTS_SESSION_ID to response.sessionId,
+                Constants.SIMPRINTS_DEVICE_ID to deviceId,
+                Constants.SIMPRINTS_APP_VERSION_NAME to appVersionName,
+                Constants.SIMPRINTS_BIOMETRICS_COMPLETE_CHECK to true,
+                HAS_CREDENTIAL to (response.externalCredential != null),
+            ).also { bundle ->
+                val credentialJson = response.externalCredential?.let {
+                    JSONObject()
+                        .also {
+                            it.put(SCANNED_CREDENTIAL_VALUE, response.externalCredential?.value)
+                            it.put(SCANNED_CREDENTIAL_TYPE, response.externalCredential?.type)
+                        }.toString()
+                }
+                if (credentialJson != null) {
+                    bundle.putString(SCANNED_CREDENTIAL, credentialJson)
+                }
+            }
+        }
 
         is ActionResponse.VerifyActionResponse -> bundleOf(
             Constants.SIMPRINTS_SESSION_ID to response.sessionId,
@@ -182,5 +196,9 @@ internal class LibSimprintsResponseMapper @Inject constructor(
 
     companion object {
         internal const val RESULT_CODE_OVERRIDE = "result_code_override"
+        internal const val HAS_CREDENTIAL = "hasCredential"
+        internal const val SCANNED_CREDENTIAL = "scannedCredential"
+        internal const val SCANNED_CREDENTIAL_VALUE = "value"
+        internal const val SCANNED_CREDENTIAL_TYPE = "type"
     }
 }
diff --git a/feature/client-api/src/test/java/com/simprints/feature/clientapi/ClientApiViewModelTest.kt b/feature/client-api/src/test/java/com/simprints/feature/clientapi/ClientApiViewModelTest.kt
index f01529702e..3d97dbf409 100644
--- a/feature/client-api/src/test/java/com/simprints/feature/clientapi/ClientApiViewModelTest.kt
+++ b/feature/client-api/src/test/java/com/simprints/feature/clientapi/ClientApiViewModelTest.kt
@@ -2,7 +2,7 @@ package com.simprints.feature.clientapi
 
 import android.os.Bundle
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.ext.junit.runners.*
 import com.jraska.livedata.test
 import com.simprints.core.tools.time.TimeHelper
 import com.simprints.core.tools.time.Timestamp
@@ -22,14 +22,8 @@ import com.simprints.infra.orchestration.data.ActionRequestIdentifier
 import com.simprints.infra.orchestration.data.ActionResponse
 import com.simprints.logging.persistent.PersistentLogger
 import com.simprints.testtools.common.coroutines.TestCoroutineRule
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.coJustRun
-import io.mockk.coVerify
-import io.mockk.every
+import io.mockk.*
 import io.mockk.impl.annotations.MockK
-import io.mockk.mockk
-import io.mockk.verify
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Rule
@@ -180,7 +174,10 @@ internal class ClientApiViewModelTest {
     fun `handleConfirmResponse saves correct events`() = runTest {
         viewModel.handleConfirmResponse(
             mockRequest(),
-            mockk { every { identificationOutcome } returns true },
+            mockk {
+                every { identificationOutcome } returns true
+                every { externalCredential } returns mockk()
+            },
         )
 
         coVerify {
diff --git a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/ActionToIntentMapperTest.kt b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/ActionToIntentMapperTest.kt
index d2c545e9d3..1a39853093 100644
--- a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/ActionToIntentMapperTest.kt
+++ b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/ActionToIntentMapperTest.kt
@@ -7,9 +7,8 @@ import com.simprints.feature.clientapi.models.LibSimprintsConstants
 import com.simprints.feature.clientapi.models.OdkConstants
 import com.simprints.infra.orchestration.data.ActionResponse
 import com.simprints.testtools.common.syntax.assertThrows
-import io.mockk.MockKAnnotations
+import io.mockk.*
 import io.mockk.impl.annotations.MockK
-import io.mockk.verify
 import org.junit.Before
 import org.junit.Test
 
@@ -74,5 +73,6 @@ class ActionToIntentMapperTest {
         actionIdentifier = ConfirmIdentityActionFactory.getIdentifier().copy(packageName = packageName),
         sessionId = "sessionId",
         confirmed = true,
+        externalCredential = null,
     )
 }
diff --git a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/CommCareResponseMapperTest.kt b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/CommCareResponseMapperTest.kt
index a99aa6a354..da6769457f 100644
--- a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/CommCareResponseMapperTest.kt
+++ b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/CommCareResponseMapperTest.kt
@@ -1,8 +1,8 @@
 package com.simprints.feature.clientapi.mappers.response
 
 import androidx.core.os.bundleOf
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.google.common.truth.Truth.assertThat
+import androidx.test.ext.junit.runners.*
+import com.google.common.truth.Truth.*
 import com.simprints.core.domain.response.AppErrorReason
 import com.simprints.core.domain.response.AppMatchConfidence
 import com.simprints.feature.clientapi.mappers.request.requestFactories.ConfirmIdentityActionFactory
@@ -85,6 +85,7 @@ class CommCareResponseMapperTest {
                 actionIdentifier = ConfirmIdentityActionFactory.getIdentifier(),
                 sessionId = "sessionId",
                 confirmed = true,
+                externalCredential = null,
             ),
         ).getBundle(CommCareConstants.COMMCARE_BUNDLE_KEY) ?: bundleOf()
 
diff --git a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/LibSimprintsResponseMapperTest.kt b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/LibSimprintsResponseMapperTest.kt
index 05e28f5260..e9fc4bda2d 100644
--- a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/LibSimprintsResponseMapperTest.kt
+++ b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/LibSimprintsResponseMapperTest.kt
@@ -2,17 +2,24 @@ package com.simprints.feature.clientapi.mappers.response
 
 import androidx.test.ext.junit.runners.*
 import com.google.common.truth.Truth.*
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
 import com.simprints.core.domain.response.AppErrorReason
 import com.simprints.core.domain.response.AppMatchConfidence
+import com.simprints.core.domain.tokenization.asTokenizableEncrypted
 import com.simprints.feature.clientapi.mappers.request.requestFactories.ConfirmIdentityActionFactory
 import com.simprints.feature.clientapi.mappers.request.requestFactories.EnrolActionFactory
 import com.simprints.feature.clientapi.mappers.request.requestFactories.EnrolLastBiometricsActionFactory
 import com.simprints.feature.clientapi.mappers.request.requestFactories.IdentifyRequestActionFactory
 import com.simprints.feature.clientapi.mappers.request.requestFactories.VerifyActionFactory
+import com.simprints.feature.clientapi.mappers.response.LibSimprintsResponseMapper.Companion.HAS_CREDENTIAL
+import com.simprints.feature.clientapi.mappers.response.LibSimprintsResponseMapper.Companion.SCANNED_CREDENTIAL
+import com.simprints.feature.clientapi.mappers.response.LibSimprintsResponseMapper.Companion.SCANNED_CREDENTIAL_TYPE
+import com.simprints.feature.clientapi.mappers.response.LibSimprintsResponseMapper.Companion.SCANNED_CREDENTIAL_VALUE
 import com.simprints.infra.orchestration.data.ActionResponse
 import com.simprints.infra.orchestration.data.responses.AppMatchResult
 import com.simprints.libsimprints.Constants
 import com.simprints.libsimprints.contracts.VersionsList
+import io.mockk.*
 import org.junit.Test
 import org.junit.runner.RunWith
 import com.simprints.libsimprints.Identification as LegacyIdentification
@@ -126,11 +133,18 @@ class LibSimprintsResponseMapperTest {
 
     @Test
     fun `correctly maps confirm response`() {
+        val expectedValue = "expectedValue".asTokenizableEncrypted()
+        val expectedType = ExternalCredentialType.NHISCard
+        val expectedJson = "{\"$SCANNED_CREDENTIAL_VALUE\":\"$expectedValue\",\"$SCANNED_CREDENTIAL_TYPE\":\"$expectedType\"}"
         val extras = mapper(
             ActionResponse.ConfirmActionResponse(
                 actionIdentifier = ConfirmIdentityActionFactory.getIdentifier(),
                 sessionId = "sessionId",
                 confirmed = true,
+                externalCredential = mockk {
+                    every { value } returns expectedValue
+                    every { type } returns expectedType
+                },
             ),
         )
 
@@ -138,6 +152,8 @@ class LibSimprintsResponseMapperTest {
         assertThat(extras.getString(Constants.SIMPRINTS_DEVICE_ID)).isEqualTo("deviceId")
         assertThat(extras.getString(Constants.SIMPRINTS_APP_VERSION_NAME)).isEqualTo("appVersionName")
         assertThat(extras.getBoolean(Constants.SIMPRINTS_BIOMETRICS_COMPLETE_CHECK)).isTrue()
+        assertThat(extras.getBoolean(HAS_CREDENTIAL)).isTrue()
+        assertThat(extras.getString(SCANNED_CREDENTIAL)).isEqualTo(expectedJson)
     }
 
     @Test
diff --git a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/OdkResponseMapperTest.kt b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/OdkResponseMapperTest.kt
index b4f234d861..a278c218e7 100644
--- a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/OdkResponseMapperTest.kt
+++ b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/OdkResponseMapperTest.kt
@@ -1,7 +1,7 @@
 package com.simprints.feature.clientapi.mappers.response
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.google.common.truth.Truth.assertThat
+import androidx.test.ext.junit.runners.*
+import com.google.common.truth.Truth.*
 import com.simprints.core.domain.response.AppErrorReason
 import com.simprints.core.domain.response.AppMatchConfidence
 import com.simprints.feature.clientapi.mappers.request.requestFactories.ConfirmIdentityActionFactory
@@ -85,6 +85,7 @@ class OdkResponseMapperTest {
                 actionIdentifier = ConfirmIdentityActionFactory.getIdentifier(),
                 sessionId = "sessionId",
                 confirmed = true,
+                externalCredential = null,
             ),
         )
 
diff --git a/feature/external-credential/build.gradle.kts b/feature/external-credential/build.gradle.kts
index fc98c9ea09..e13f5f8a32 100644
--- a/feature/external-credential/build.gradle.kts
+++ b/feature/external-credential/build.gradle.kts
@@ -15,6 +15,7 @@ dependencies {
     implementation(project(":infra:enrolment-records:repository"))
     implementation(project(":infra:auth-store"))
     implementation(project(":infra:matching"))
+    implementation(project(":infra:credential-store"))
     implementation(libs.androidX.cameraX.view)
     implementation(libs.mlkit.text.recognition)
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModel.kt
index 7993ff0492..458d9b15db 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModel.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModel.kt
@@ -18,14 +18,14 @@ import com.simprints.feature.externalcredential.screens.scanocr.usecase.CropDocu
 import com.simprints.feature.externalcredential.screens.scanocr.usecase.GetCredentialCoordinatesUseCase
 import com.simprints.feature.externalcredential.screens.scanocr.usecase.KeepOnlyBestDetectedBlockUseCase
 import com.simprints.feature.externalcredential.screens.scanocr.usecase.NormalizeBitmapToPreviewUseCase
-import com.simprints.feature.externalcredential.screens.scanocr.usecase.SaveScannedImageUseCase
-import com.simprints.feature.externalcredential.screens.scanocr.usecase.SaveScannedImageUseCase.ScanImageType.ZoomedInCredential
 import com.simprints.feature.externalcredential.screens.scanocr.usecase.ZoomOntoCredentialUseCase
 import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
 import com.simprints.infra.authstore.AuthStore
 import com.simprints.infra.config.store.models.TokenKeyType
 import com.simprints.infra.config.store.tokenization.TokenizationProcessor
 import com.simprints.infra.config.sync.ConfigManager
+import com.simprints.infra.credential.store.CredentialImageRepository
+import com.simprints.infra.credential.store.model.CredentialScanImageType.ZoomedInCredential
 import com.simprints.infra.logging.LoggingConstants.CrashReportTag.MULTI_FACTOR_ID
 import com.simprints.infra.logging.Simber
 import com.simprints.infra.resources.R
@@ -41,7 +41,7 @@ internal class ExternalCredentialScanOcrViewModel @AssistedInject constructor(
     private val cropDocumentFromPreviewUseCase: CropDocumentFromPreviewUseCase,
     private val getCredentialCoordinatesUseCase: GetCredentialCoordinatesUseCase,
     private val keepOnlyBestDetectedBlockUseCase: KeepOnlyBestDetectedBlockUseCase,
-    private val saveScannedImageUseCase: SaveScannedImageUseCase,
+    private val credentialImageRepository: CredentialImageRepository,
     private val zoomOntoCredentialUseCase: ZoomOntoCredentialUseCase,
     private val tokenizationProcessor: TokenizationProcessor,
     private val authStore: AuthStore,
@@ -138,10 +138,9 @@ internal class ExternalCredentialScanOcrViewModel @AssistedInject constructor(
         }
     }
 
-    private fun buildZoomedImagePath(detectedBlock: DetectedOcrBlock): String? = try {
-        saveScannedImageUseCase(
+    private suspend fun buildZoomedImagePath(detectedBlock: DetectedOcrBlock): String? = try {
+        credentialImageRepository.saveCredentialScan(
             bitmap = zoomOntoCredentialUseCase(detectedBlock.imagePath, detectedBlock.blockBoundingBox),
-            documentType = detectedBlock.documentType,
             imageType = ZoomedInCredential,
         )
     } catch (e: Exception) {
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/GetCredentialCoordinatesUseCase.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/GetCredentialCoordinatesUseCase.kt
index 6bcd0136cc..20fe8554a7 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/GetCredentialCoordinatesUseCase.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/GetCredentialCoordinatesUseCase.kt
@@ -9,7 +9,8 @@ import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
 import com.simprints.feature.externalcredential.model.toBoundingBox
 import com.simprints.feature.externalcredential.screens.scanocr.model.DetectedOcrBlock
 import com.simprints.feature.externalcredential.screens.scanocr.model.OcrDocumentType
-import com.simprints.feature.externalcredential.screens.scanocr.usecase.SaveScannedImageUseCase.ScanImageType.FullDocument
+import com.simprints.infra.credential.store.CredentialImageRepository
+import com.simprints.infra.credential.store.model.CredentialScanImageType.FullDocument
 import com.simprints.infra.logging.LoggingConstants.CrashReportTag.MULTI_FACTOR_ID
 import com.simprints.infra.logging.Simber
 import javax.inject.Inject
@@ -20,7 +21,7 @@ import javax.inject.Singleton
 internal class GetCredentialCoordinatesUseCase @Inject constructor(
     private val ghanaNhisCardOcrSelectorUseCase: GhanaNhisCardOcrSelectorUseCase,
     private val ghanaIdCardOcrSelectorUseCase: GhanaIdCardOcrSelectorUseCase,
-    private val saveScannedImageUseCase: SaveScannedImageUseCase,
+    private val credentialImageRepository: CredentialImageRepository,
 ) {
     private val recognizer = TextRecognition.getClient(TextRecognizerOptions.DEFAULT_OPTIONS)
 
@@ -43,7 +44,10 @@ internal class GetCredentialCoordinatesUseCase @Inject constructor(
      *
      * @return [DetectedOcrBlock] if any Line satisfies the [documentType] pattern, or null if none.
      */
-    suspend operator fun invoke(bitmap: Bitmap, documentType: OcrDocumentType): DetectedOcrBlock? {
+    suspend operator fun invoke(
+        bitmap: Bitmap,
+        documentType: OcrDocumentType,
+    ): DetectedOcrBlock? {
         val image = InputImage.fromBitmap(bitmap, 0)
         return try {
             val result = Tasks.await(recognizer.process(image)) ?: return null
@@ -58,15 +62,17 @@ internal class GetCredentialCoordinatesUseCase @Inject constructor(
                     if (isValid) {
                         val blockBoundingRect = textBlock.boundingBox ?: return@firstNotNullOfOrNull null
                         val lineBoundingRect = textLine.boundingBox ?: return@firstNotNullOfOrNull null
-                        val savedImagePath = saveScannedImageUseCase(bitmap, documentType, imageType = FullDocument)
-                        DetectedOcrBlock(
+                        val savedImagePath = credentialImageRepository.saveCredentialScan(bitmap, imageType = FullDocument)
+                        return@firstNotNullOfOrNull DetectedOcrBlock(
                             imagePath = savedImagePath,
                             documentType = documentType,
                             blockBoundingBox = blockBoundingRect.toBoundingBox(),
                             lineBoundingBox = lineBoundingRect.toBoundingBox(),
                             readoutValue = lineReadout,
                         )
-                    } else null
+                    } else {
+                        return@firstNotNullOfOrNull null
+                    }
                 }
             }
         } catch (e: Exception) {
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/KeepOnlyBestDetectedBlockUseCase.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/KeepOnlyBestDetectedBlockUseCase.kt
index 61ef0c7262..3f477015a6 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/KeepOnlyBestDetectedBlockUseCase.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/KeepOnlyBestDetectedBlockUseCase.kt
@@ -2,16 +2,19 @@ package com.simprints.feature.externalcredential.screens.scanocr.usecase
 
 import com.simprints.feature.externalcredential.screens.scanocr.model.DetectedOcrBlock
 import com.simprints.feature.externalcredential.screens.scanocr.model.OcrDocumentType
+import com.simprints.infra.credential.store.CredentialImageRepository
 import javax.inject.Inject
 
 internal class KeepOnlyBestDetectedBlockUseCase @Inject constructor(
     private val getExternalCredentialBasedOnConfidenceUseCase: GetExternalCredentialBasedOnConfidenceUseCase,
     private val findBestTextBlockForCredentialUseCase: FindBestTextBlockForCredentialUseCase,
-    private val deleteScannedImageUseCase: DeleteScannedImageUseCase,
+    private val credentialImageRepository: CredentialImageRepository,
 ) {
-
-    suspend operator fun invoke(allDetectedBlock: List<DetectedOcrBlock>, documentType: OcrDocumentType): DetectedOcrBlock {
-        val credentialLength = when(documentType){
+    suspend operator fun invoke(
+        allDetectedBlock: List<DetectedOcrBlock>,
+        documentType: OcrDocumentType,
+    ): DetectedOcrBlock {
+        val credentialLength = when (documentType) {
             OcrDocumentType.NhisCard -> 8 // NHIS membership number contains 8 digits: 12345678
             OcrDocumentType.GhanaIdCard -> 15 // Ghana ID field contains 15 chars: GHA-123456789-0
         }
@@ -22,7 +25,7 @@ internal class KeepOnlyBestDetectedBlockUseCase @Inject constructor(
         allDetectedBlock
             .map(DetectedOcrBlock::imagePath)
             .filterNot { imagePath -> imagePath == detectedBlock.imagePath }
-            .onEach { imagePath -> deleteScannedImageUseCase(imagePath) }
+            .onEach { imagePath -> credentialImageRepository.deleteByPath(imagePath) }
         return detectedBlock
     }
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/SaveScannedImageUseCase.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/SaveScannedImageUseCase.kt
deleted file mode 100644
index bdbabdd1e8..0000000000
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/SaveScannedImageUseCase.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.simprints.feature.externalcredential.screens.scanocr.usecase
-
-import android.content.Context
-import android.graphics.Bitmap
-import com.simprints.feature.externalcredential.screens.scanocr.model.OcrDocumentType
-import dagger.hilt.android.qualifiers.ApplicationContext
-import java.io.File
-import javax.inject.Inject
-
-internal class SaveScannedImageUseCase @Inject constructor(
-    @ApplicationContext private val context: Context,
-) {
-
-    /**
-     * Saves a bitmap to the application's cache directory as a JPEG file.
-     * @param bitmap the bitmap to save
-     * @return absolute path to the saved file
-     */
-    operator fun invoke(bitmap: Bitmap, documentType: OcrDocumentType, imageType: ScanImageType): String {
-        val documentTypeName = documentType.toString().trim().replace(" ", "")
-        val fileName = "ocr_scan_${documentTypeName}_${imageType}_${System.currentTimeMillis()}.jpg"
-        val file = File(context.cacheDir, fileName)
-
-        file.outputStream().use { outputStream ->
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream)
-        }
-
-        return file.absolutePath
-    }
-
-    enum class ScanImageType {
-        FullDocument, ZoomedInCredential
-    }
-
-}
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchFragment.kt
index 673fefcf16..11f6868b98 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchFragment.kt
@@ -199,7 +199,7 @@ internal class ExternalCredentialSearchFragment : Fragment(R.layout.fragment_ext
         buttonConfirm.isEnabled = state.isConfirmed
         viewModel.getButtonTextResource(state.searchState, state.flowType)?.run(buttonConfirm::setText)
         buttonConfirm.setOnClickListener {
-            viewModel.finish(state.searchState)
+            viewModel.finish(state)
         }
         buttonRecapture.setOnClickListener {
             findNavController().navigateSafely(
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModel.kt
index af0e88921c..8a704840af 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModel.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModel.kt
@@ -149,8 +149,8 @@ internal class ExternalCredentialSearchViewModel @AssistedInject constructor(
         ExternalCredentialType.QRCode -> InputType.TYPE_CLASS_TEXT
     }
 
-    fun finish(searchState: SearchState) {
-        val matches = when (searchState) {
+    fun finish(state: SearchCredentialState) {
+        val matches = when (val searchState = state.searchState) {
             SearchState.Searching,
             SearchState.CredentialNotFound,
             -> emptyList()
@@ -160,7 +160,7 @@ internal class ExternalCredentialSearchViewModel @AssistedInject constructor(
         _finishEvent.send(
             ExternalCredentialSearchResult(
                 flowType = externalCredentialParams.flowType,
-                scannedCredential = scannedCredential,
+                scannedCredential = state.scannedCredential,
                 matchResults = matches,
             ),
         )
diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModelTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModelTest.kt
index 4185460629..85c0d90b86 100644
--- a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModelTest.kt
+++ b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModelTest.kt
@@ -13,13 +13,13 @@ import com.simprints.feature.externalcredential.screens.scanocr.usecase.CropDocu
 import com.simprints.feature.externalcredential.screens.scanocr.usecase.GetCredentialCoordinatesUseCase
 import com.simprints.feature.externalcredential.screens.scanocr.usecase.KeepOnlyBestDetectedBlockUseCase
 import com.simprints.feature.externalcredential.screens.scanocr.usecase.NormalizeBitmapToPreviewUseCase
-import com.simprints.feature.externalcredential.screens.scanocr.usecase.SaveScannedImageUseCase
 import com.simprints.feature.externalcredential.screens.scanocr.usecase.ZoomOntoCredentialUseCase
 import com.simprints.infra.authstore.AuthStore
 import com.simprints.infra.config.store.models.Project
 import com.simprints.infra.config.store.models.TokenKeyType
 import com.simprints.infra.config.store.tokenization.TokenizationProcessor
 import com.simprints.infra.config.sync.ConfigManager
+import com.simprints.infra.credential.store.CredentialImageRepository
 import com.simprints.infra.resources.R
 import com.simprints.testtools.common.coroutines.TestCoroutineRule
 import io.mockk.*
@@ -30,7 +30,6 @@ import org.junit.Rule
 import org.junit.Test
 
 internal class ExternalCredentialScanOcrViewModelTest {
-
     @get:Rule
     val rule = InstantTaskExecutorRule()
 
@@ -53,7 +52,7 @@ internal class ExternalCredentialScanOcrViewModelTest {
     private lateinit var zoomOntoCredentialUseCase: ZoomOntoCredentialUseCase
 
     @MockK
-    private lateinit var saveScannedImageUseCase: SaveScannedImageUseCase
+    private lateinit var credentialImageRepository: CredentialImageRepository
 
     @MockK
     private lateinit var tokenizationProcessor: TokenizationProcessor
@@ -87,11 +86,11 @@ internal class ExternalCredentialScanOcrViewModelTest {
         getCredentialCoordinatesUseCase = getCredentialCoordinatesUseCase,
         keepOnlyBestDetectedBlockUseCase = keepOnlyBestDetectedBlockUseCase,
         zoomOntoCredentialUseCase = zoomOntoCredentialUseCase,
-        saveScannedImageUseCase = saveScannedImageUseCase,
+        credentialImageRepository = credentialImageRepository,
         bgDispatcher = testCoroutineRule.testCoroutineDispatcher,
         tokenizationProcessor = tokenizationProcessor,
         configManager = configManager,
-        authStore = authStore
+        authStore = authStore,
     )
 
     @Test
@@ -147,7 +146,7 @@ internal class ExternalCredentialScanOcrViewModelTest {
         coEvery { keepOnlyBestDetectedBlockUseCase(any(), documentType) } returns mockBestBlock
         coEvery { tokenizationProcessor.encrypt(any(), TokenKeyType.ExternalCredential, mockProject) } returns mockTokenizedCredential
         coEvery { zoomOntoCredentialUseCase(detectedBlockImagePath, mockBoundingBox) } returns mockBitmap
-        coEvery { saveScannedImageUseCase(mockBitmap, OcrDocumentType.NhisCard, any()) } returns zoomedImagePath
+        coEvery { credentialImageRepository.saveCredentialScan(mockBitmap, any()) } returns zoomedImagePath
 
         val finishObserver = viewModel.finishOcrEvent.test()
         val stateObserver = viewModel.stateLiveData.test()
diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/KeepOnlyBestDetectedBlockUseCaseTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/KeepOnlyBestDetectedBlockUseCaseTest.kt
index ba8bae8168..0a21921094 100644
--- a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/KeepOnlyBestDetectedBlockUseCaseTest.kt
+++ b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/KeepOnlyBestDetectedBlockUseCaseTest.kt
@@ -1,8 +1,9 @@
 package com.simprints.feature.externalcredential.screens.scanocr.usecase
 
-import com.google.common.truth.Truth.assertThat
+import com.google.common.truth.Truth.*
 import com.simprints.feature.externalcredential.screens.scanocr.model.DetectedOcrBlock
 import com.simprints.feature.externalcredential.screens.scanocr.model.OcrDocumentType
+import com.simprints.infra.credential.store.CredentialImageRepository
 import io.mockk.*
 import io.mockk.impl.annotations.MockK
 import kotlinx.coroutines.test.runTest
@@ -10,7 +11,6 @@ import org.junit.Before
 import org.junit.Test
 
 internal class KeepOnlyBestDetectedBlockUseCaseTest {
-
     @MockK
     private lateinit var getExternalCredentialBasedOnConfidenceUseCase: GetExternalCredentialBasedOnConfidenceUseCase
 
@@ -18,7 +18,7 @@ internal class KeepOnlyBestDetectedBlockUseCaseTest {
     private lateinit var findBestTextBlockForCredentialUseCase: FindBestTextBlockForCredentialUseCase
 
     @MockK
-    private lateinit var deleteScannedImageUseCase: DeleteScannedImageUseCase
+    private lateinit var credentialImageRepository: CredentialImageRepository
 
     private lateinit var useCase: KeepOnlyBestDetectedBlockUseCase
 
@@ -36,7 +36,7 @@ internal class KeepOnlyBestDetectedBlockUseCaseTest {
         useCase = KeepOnlyBestDetectedBlockUseCase(
             getExternalCredentialBasedOnConfidenceUseCase = getExternalCredentialBasedOnConfidenceUseCase,
             findBestTextBlockForCredentialUseCase = findBestTextBlockForCredentialUseCase,
-            deleteScannedImageUseCase = deleteScannedImageUseCase
+            credentialImageRepository = credentialImageRepository,
         )
     }
 
@@ -57,9 +57,9 @@ internal class KeepOnlyBestDetectedBlockUseCaseTest {
         val result = useCase(allBlocks, OcrDocumentType.NhisCard)
 
         assertThat(result).isEqualTo(bestBlock)
-        coVerify { deleteScannedImageUseCase(otherBlockImagePath1) }
-        coVerify { deleteScannedImageUseCase(otherBlockImagePath2) }
-        coVerify(exactly = 0) { deleteScannedImageUseCase(bestBlockImagePath) }
+        coVerify { credentialImageRepository.deleteByPath(otherBlockImagePath1) }
+        coVerify { credentialImageRepository.deleteByPath(otherBlockImagePath2) }
+        coVerify(exactly = 0) { credentialImageRepository.deleteByPath(bestBlockImagePath) }
     }
 
     @Test
@@ -75,9 +75,9 @@ internal class KeepOnlyBestDetectedBlockUseCaseTest {
         val result = useCase(allBlocks, OcrDocumentType.GhanaIdCard)
 
         assertThat(result).isEqualTo(bestBlock)
-        coVerify { deleteScannedImageUseCase(otherBlockImagePath1) }
-        coVerify { deleteScannedImageUseCase(otherBlockImagePath2) }
-        coVerify(exactly = 0) { deleteScannedImageUseCase(bestBlockImagePath) }
+        coVerify { credentialImageRepository.deleteByPath(otherBlockImagePath1) }
+        coVerify { credentialImageRepository.deleteByPath(otherBlockImagePath2) }
+        coVerify(exactly = 0) { credentialImageRepository.deleteByPath(bestBlockImagePath) }
     }
 
     @Test
@@ -117,7 +117,7 @@ internal class KeepOnlyBestDetectedBlockUseCaseTest {
         val result = useCase(allBlocks, OcrDocumentType.NhisCard)
 
         assertThat(result).isEqualTo(singleBlock)
-        coVerify(exactly = 0) { deleteScannedImageUseCase(any()) }
+        coVerify(exactly = 0) { credentialImageRepository.deleteByPath(any()) }
     }
 
     @Test
@@ -141,7 +141,7 @@ internal class KeepOnlyBestDetectedBlockUseCaseTest {
             createMockBlock("/path2.jpg"),
             bestBlock,
             createMockBlock("/path3.jpg"),
-            createMockBlock("/path4.jpg")
+            createMockBlock("/path4.jpg"),
         )
         val mockCredential = "GHA-123456789-0"
 
@@ -150,10 +150,10 @@ internal class KeepOnlyBestDetectedBlockUseCaseTest {
 
         useCase(blocks, OcrDocumentType.GhanaIdCard)
 
-        coVerify { deleteScannedImageUseCase("/path1.jpg") }
-        coVerify { deleteScannedImageUseCase("/path2.jpg") }
-        coVerify { deleteScannedImageUseCase("/path3.jpg") }
-        coVerify { deleteScannedImageUseCase("/path4.jpg") }
-        coVerify(exactly = 0) { deleteScannedImageUseCase(bestBlockImagePath) }
+        coVerify { credentialImageRepository.deleteByPath("/path1.jpg") }
+        coVerify { credentialImageRepository.deleteByPath("/path2.jpg") }
+        coVerify { credentialImageRepository.deleteByPath("/path3.jpg") }
+        coVerify { credentialImageRepository.deleteByPath("/path4.jpg") }
+        coVerify(exactly = 0) { credentialImageRepository.deleteByPath(bestBlockImagePath) }
     }
 }
diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/SaveScannedImageUseCaseTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/SaveScannedImageUseCaseTest.kt
deleted file mode 100644
index 2a6a4f442f..0000000000
--- a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/SaveScannedImageUseCaseTest.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.simprints.feature.externalcredential.screens.scanocr.usecase
-
-import android.content.Context
-import android.graphics.Bitmap
-import com.google.common.truth.Truth.assertThat
-import com.simprints.feature.externalcredential.screens.scanocr.model.OcrDocumentType
-import io.mockk.*
-import io.mockk.impl.annotations.MockK
-import org.junit.Before
-import org.junit.Test
-
-internal class SaveScannedImageUseCaseTest {
-
-    @MockK
-    private lateinit var context: Context
-
-    @MockK
-    private lateinit var bitmap: Bitmap
-
-    private lateinit var useCase: SaveScannedImageUseCase
-
-    @Before
-    fun setUp() {
-        MockKAnnotations.init(this, relaxed = true)
-        val tempDir = createTempDir("test_cache")
-        every { context.cacheDir } returns tempDir
-        useCase = SaveScannedImageUseCase(context)
-    }
-
-    @Test
-    fun `saves bitmap with correct document type name and returns file path`() {
-        OcrDocumentType.entries.forEach { documentType ->
-            SaveScannedImageUseCase.ScanImageType.entries.forEach {scanImageType ->
-                every { bitmap.compress(any(), any(), any()) } returns true
-                val result = useCase(bitmap, documentType, scanImageType)
-                assertThat(result).contains("ocr_scan_${documentType}_${scanImageType}")
-                assertThat(result).endsWith(".jpg")
-                verify { bitmap.compress(Bitmap.CompressFormat.JPEG, 100, any()) }
-            }
-        }
-    }
-}
diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModelTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModelTest.kt
index 7e42bdb7c4..7f6c01ab90 100644
--- a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModelTest.kt
+++ b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModelTest.kt
@@ -11,6 +11,7 @@ import com.simprints.core.domain.tokenization.asTokenizableRaw
 import com.simprints.feature.externalcredential.model.CredentialMatch
 import com.simprints.feature.externalcredential.model.ExternalCredentialParams
 import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
+import com.simprints.feature.externalcredential.screens.search.model.SearchCredentialState
 import com.simprints.feature.externalcredential.screens.search.model.SearchState
 import com.simprints.feature.externalcredential.screens.search.usecase.MatchCandidatesUseCase
 import com.simprints.infra.authstore.AuthStore
@@ -89,7 +90,7 @@ internal class ExternalCredentialSearchViewModelTest {
         configManager = configManager,
         matchCandidatesUseCase = matchCandidatesUseCase,
         tokenizationProcessor = tokenizationProcessor,
-        enrolmentRecordRepository = enrolmentRecordRepository
+        enrolmentRecordRepository = enrolmentRecordRepository,
     )
 
     @Test
@@ -212,7 +213,11 @@ internal class ExternalCredentialSearchViewModelTest {
     @Test
     fun `finish sends empty matches when credential not found`() = runTest {
         viewModel = createViewModel()
-        viewModel.finish(SearchState.CredentialNotFound)
+        val state = mockk<SearchCredentialState> {
+            every { scannedCredential } returns this@ExternalCredentialSearchViewModelTest.scannedCredential
+            every { searchState } returns SearchState.CredentialNotFound
+        }
+        viewModel.finish(state)
         val finishEvent = viewModel.finishEvent.value?.peekContent()
         assertThat(finishEvent).isNotNull()
         assertThat(finishEvent?.matchResults).isEmpty()
@@ -222,7 +227,11 @@ internal class ExternalCredentialSearchViewModelTest {
     @Test
     fun `finish sends empty matches when still searching`() = runTest {
         viewModel = createViewModel()
-        viewModel.finish(SearchState.Searching)
+        val state = mockk<SearchCredentialState> {
+            every { scannedCredential } returns this@ExternalCredentialSearchViewModelTest.scannedCredential
+            every { searchState } returns SearchState.Searching
+        }
+        viewModel.finish(state)
         val finishEvent = viewModel.finishEvent.value?.peekContent()
         assertThat(finishEvent).isNotNull()
         assertThat(finishEvent?.matchResults).isEmpty()
@@ -230,8 +239,13 @@ internal class ExternalCredentialSearchViewModelTest {
 
     @Test
     fun `finish sends match results when credential linked`() = runTest {
-        val searchState = SearchState.CredentialLinked(listOf(candidateMatch))
-        viewModel.finish(searchState)
+        val state = mockk<SearchCredentialState> {
+            every { scannedCredential } returns this@ExternalCredentialSearchViewModelTest.scannedCredential
+            every { searchState } returns mockk<SearchState.CredentialLinked> {
+                every { matchResults } returns listOf(candidateMatch)
+            }
+        }
+        viewModel.finish(state)
         val finishEvent = viewModel.finishEvent.value?.peekContent()
         assertThat(finishEvent).isNotNull()
         assertThat(finishEvent?.matchResults).hasSize(1)
diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateConfirmIdentityResponseUseCase.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateConfirmIdentityResponseUseCase.kt
index 9d93ab2900..de055b99a1 100644
--- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateConfirmIdentityResponseUseCase.kt
+++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateConfirmIdentityResponseUseCase.kt
@@ -12,6 +12,6 @@ internal class CreateConfirmIdentityResponseUseCase @Inject constructor() {
     operator fun invoke(results: List<Serializable>): AppResponse = results
         .filterIsInstance(SelectSubjectResult::class.java)
         .lastOrNull()
-        ?.let { AppConfirmationResponse(true) }
+        ?.let { AppConfirmationResponse(true, externalCredential = it.savedCredential) }
         ?: AppErrorResponse(AppErrorReason.UNEXPECTED_ERROR)
 }
diff --git a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/AddCallbackEventUseCaseTest.kt b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/AddCallbackEventUseCaseTest.kt
index 82401fcceb..1232f11ccf 100644
--- a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/AddCallbackEventUseCaseTest.kt
+++ b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/AddCallbackEventUseCaseTest.kt
@@ -1,6 +1,6 @@
 package com.simprints.feature.orchestrator.usecases
 
-import com.google.common.truth.Truth.assertThat
+import com.google.common.truth.Truth.*
 import com.simprints.core.domain.response.AppErrorReason
 import com.simprints.core.domain.response.AppMatchConfidence
 import com.simprints.core.tools.time.TimeHelper
@@ -19,12 +19,8 @@ import com.simprints.infra.orchestration.data.responses.AppMatchResult
 import com.simprints.infra.orchestration.data.responses.AppRefusalResponse
 import com.simprints.infra.orchestration.data.responses.AppVerifyResponse
 import com.simprints.testtools.common.coroutines.TestCoroutineRule
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.coEvery
-import io.mockk.coVerify
+import io.mockk.*
 import io.mockk.impl.annotations.MockK
-import io.mockk.just
 import kotlinx.coroutines.CoroutineScope
 import org.junit.Before
 import org.junit.Rule
@@ -101,7 +97,7 @@ class AddCallbackEventUseCaseTest {
 
     @Test
     fun `adds event for confirmation response`() {
-        useCase(AppConfirmationResponse(true))
+        useCase(AppConfirmationResponse(true, mockk()))
 
         coVerify {
             eventRepository.addOrUpdateEvent(
diff --git a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectResult.kt b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectResult.kt
index ddd60cd628..19da82f83c 100644
--- a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectResult.kt
+++ b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/SelectSubjectResult.kt
@@ -1,11 +1,11 @@
 package com.simprints.feature.selectsubject
 
 import androidx.annotation.Keep
+import com.simprints.core.domain.externalcredential.ExternalCredential
 import com.simprints.core.domain.step.StepResult
-import com.simprints.core.domain.tokenization.TokenizableString
 
 @Keep
 data class SelectSubjectResult(
     val isSubjectIdSaved: Boolean,
-    val savedCredential: TokenizableString.Tokenized?,
+    val savedCredential: ExternalCredential?,
 ) : StepResult
diff --git a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
index 49fac1d07d..ab57655a3c 100644
--- a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
+++ b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
@@ -9,6 +9,7 @@ import com.simprints.core.livedata.LiveDataEventWithContent
 import com.simprints.core.livedata.send
 import com.simprints.core.tools.time.TimeHelper
 import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
+import com.simprints.feature.externalcredential.screens.search.model.toExternalCredential
 import com.simprints.feature.selectsubject.SelectSubjectParams
 import com.simprints.feature.selectsubject.SelectSubjectResult
 import com.simprints.feature.selectsubject.model.SelectSubjectState
@@ -62,45 +63,55 @@ internal class SelectSubjectViewModel @AssistedInject constructor(
 
     init {
         sessionCoroutineScope.launch {
-            saveGuidSelection(projectId = params.projectId, subjectId = params.subjectId, scannedCredential = params.scannedCredential)
+            val isSaved = saveGuidSelection(projectId = params.projectId, subjectId = params.subjectId)
+            if (!isSaved) {
+                _finish.send(SelectSubjectResult(isSubjectIdSaved = false, savedCredential = null))
+                return@launch
+            }
+
+            val dialogDisplayedState = getDisplayDialogStateIfRequired(params.scannedCredential, params.subjectId)
+            if (dialogDisplayedState != null) {
+                updateState { dialogDisplayedState }
+            } else {
+                val credential = params.scannedCredential?.toExternalCredential(params.subjectId)
+                _finish.send(SelectSubjectResult(isSubjectIdSaved = true, savedCredential = credential))
+            }
         }
     }
 
     private suspend fun saveGuidSelection(
         projectId: String,
         subjectId: String,
-        scannedCredential: ScannedCredential?,
-    ) {
+    ): Boolean {
         updateState { SelectSubjectState.SavingSubjectId }
-        if (authStore.isProjectIdSignedIn(projectId)) {
-            val isSubjectIdSaved = saveSelectionEvent(subjectId)
-            if (isSubjectIdSaved && scannedCredential != null) {
-                val credential = scannedCredential.credential
-                val project = configManager.getProject(authStore.signedInProjectId)
-                val shouldDisplayAddCredentialDialog = enrolmentRecordRepository
-                    .load(
-                        SubjectQuery(
-                            projectId = project.id,
-                            subjectId = subjectId,
-                            externalCredential = credential,
-                        ),
-                    ).isEmpty()
-                if (shouldDisplayAddCredentialDialog) {
-                    val decrypted = tokenizationProcessor.decrypt(
-                        encrypted = credential,
-                        tokenKeyType = TokenKeyType.ExternalCredential,
-                        project = project,
-                    ) as TokenizableString.Raw
-                    updateState {
-                        SelectSubjectState.CredentialDialogDisplayed(scannedCredential = scannedCredential, displayedCredential = decrypted)
-                    }
-                }
-            } else {
-                _finish.send(SelectSubjectResult(isSubjectIdSaved = isSubjectIdSaved, savedCredential = null))
-            }
-        } else {
-            _finish.send(SelectSubjectResult(isSubjectIdSaved = false, savedCredential = null))
-        }
+        if (!authStore.isProjectIdSignedIn(projectId)) return false
+        return saveSelectionEvent(subjectId)
+    }
+
+    private suspend fun getDisplayDialogStateIfRequired(
+        scannedCredential: ScannedCredential?,
+        subjectId: String,
+    ): SelectSubjectState.CredentialDialogDisplayed? {
+        if (scannedCredential == null) return null
+        val credential = scannedCredential.credential
+        val project = configManager.getProject(authStore.signedInProjectId)
+        val isCredentialAlreadyLinkedToSubject = enrolmentRecordRepository
+            .load(
+                SubjectQuery(
+                    projectId = project.id,
+                    subjectId = subjectId,
+                    externalCredential = credential,
+                ),
+            ).isNotEmpty()
+
+        if (isCredentialAlreadyLinkedToSubject) return null
+
+        val decrypted = tokenizationProcessor.decrypt(
+            encrypted = credential,
+            tokenKeyType = TokenKeyType.ExternalCredential,
+            project = project,
+        ) as TokenizableString.Raw
+        return SelectSubjectState.CredentialDialogDisplayed(scannedCredential = scannedCredential, displayedCredential = decrypted)
     }
 
     fun saveCredential(scannedCredential: ScannedCredential) {
@@ -113,7 +124,12 @@ internal class SelectSubjectViewModel @AssistedInject constructor(
                 Simber.e("Failed to attach scanned credential", e, tag = SESSION)
                 null
             }
-            _finish.send(SelectSubjectResult(isSubjectIdSaved = true, savedCredential = addedCredential?.credential))
+            _finish.send(
+                SelectSubjectResult(
+                    isSubjectIdSaved = true,
+                    savedCredential = addedCredential?.toExternalCredential(params.subjectId),
+                ),
+            )
         }
     }
 
diff --git a/feature/select-subject/src/test/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModelTest.kt b/feature/select-subject/src/test/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModelTest.kt
index 9105eb51ff..d01ef1f305 100644
--- a/feature/select-subject/src/test/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModelTest.kt
+++ b/feature/select-subject/src/test/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModelTest.kt
@@ -1,17 +1,27 @@
 package com.simprints.feature.selectsubject.screen
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.google.common.truth.Truth.assertThat
+import com.google.common.truth.Truth.*
 import com.jraska.livedata.test
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import com.simprints.core.domain.tokenization.TokenizableString
+import com.simprints.core.domain.tokenization.asTokenizableEncrypted
 import com.simprints.core.tools.time.TimeHelper
 import com.simprints.core.tools.time.Timestamp
+import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
+import com.simprints.feature.selectsubject.SelectSubjectParams
+import com.simprints.feature.selectsubject.model.SelectSubjectState
+import com.simprints.feature.selectsubject.usecase.AddExternalCredentialToSubjectUseCase
 import com.simprints.infra.authstore.AuthStore
+import com.simprints.infra.config.store.models.Project
+import com.simprints.infra.config.store.models.TokenKeyType
+import com.simprints.infra.config.store.tokenization.TokenizationProcessor
+import com.simprints.infra.config.sync.ConfigManager
+import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository
+import com.simprints.infra.enrolment.records.repository.domain.models.Subject
 import com.simprints.infra.events.session.SessionEventRepository
 import com.simprints.testtools.common.coroutines.TestCoroutineRule
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.every
+import io.mockk.*
 import io.mockk.impl.annotations.MockK
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.test.runTest
@@ -21,10 +31,10 @@ import org.junit.Test
 
 internal class SelectSubjectViewModelTest {
     @get:Rule
-    val testCoroutineRule = TestCoroutineRule()
+    val rule = InstantTaskExecutorRule()
 
     @get:Rule
-    val rule = InstantTaskExecutorRule()
+    val testCoroutineRule = TestCoroutineRule()
 
     @MockK
     lateinit var timeHelper: TimeHelper
@@ -35,6 +45,21 @@ internal class SelectSubjectViewModelTest {
     @MockK
     lateinit var eventRepository: SessionEventRepository
 
+    @MockK
+    lateinit var configManager: ConfigManager
+
+    @MockK
+    lateinit var addExternalCredentialToSubjectUseCase: AddExternalCredentialToSubjectUseCase
+
+    @MockK
+    lateinit var enrolmentRecordRepository: EnrolmentRecordRepository
+
+    @MockK
+    lateinit var tokenizationProcessor: TokenizationProcessor
+
+    @MockK
+    lateinit var selectSubjectParams: SelectSubjectParams
+
     private lateinit var viewModel: SelectSubjectViewModel
 
     @Before
@@ -42,55 +67,220 @@ internal class SelectSubjectViewModelTest {
         MockKAnnotations.init(this, relaxed = true)
 
         every { timeHelper.now() } returns TIMESTAMP
+        every { selectSubjectParams.projectId } returns PROJECT_ID
+        every { selectSubjectParams.subjectId } returns SUBJECT_ID
 
         viewModel = SelectSubjectViewModel(
-            timeHelper,
-            authStore,
-            eventRepository,
-            CoroutineScope(testCoroutineRule.testCoroutineDispatcher),
+            params = selectSubjectParams,
+            timeHelper = timeHelper,
+            authStore = authStore,
+            eventRepository = eventRepository,
+            configManager = configManager,
+            addExternalCredentialToSubjectUseCase = addExternalCredentialToSubjectUseCase,
+            enrolmentRecordRepository = enrolmentRecordRepository,
+            tokenizationProcessor = tokenizationProcessor,
+            sessionCoroutineScope = CoroutineScope(testCoroutineRule.testCoroutineDispatcher),
         )
     }
 
+    private fun createViewModel() = SelectSubjectViewModel(
+        params = selectSubjectParams,
+        timeHelper = timeHelper,
+        authStore = authStore,
+        eventRepository = eventRepository,
+        configManager = configManager,
+        addExternalCredentialToSubjectUseCase = addExternalCredentialToSubjectUseCase,
+        enrolmentRecordRepository = enrolmentRecordRepository,
+        tokenizationProcessor = tokenizationProcessor,
+        sessionCoroutineScope = CoroutineScope(testCoroutineRule.testCoroutineDispatcher),
+    )
+
     @Test
     fun `saves selection if signed in`() = runTest {
-        every { authStore.isProjectIdSignedIn(any()) } returns true
+        every { selectSubjectParams.scannedCredential } returns null
+        coEvery { authStore.isProjectIdSignedIn(PROJECT_ID) } returns true
+        val viewModel = createViewModel()
+
+        coVerify { eventRepository.addOrUpdateEvent(any()) }
+        val result = viewModel.finish
+            .test()
+            .value()
+            .getContentIfNotHandled()
+        assertThat(result?.isSubjectIdSaved).isTrue()
+        assertThat(result?.savedCredential).isNull()
+    }
+
+    @Test
+    fun `does not save selection if not signed in`() = runTest {
+        coEvery { authStore.isProjectIdSignedIn(PROJECT_ID) } returns false
+
+        val viewModel = createViewModel()
 
-        viewModel.saveGuidSelection(PROJECT_ID, SUBJECT_ID)
+        coVerify(exactly = 0) { eventRepository.addOrUpdateEvent(any()) }
         val result = viewModel.finish
             .test()
             .value()
             .getContentIfNotHandled()
+        assertThat(result?.isSubjectIdSaved).isFalse()
+        assertThat(result?.savedCredential).isNull()
+    }
+
+    @Test
+    fun `correctly handles exception with saving`() = runTest {
+        every { selectSubjectParams.scannedCredential } returns null
+        coEvery { authStore.isProjectIdSignedIn(PROJECT_ID) } returns true
+        coEvery { eventRepository.addOrUpdateEvent(any()) } throws RuntimeException("RuntimeException")
+
+        val viewModel = createViewModel()
 
-        assertThat(result).isTrue()
         coVerify { eventRepository.addOrUpdateEvent(any()) }
+        val result = viewModel.finish
+            .test()
+            .value()
+            .getContentIfNotHandled()
+        assertThat(result?.isSubjectIdSaved).isFalse()
+        assertThat(result?.savedCredential).isNull()
     }
 
     @Test
-    fun `does not save selection if not signed in`() = runTest {
-        every { authStore.isProjectIdSignedIn(any()) } returns false
+    fun `displays credential dialog when credential is scanned and not already linked`() = runTest {
+        val scannedCredential = mockk<ScannedCredential>(relaxed = true)
+        val displayedCredential = mockk<TokenizableString.Raw>(relaxed = true)
+        setupCredentialState(scannedCredential, displayedCredential, repositoryResponse = emptyList())
+
+        val viewModel = createViewModel()
+
+        val state = viewModel.stateLiveData.test().value()
+        assertThat(state).isInstanceOf(SelectSubjectState.CredentialDialogDisplayed::class.java)
+        val dialogState = state as SelectSubjectState.CredentialDialogDisplayed
+        assertThat(dialogState.scannedCredential).isEqualTo(scannedCredential)
+        assertThat(dialogState.displayedCredential).isEqualTo(displayedCredential)
+    }
+
+    @Test
+    fun `does not display credential dialog when credential is already linked`() = runTest {
+        val tokenizedValue = "tokenizedValue".asTokenizableEncrypted()
+        val type = ExternalCredentialType.NHISCard
+        val scannedCredential = mockk<ScannedCredential> {
+            every { credential } returns tokenizedValue
+            every { credentialType } returns type
+        }
+        val displayedCredential = mockk<TokenizableString.Raw>(relaxed = true)
+        val repositoryResponse = listOf<Subject>(mockk())
+        setupCredentialState(scannedCredential, displayedCredential, repositoryResponse = repositoryResponse)
+
+        val viewModel = createViewModel()
 
-        viewModel.saveGuidSelection(PROJECT_ID, SUBJECT_ID)
         val result = viewModel.finish
             .test()
             .value()
             .getContentIfNotHandled()
+        assertThat(result?.isSubjectIdSaved).isTrue()
+        assertThat(result?.savedCredential?.value).isEqualTo(tokenizedValue)
+        assertThat(result?.savedCredential?.type).isEqualTo(type)
+    }
 
-        assertThat(result).isFalse()
-        coVerify(exactly = 0) { eventRepository.addOrUpdateEvent(any()) }
+    @Test
+    fun `finishes without credential when no credential is scanned`() = runTest {
+        coEvery { authStore.isProjectIdSignedIn(PROJECT_ID) } returns true
+        every { selectSubjectParams.scannedCredential } returns null
+
+        val viewModel = createViewModel()
+
+        val result = viewModel.finish
+            .test()
+            .value()
+            .getContentIfNotHandled()
+        assertThat(result?.isSubjectIdSaved).isTrue()
+        assertThat(result?.savedCredential).isNull()
+    }
+
+    private fun setupCredentialState(
+        scannedCredential: ScannedCredential,
+        displayedCredential: TokenizableString.Raw,
+        repositoryResponse: List<Subject>,
+    ) {
+        val project = mockk<Project>(relaxed = true)
+
+        every { selectSubjectParams.scannedCredential } returns scannedCredential
+        coEvery { authStore.isProjectIdSignedIn(PROJECT_ID) } returns true
+        coEvery { authStore.signedInProjectId } returns PROJECT_ID
+        coEvery { configManager.getProject(PROJECT_ID) } returns project
+        every { project.id } returns PROJECT_ID
+        coEvery { enrolmentRecordRepository.load(any()) } returns repositoryResponse
+        coEvery {
+            tokenizationProcessor.decrypt(
+                encrypted = any(),
+                tokenKeyType = TokenKeyType.ExternalCredential,
+                project = project,
+            )
+        } returns displayedCredential
     }
 
     @Test
-    fun `correctly handles exception with saving`() = runTest {
-        every { authStore.isProjectIdSignedIn(any()) } returns true
-        coEvery { eventRepository.addOrUpdateEvent(any()) } throws Exception()
+    fun `saveCredential successfully saves credential`() = runTest {
+        val tokenizedValue = "tokenizedValue".asTokenizableEncrypted()
+        val type = ExternalCredentialType.NHISCard
+        val scannedCredential = mockk<ScannedCredential> {
+            every { credential } returns tokenizedValue
+            every { credentialType } returns type
+        }
+        coEvery {
+            addExternalCredentialToSubjectUseCase(
+                scannedCredential,
+                subjectId = SUBJECT_ID,
+                projectId = PROJECT_ID,
+            )
+        } returns Unit
+
+        viewModel.saveCredential(scannedCredential)
+
+        val state = viewModel.stateLiveData.test().value()
+        assertThat(state).isEqualTo(SelectSubjectState.SavingExternalCredential)
+
+        val result = viewModel.finish
+            .test()
+            .value()
+            .getContentIfNotHandled()
+        assertThat(result?.isSubjectIdSaved).isTrue()
+        assertThat(result?.savedCredential?.value).isEqualTo(tokenizedValue)
+        assertThat(result?.savedCredential?.type).isEqualTo(type)
+    }
+
+    @Test
+    fun `saveCredential handles exception when saving fails`() = runTest {
+        val scannedCredential = mockk<ScannedCredential>(relaxed = true)
+        coEvery {
+            addExternalCredentialToSubjectUseCase(
+                scannedCredential,
+                subjectId = SUBJECT_ID,
+                projectId = PROJECT_ID,
+            )
+        } throws RuntimeException("RuntimeException")
+
+        viewModel.saveCredential(scannedCredential)
+
+        val state = viewModel.stateLiveData.test().value()
+        assertThat(state).isEqualTo(SelectSubjectState.SavingExternalCredential)
 
-        viewModel.saveGuidSelection(PROJECT_ID, SUBJECT_ID)
         val result = viewModel.finish
             .test()
             .value()
             .getContentIfNotHandled()
+        assertThat(result?.isSubjectIdSaved).isTrue()
+        assertThat(result?.savedCredential).isNull()
+    }
+
+    @Test
+    fun `finishWithoutSavingCredential finishes with no credential`() = runTest {
+        viewModel.finishWithoutSavingCredential()
 
-        assertThat(result).isFalse()
+        val result = viewModel.finish
+            .test()
+            .value()
+            .getContentIfNotHandled()
+        assertThat(result?.isSubjectIdSaved).isTrue()
+        assertThat(result?.savedCredential).isNull()
     }
 
     companion object {
diff --git a/infra/credential-store/README.md b/infra/credential-store/README.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/infra/credential-store/build.gradle.kts b/infra/credential-store/build.gradle.kts
new file mode 100644
index 0000000000..b359c382cb
--- /dev/null
+++ b/infra/credential-store/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    id("simprints.feature")
+}
+
+android {
+    namespace = "com.simprints.infra.credential.store"
+}
+
+dependencies {
+    implementation(project(":infra:core"))
+}
diff --git a/infra/credential-store/src/main/AndroidManifest.xml b/infra/credential-store/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..e100076157
--- /dev/null
+++ b/infra/credential-store/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+
+</manifest>
diff --git a/infra/credential-store/src/main/java/com/simprints/infra/credential/store/CredentialImageRepository.kt b/infra/credential-store/src/main/java/com/simprints/infra/credential/store/CredentialImageRepository.kt
new file mode 100644
index 0000000000..eac9115a15
--- /dev/null
+++ b/infra/credential-store/src/main/java/com/simprints/infra/credential/store/CredentialImageRepository.kt
@@ -0,0 +1,70 @@
+package com.simprints.infra.credential.store
+
+import android.content.Context
+import android.graphics.Bitmap
+import com.simprints.core.DispatcherIO
+import com.simprints.infra.credential.store.model.CredentialScanImageType
+import com.simprints.infra.logging.LoggingConstants.CrashReportTag.MULTI_FACTOR_ID
+import com.simprints.infra.logging.Simber
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import java.io.File
+import javax.inject.Inject
+
+class CredentialImageRepository @Inject constructor(
+    @ApplicationContext private val context: Context,
+    @DispatcherIO private val ioDispatcher: CoroutineDispatcher,
+) {
+    /**
+     * Saves a bitmap to the application's cache directory as a JPEG file.
+     * @param bitmap the bitmap to save
+     * @param credential associated external credential data
+     * @param imageType type of an image: [CredentialScanImageType.FullDocument] if image contains entire document or
+     * [CredentialScanImageType.ZoomedInCredential] if image contains zoomed-in part of the external credential
+     *
+     * @return absolute path to the saved file
+     */
+    suspend fun saveCredentialScan(
+        bitmap: Bitmap,
+        imageType: CredentialScanImageType,
+    ): String = withContext(ioDispatcher) {
+        val file = imageType.toFile()
+        file.outputStream().use { outputStream ->
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream)
+        }
+        return@withContext file.absolutePath
+    }
+
+    /**
+     * Deletes cached scan file
+     */
+    fun deleteByPath(path: String) {
+        try {
+            val file = File(path)
+            if (file.exists()) {
+                if (file.delete()) {
+                    Simber.d("Deleted credential scan: ${file.absolutePath}", tag = MULTI_FACTOR_ID)
+                } else {
+                    Simber.d("Failed to delete credential scan: ${file.absolutePath}", tag = MULTI_FACTOR_ID)
+                }
+            }
+        } catch (e: Exception) {
+            Simber.e("Unable to delete cached scan file [$path]", e, tag = MULTI_FACTOR_ID)
+            throw (e)
+        }
+    }
+
+    /**
+     * Deletes all cached scans associated with the give external credential
+     */
+    fun deleteAllCredentialScans() = CredentialScanImageType.entries.forEach { imageType ->
+        deleteByPath(imageType.toFile().absolutePath)
+    }
+
+    private fun CredentialScanImageType.toFile(): File = File(context.cacheDir, toFileName())
+
+    private fun CredentialScanImageType.toFileName(): String = "credential_${this.toString().normalize()}_${System.currentTimeMillis()}.jpg"
+
+    private fun String.normalize() = trim().replace(" ", "")
+}
diff --git a/infra/credential-store/src/main/java/com/simprints/infra/credential/store/model/CredentialScanImageType.kt b/infra/credential-store/src/main/java/com/simprints/infra/credential/store/model/CredentialScanImageType.kt
new file mode 100644
index 0000000000..1a34be5c87
--- /dev/null
+++ b/infra/credential-store/src/main/java/com/simprints/infra/credential/store/model/CredentialScanImageType.kt
@@ -0,0 +1,6 @@
+package com.simprints.infra.credential.store.model
+
+enum class CredentialScanImageType {
+    FullDocument,
+    ZoomedInCredential,
+}
diff --git a/infra/credential-store/src/test/java/com/simprints/infra/credential/store/CredentialImageRepositoryTest.kt b/infra/credential-store/src/test/java/com/simprints/infra/credential/store/CredentialImageRepositoryTest.kt
new file mode 100644
index 0000000000..4ece233c6a
--- /dev/null
+++ b/infra/credential-store/src/test/java/com/simprints/infra/credential/store/CredentialImageRepositoryTest.kt
@@ -0,0 +1,86 @@
+package com.simprints.infra.credential.store
+
+import android.content.Context
+import android.graphics.Bitmap
+import com.google.common.truth.Truth.*
+import com.simprints.infra.credential.store.model.CredentialScanImageType
+import io.mockk.*
+import io.mockk.impl.annotations.MockK
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import java.io.File
+import java.io.FileOutputStream
+
+internal class CredentialImageRepositoryTest {
+    @MockK
+    lateinit var context: Context
+
+    @MockK
+    lateinit var bitmap: Bitmap
+
+    private lateinit var cacheDir: File
+    private lateinit var repository: CredentialImageRepository
+    private val testDispatcher = StandardTestDispatcher()
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this, relaxed = true)
+
+        cacheDir = File("cache")
+        every { context.cacheDir } returns cacheDir
+
+        repository = CredentialImageRepository(
+            context = context,
+            ioDispatcher = testDispatcher,
+        )
+    }
+
+    @After
+    fun tearDown() {
+        cacheDir.deleteRecursively()
+    }
+
+    @Test
+    fun `saveCredentialScan saves bitmap for all types`() = runTest(testDispatcher) {
+        CredentialScanImageType.entries.forEach { imageType ->
+            every { bitmap.compress(Bitmap.CompressFormat.JPEG, 100, any<FileOutputStream>()) } returns true
+            cacheDir.mkdirs()
+
+            val filePath = repository.saveCredentialScan(bitmap, imageType)
+
+            assertThat(filePath).startsWith(cacheDir.absolutePath)
+            assertThat(filePath).contains("credential_$imageType")
+            assertThat(filePath).endsWith(".jpg")
+            assertThat(File(filePath).exists()).isTrue()
+            verify { bitmap.compress(Bitmap.CompressFormat.JPEG, 100, any<FileOutputStream>()) }
+        }
+    }
+
+    @Test
+    fun `deleteByPath successfully deletes existing file`() {
+        cacheDir.mkdirs()
+        val testFile = File(cacheDir, "test_credential.jpg")
+        testFile.createNewFile()
+        assertThat(testFile.exists()).isTrue()
+        repository.deleteByPath(testFile.absolutePath)
+        assertThat(testFile.exists()).isFalse()
+    }
+
+    @Test
+    fun `deleteByPath handles non-existing file without exceptions`() {
+        val nonExistentPath = File(cacheDir, "non_existent.jpg").absolutePath
+        repository.deleteByPath(nonExistentPath)
+    }
+
+    @Test
+    fun `deleteAllCredentialScans deletes all credential scans`() {
+        cacheDir.mkdirs()
+        listOf("randomFile1", "randomFile2", "randomFile3").forEach { fileName ->
+            File(cacheDir, fileName).createNewFile()
+        }
+        repository.deleteAllCredentialScans()
+    }
+}
diff --git a/infra/events/build.gradle.kts b/infra/events/build.gradle.kts
index d2474f9214..6243555bd0 100644
--- a/infra/events/build.gradle.kts
+++ b/infra/events/build.gradle.kts
@@ -10,6 +10,7 @@ android {
 dependencies {
     implementation(project(":infra:config-store"))
     implementation(project(":infra:auth-store"))
+    implementation(project(":infra:credential-store"))
 
     implementation(libs.jackson.core)
 
diff --git a/infra/events/src/main/java/com/simprints/infra/events/session/SessionEventRepositoryImpl.kt b/infra/events/src/main/java/com/simprints/infra/events/session/SessionEventRepositoryImpl.kt
index aec3b4149e..8ba99ea1ea 100644
--- a/infra/events/src/main/java/com/simprints/infra/events/session/SessionEventRepositoryImpl.kt
+++ b/infra/events/src/main/java/com/simprints/infra/events/session/SessionEventRepositoryImpl.kt
@@ -1,5 +1,6 @@
 package com.simprints.infra.events.session
 
+import com.simprints.infra.credential.store.CredentialImageRepository
 import com.simprints.infra.events.EventRepository
 import com.simprints.infra.events.event.domain.models.Event
 import com.simprints.infra.events.event.domain.models.scope.EventScope
@@ -15,6 +16,7 @@ import javax.inject.Singleton
 internal class SessionEventRepositoryImpl @Inject constructor(
     private val eventRepository: EventRepository,
     private val sessionDataCache: SessionDataCache,
+    private val credentialImageRepository: CredentialImageRepository,
 ) : SessionEventRepository {
     private val eventsLock = Mutex()
 
@@ -66,6 +68,7 @@ internal class SessionEventRepositoryImpl @Inject constructor(
 
     override suspend fun closeCurrentSession(reason: EventScopeEndCause?) = withLockedContext {
         eventRepository.closeEventScope(getCurrentScopeInternal(), reason)
+        credentialImageRepository.deleteAllCredentialScans()
         sessionDataCache.eventCache.clear()
         sessionDataCache.eventScope = null
     }
diff --git a/infra/events/src/test/java/com/simprints/infra/events/session/SessionEventRepositoryImplTest.kt b/infra/events/src/test/java/com/simprints/infra/events/session/SessionEventRepositoryImplTest.kt
index 4b87f68411..9070cbcbe5 100644
--- a/infra/events/src/test/java/com/simprints/infra/events/session/SessionEventRepositoryImplTest.kt
+++ b/infra/events/src/test/java/com/simprints/infra/events/session/SessionEventRepositoryImplTest.kt
@@ -1,18 +1,15 @@
 package com.simprints.infra.events.session
 
-import com.google.common.truth.Truth.assertThat
+import com.google.common.truth.Truth.*
 import com.simprints.core.tools.time.Timestamp
+import com.simprints.infra.credential.store.CredentialImageRepository
 import com.simprints.infra.events.EventRepository
 import com.simprints.infra.events.event.domain.models.scope.EventScope
 import com.simprints.infra.events.event.domain.models.scope.EventScopeType
 import com.simprints.infra.events.sampledata.createEventWithSessionId
 import com.simprints.infra.events.sampledata.createSessionScope
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.every
+import io.mockk.*
 import io.mockk.impl.annotations.MockK
-import io.mockk.mockk
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
@@ -24,6 +21,9 @@ internal class SessionEventRepositoryImplTest {
     @MockK
     private lateinit var sessionDataCache: SessionDataCache
 
+    @MockK
+    private lateinit var credentialImageRepository: CredentialImageRepository
+
     private lateinit var sessionEventRepository: SessionEventRepositoryImpl
 
     @Before
@@ -32,8 +32,9 @@ internal class SessionEventRepositoryImplTest {
         sessionDataCache = SessionDataCache()
 
         sessionEventRepository = SessionEventRepositoryImpl(
-            eventRepository,
-            sessionDataCache,
+            eventRepository = eventRepository,
+            sessionDataCache = sessionDataCache,
+            credentialImageRepository = credentialImageRepository,
         )
     }
 
@@ -210,6 +211,7 @@ internal class SessionEventRepositoryImplTest {
 
         sessionEventRepository.closeCurrentSession(null)
 
+        coVerify { credentialImageRepository.deleteAllCredentialScans() }
         coVerify { eventRepository.closeEventScope(any<EventScope>(), null) }
         assertThat(sessionDataCache.eventScope).isNull()
         assertThat(sessionDataCache.eventCache).isEmpty()
diff --git a/infra/orchestrator-data/src/main/java/com/simprints/infra/orchestration/data/ActionResponse.kt b/infra/orchestrator-data/src/main/java/com/simprints/infra/orchestration/data/ActionResponse.kt
index 3d386746f5..8b013d9e5d 100644
--- a/infra/orchestrator-data/src/main/java/com/simprints/infra/orchestration/data/ActionResponse.kt
+++ b/infra/orchestrator-data/src/main/java/com/simprints/infra/orchestration/data/ActionResponse.kt
@@ -1,6 +1,7 @@
 package com.simprints.infra.orchestration.data
 
 import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
+import com.simprints.core.domain.externalcredential.ExternalCredential
 import com.simprints.core.domain.response.AppErrorReason
 import com.simprints.infra.orchestration.data.responses.AppMatchResult
 
@@ -29,6 +30,7 @@ sealed class ActionResponse(
         override val actionIdentifier: ActionRequestIdentifier,
         override val sessionId: String,
         val confirmed: Boolean,
+        val externalCredential: ExternalCredential?,
     ) : ActionResponse(actionIdentifier, sessionId)
 
     @ExcludedFromGeneratedTestCoverageReports("Data struct")
diff --git a/infra/orchestrator-data/src/main/java/com/simprints/infra/orchestration/data/responses/AppConfirmationResponse.kt b/infra/orchestrator-data/src/main/java/com/simprints/infra/orchestration/data/responses/AppConfirmationResponse.kt
index 7391f2ad9d..19617e57cc 100644
--- a/infra/orchestrator-data/src/main/java/com/simprints/infra/orchestration/data/responses/AppConfirmationResponse.kt
+++ b/infra/orchestrator-data/src/main/java/com/simprints/infra/orchestration/data/responses/AppConfirmationResponse.kt
@@ -2,6 +2,7 @@ package com.simprints.infra.orchestration.data.responses
 
 import androidx.annotation.Keep
 import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
+import com.simprints.core.domain.externalcredential.ExternalCredential
 import kotlinx.parcelize.Parcelize
 
 @Keep
@@ -9,4 +10,5 @@ import kotlinx.parcelize.Parcelize
 @ExcludedFromGeneratedTestCoverageReports("Data struct")
 data class AppConfirmationResponse(
     val identificationOutcome: Boolean,
+    val externalCredential: ExternalCredential?,
 ) : AppResponse()
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b827c4b8ee..42af0edad5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -133,6 +133,7 @@ include(
     ":infra:events",
     ":infra:config-store",
     ":infra:config-sync",
+    ":infra:credential-store",
     ":infra:enrolment-records:repository",
     ":infra:enrolment-records:realm-store",
     ":infra:enrolment-records:room-store",

From bd366ccfa37e98bddca8aacfa5082f3da92d8607 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Wed, 8 Oct 2025 11:20:03 +0300
Subject: [PATCH 3/9] [MS-1170] Moving AddExternalCredentialToSubjectUseCase to
 external-credential feature module

---
 .../AddExternalCredentialToSubjectUseCase.kt  | 14 ++-
 .../view/ScannedCredentialDialog.kt           |  2 +-
 .../NormalizeBitmapToPreviewUseCaseTest.kt    |  5 +-
 ...dExternalCredentialToSubjectUseCaseTest.kt | 96 +++++++++++++++++++
 .../screen/SelectSubjectViewModel.kt          |  2 +-
 .../screen/SelectSubjectViewModelTest.kt      |  2 +-
 6 files changed, 110 insertions(+), 11 deletions(-)
 rename feature/{select-subject/src/main/java/com/simprints/feature/selectsubject => external-credential/src/main/java/com/simprints/feature/externalcredential}/usecase/AddExternalCredentialToSubjectUseCase.kt (75%)
 create mode 100644 feature/external-credential/src/test/java/com/simprints/feature/externalcredential/usecase/AddExternalCredentialToSubjectUseCaseTest.kt

diff --git a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/usecase/AddExternalCredentialToSubjectUseCase.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/usecase/AddExternalCredentialToSubjectUseCase.kt
similarity index 75%
rename from feature/select-subject/src/main/java/com/simprints/feature/selectsubject/usecase/AddExternalCredentialToSubjectUseCase.kt
rename to feature/external-credential/src/main/java/com/simprints/feature/externalcredential/usecase/AddExternalCredentialToSubjectUseCase.kt
index 4e181f8ebc..5d7f5ac006 100644
--- a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/usecase/AddExternalCredentialToSubjectUseCase.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/usecase/AddExternalCredentialToSubjectUseCase.kt
@@ -1,4 +1,4 @@
-package com.simprints.feature.selectsubject.usecase
+package com.simprints.feature.externalcredential.usecase
 
 import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
 import com.simprints.feature.externalcredential.screens.search.model.toExternalCredential
@@ -7,11 +7,15 @@ import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepositor
 import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction
 import javax.inject.Inject
 
-internal class AddExternalCredentialToSubjectUseCase @Inject() constructor(
+class AddExternalCredentialToSubjectUseCase @Inject() constructor(
     private val enrolmentRecordRepository: EnrolmentRecordRepository,
     private val configManager: ConfigManager,
 ) {
-    suspend operator fun invoke(scannedCredential: ScannedCredential, subjectId: String, projectId: String) {
+    suspend operator fun invoke(
+        scannedCredential: ScannedCredential,
+        subjectId: String,
+        projectId: String,
+    ) {
         val project = configManager.getProject(projectId)
         val updateActions = listOf(
             SubjectAction.Update(
@@ -19,8 +23,8 @@ internal class AddExternalCredentialToSubjectUseCase @Inject() constructor(
                 externalCredentialsToAdd = listOf(scannedCredential.toExternalCredential(subjectId)),
                 faceSamplesToAdd = emptyList(),
                 fingerprintSamplesToAdd = emptyList(),
-                referenceIdsToRemove = emptyList()
-            )
+                referenceIdsToRemove = emptyList(),
+            ),
         )
         enrolmentRecordRepository.performActions(updateActions, project)
     }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt
index d13fa770b2..37e43b72bd 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
 import com.simprints.core.domain.tokenization.TokenizableString
 import com.simprints.feature.externalcredential.R
 import com.simprints.feature.externalcredential.databinding.DialogScannedCredentialBinding
@@ -17,7 +18,6 @@ import com.simprints.feature.externalcredential.databinding.ItemScannedImageBind
 import com.simprints.feature.externalcredential.ext.getCredentialFieldTitle
 import com.simprints.feature.externalcredential.ext.getCredentialTypeString
 import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
-import com.simprints.infra.uibase.annotations.ExcludedFromGeneratedTestCoverageReports
 import com.simprints.infra.resources.R as IDR
 
 @ExcludedFromGeneratedTestCoverageReports("UI class")
diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/NormalizeBitmapToPreviewUseCaseTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/NormalizeBitmapToPreviewUseCaseTest.kt
index 57f5eb063a..468212b0d5 100644
--- a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/NormalizeBitmapToPreviewUseCaseTest.kt
+++ b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanocr/usecase/NormalizeBitmapToPreviewUseCaseTest.kt
@@ -6,9 +6,8 @@ import android.graphics.Rect
 import androidx.core.graphics.scale
 import com.google.common.truth.Truth.*
 import com.simprints.feature.externalcredential.screens.scanocr.model.OcrCropConfig
-import io.mockk.every
-import io.mockk.impl.annotations.*
-import io.mockk.verify
+import io.mockk.*
+import io.mockk.impl.annotations.MockK
 import kotlinx.coroutines.test.runTest
 import org.junit.After
 import org.junit.Before
diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/usecase/AddExternalCredentialToSubjectUseCaseTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/usecase/AddExternalCredentialToSubjectUseCaseTest.kt
new file mode 100644
index 0000000000..62850f52c5
--- /dev/null
+++ b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/usecase/AddExternalCredentialToSubjectUseCaseTest.kt
@@ -0,0 +1,96 @@
+package com.simprints.feature.externalcredential.usecase
+
+import com.google.common.truth.Truth.*
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import com.simprints.core.domain.tokenization.asTokenizableEncrypted
+import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
+import com.simprints.infra.config.store.models.Project
+import com.simprints.infra.config.sync.ConfigManager
+import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository
+import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction
+import io.mockk.*
+import io.mockk.impl.annotations.MockK
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Test
+
+internal class AddExternalCredentialToSubjectUseCaseTest {
+    @MockK
+    lateinit var enrolmentRecordRepository: EnrolmentRecordRepository
+
+    @MockK
+    lateinit var configManager: ConfigManager
+
+    @MockK
+    lateinit var project: Project
+
+    @MockK
+    lateinit var scannedCredential: ScannedCredential
+
+    private lateinit var useCase: AddExternalCredentialToSubjectUseCase
+
+    private val projectId = "projectId"
+    private val subjectId = "subjectId"
+    private val encryptedCredential = "credential".asTokenizableEncrypted()
+    private val mockCredentialType = ExternalCredentialType.NHISCard
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this, relaxed = true)
+
+        coEvery { configManager.getProject(projectId) } returns project
+
+        useCase = AddExternalCredentialToSubjectUseCase(
+            enrolmentRecordRepository = enrolmentRecordRepository,
+            configManager = configManager,
+        )
+        every { scannedCredential.credential } returns encryptedCredential
+        every { scannedCredential.credentialType } returns mockCredentialType
+    }
+
+    @Test
+    fun `invokes enrolment repository with correct update action`() = runTest {
+        val actionsSlot = slot<List<SubjectAction>>()
+        useCase(scannedCredential, subjectId, projectId)
+        coVerify {
+            enrolmentRecordRepository.performActions(
+                capture(actionsSlot),
+                project,
+            )
+        }
+
+        val actions = actionsSlot.captured
+        assertThat(actions).hasSize(1)
+        val updateAction = actions.first() as SubjectAction.Update
+        assertThat(updateAction.subjectId).isEqualTo(subjectId)
+        assertThat(updateAction.externalCredentialsToAdd).hasSize(1)
+        assertThat(updateAction.faceSamplesToAdd).isEmpty()
+        assertThat(updateAction.fingerprintSamplesToAdd).isEmpty()
+        assertThat(updateAction.referenceIdsToRemove).isEmpty()
+    }
+
+    @Test
+    fun `adds correct external credential to subject`() = runTest {
+        val actionsSlot = slot<List<SubjectAction>>()
+
+        useCase(scannedCredential, subjectId, projectId)
+
+        coVerify {
+            enrolmentRecordRepository.performActions(
+                capture(actionsSlot),
+                project,
+            )
+        }
+
+        val updateAction = actionsSlot.captured.first() as SubjectAction.Update
+        val addedCredential = updateAction.externalCredentialsToAdd.first()
+        assertThat(addedCredential.value).isEqualTo(encryptedCredential)
+        assertThat(addedCredential.type).isEqualTo(mockCredentialType)
+    }
+
+    @Test
+    fun `retrieves project using correct project id`() = runTest {
+        useCase(scannedCredential, subjectId, projectId)
+        coVerify { configManager.getProject(projectId) }
+    }
+}
diff --git a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
index ab57655a3c..a4a62de48e 100644
--- a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
+++ b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
@@ -10,10 +10,10 @@ import com.simprints.core.livedata.send
 import com.simprints.core.tools.time.TimeHelper
 import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
 import com.simprints.feature.externalcredential.screens.search.model.toExternalCredential
+import com.simprints.feature.externalcredential.usecase.AddExternalCredentialToSubjectUseCase
 import com.simprints.feature.selectsubject.SelectSubjectParams
 import com.simprints.feature.selectsubject.SelectSubjectResult
 import com.simprints.feature.selectsubject.model.SelectSubjectState
-import com.simprints.feature.selectsubject.usecase.AddExternalCredentialToSubjectUseCase
 import com.simprints.infra.authstore.AuthStore
 import com.simprints.infra.config.store.models.TokenKeyType
 import com.simprints.infra.config.store.tokenization.TokenizationProcessor
diff --git a/feature/select-subject/src/test/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModelTest.kt b/feature/select-subject/src/test/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModelTest.kt
index d01ef1f305..f3dcf07fa1 100644
--- a/feature/select-subject/src/test/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModelTest.kt
+++ b/feature/select-subject/src/test/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModelTest.kt
@@ -9,9 +9,9 @@ import com.simprints.core.domain.tokenization.asTokenizableEncrypted
 import com.simprints.core.tools.time.TimeHelper
 import com.simprints.core.tools.time.Timestamp
 import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
+import com.simprints.feature.externalcredential.usecase.AddExternalCredentialToSubjectUseCase
 import com.simprints.feature.selectsubject.SelectSubjectParams
 import com.simprints.feature.selectsubject.model.SelectSubjectState
-import com.simprints.feature.selectsubject.usecase.AddExternalCredentialToSubjectUseCase
 import com.simprints.infra.authstore.AuthStore
 import com.simprints.infra.config.store.models.Project
 import com.simprints.infra.config.store.models.TokenKeyType

From 0117ae3aeb6446baca960781d603a76655f181f2 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Wed, 8 Oct 2025 13:10:51 +0300
Subject: [PATCH 4/9] [MS-1170] Excluding views and enums from test coverage

---
 .../core/domain/externalcredential/ExternalCredentialType.kt   | 3 +++
 .../src/main/java/com/simprints/infra/uibase/view/View.ext.kt  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/infra/core/src/main/java/com/simprints/core/domain/externalcredential/ExternalCredentialType.kt b/infra/core/src/main/java/com/simprints/core/domain/externalcredential/ExternalCredentialType.kt
index f813d876d5..1f6d4d5b6b 100644
--- a/infra/core/src/main/java/com/simprints/core/domain/externalcredential/ExternalCredentialType.kt
+++ b/infra/core/src/main/java/com/simprints/core/domain/externalcredential/ExternalCredentialType.kt
@@ -1,5 +1,8 @@
 package com.simprints.core.domain.externalcredential
 
+import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
+
+@ExcludedFromGeneratedTestCoverageReports("enum")
 enum class ExternalCredentialType {
     NHISCard,
     GhanaIdCard,
diff --git a/infra/ui-base/src/main/java/com/simprints/infra/uibase/view/View.ext.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/view/View.ext.kt
index bdd2b1304b..3cda7178ea 100644
--- a/infra/ui-base/src/main/java/com/simprints/infra/uibase/view/View.ext.kt
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/view/View.ext.kt
@@ -10,6 +10,7 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import com.simprints.infra.uibase.annotations.ExcludedFromGeneratedTestCoverageReports
 
+@ExcludedFromGeneratedTestCoverageReports("View animation")
 fun View.setPulseAnimation(isEnabled: Boolean) {
     (tag as? ObjectAnimator?)?.run {
         cancel()

From c47ba7a447575035146c5965de7702d0c4d0c98b Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Wed, 8 Oct 2025 13:13:56 +0300
Subject: [PATCH 5/9] =?UTF-8?q?[MS-1170]=20Excluding=20views=20from=20?=
 =?UTF-8?q?=CB=86test=20coverage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/externalcredential/view/ScannedCredentialDialog.kt  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt
index 37e43b72bd..9fd5837eff 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt
@@ -78,6 +78,7 @@ class ScannedCredentialDialog(
         }
     }
 
+    @ExcludedFromGeneratedTestCoverageReports("UI class")
     private inner class ImageAdapter(
         private val imagePaths: List<String>,
     ) : RecyclerView.Adapter<ImageAdapter.ImageViewHolder>() {
@@ -100,6 +101,7 @@ class ScannedCredentialDialog(
 
         override fun getItemCount() = imagePaths.size
 
+        @ExcludedFromGeneratedTestCoverageReports("UI class")
         inner class ImageViewHolder(
             itemView: View,
         ) : RecyclerView.ViewHolder(itemView) {

From 7faae768b16c35c99667baf9f0b30c2efccd9875 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Thu, 9 Oct 2025 07:50:51 +0300
Subject: [PATCH 6/9] [MS-1170] Using correct scope to delete files

---
 .../infra/credential/store/CredentialImageRepository.kt       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra/credential-store/src/main/java/com/simprints/infra/credential/store/CredentialImageRepository.kt b/infra/credential-store/src/main/java/com/simprints/infra/credential/store/CredentialImageRepository.kt
index eac9115a15..b0b0246bfe 100644
--- a/infra/credential-store/src/main/java/com/simprints/infra/credential/store/CredentialImageRepository.kt
+++ b/infra/credential-store/src/main/java/com/simprints/infra/credential/store/CredentialImageRepository.kt
@@ -39,7 +39,7 @@ class CredentialImageRepository @Inject constructor(
     /**
      * Deletes cached scan file
      */
-    fun deleteByPath(path: String) {
+    suspend fun deleteByPath(path: String) = with(ioDispatcher) {
         try {
             val file = File(path)
             if (file.exists()) {
@@ -58,7 +58,7 @@ class CredentialImageRepository @Inject constructor(
     /**
      * Deletes all cached scans associated with the give external credential
      */
-    fun deleteAllCredentialScans() = CredentialScanImageType.entries.forEach { imageType ->
+    suspend fun deleteAllCredentialScans() = CredentialScanImageType.entries.forEach { imageType ->
         deleteByPath(imageType.toFile().absolutePath)
     }
 

From ea86e4483696c6124bc0766bf7eca1d9974d07b7 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Thu, 9 Oct 2025 07:55:27 +0300
Subject: [PATCH 7/9] [MS-1170] Using ViewModel's scope for async operations,
 and only using sessionCoroutineScope for saving event

---
 .../feature/selectsubject/screen/SelectSubjectViewModel.kt   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
index a4a62de48e..7beca1549a 100644
--- a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
+++ b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
@@ -3,6 +3,7 @@ package com.simprints.feature.selectsubject.screen
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.simprints.core.SessionCoroutineScope
 import com.simprints.core.domain.tokenization.TokenizableString
 import com.simprints.core.livedata.LiveDataEventWithContent
@@ -62,7 +63,7 @@ internal class SelectSubjectViewModel @AssistedInject constructor(
     }
 
     init {
-        sessionCoroutineScope.launch {
+        viewModelScope.launch {
             val isSaved = saveGuidSelection(projectId = params.projectId, subjectId = params.subjectId)
             if (!isSaved) {
                 _finish.send(SelectSubjectResult(isSubjectIdSaved = false, savedCredential = null))
@@ -137,7 +138,7 @@ internal class SelectSubjectViewModel @AssistedInject constructor(
         _finish.send(SelectSubjectResult(isSubjectIdSaved = true, savedCredential = null))
     }
 
-    private suspend fun saveSelectionEvent(subjectId: String): Boolean {
+    private suspend fun saveSelectionEvent(subjectId: String): Boolean = with(sessionCoroutineScope) {
         try {
             val event = GuidSelectionEvent(timeHelper.now(), subjectId)
             eventRepository.addOrUpdateEvent(event)

From 35c6d2eff0e05c2dc34d0c947a5d9cdaf804ee5b Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Thu, 9 Oct 2025 09:23:13 +0300
Subject: [PATCH 8/9] [MS-1170] Using correct scope in view model

---
 .../feature/selectsubject/screen/SelectSubjectViewModel.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
index 7beca1549a..1d04b34ef7 100644
--- a/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
+++ b/feature/select-subject/src/main/java/com/simprints/feature/selectsubject/screen/SelectSubjectViewModel.kt
@@ -117,7 +117,7 @@ internal class SelectSubjectViewModel @AssistedInject constructor(
 
     fun saveCredential(scannedCredential: ScannedCredential) {
         updateState { SelectSubjectState.SavingExternalCredential }
-        sessionCoroutineScope.launch {
+        viewModelScope.launch {
             val addedCredential = try {
                 addExternalCredentialToSubjectUseCase(scannedCredential, subjectId = params.subjectId, projectId = params.projectId)
                 scannedCredential

From ef1461abe3f1bc2aa3ae703c38d050a6ba980d04 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Thu, 9 Oct 2025 09:23:24 +0300
Subject: [PATCH 9/9] [MS-1170] Fixing failing tests

---
 .../infra/credential/store/CredentialImageRepositoryTest.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/infra/credential-store/src/test/java/com/simprints/infra/credential/store/CredentialImageRepositoryTest.kt b/infra/credential-store/src/test/java/com/simprints/infra/credential/store/CredentialImageRepositoryTest.kt
index 2a960672d1..cdd228d04a 100644
--- a/infra/credential-store/src/test/java/com/simprints/infra/credential/store/CredentialImageRepositoryTest.kt
+++ b/infra/credential-store/src/test/java/com/simprints/infra/credential/store/CredentialImageRepositoryTest.kt
@@ -62,7 +62,7 @@ internal class CredentialImageRepositoryTest {
     }
 
     @Test
-    fun `deleteByPath successfully deletes existing file`() {
+    fun `deleteByPath successfully deletes existing file`() = runTest {
         cacheDir.mkdirs()
         val testFile = File(cacheDir, "test_credential.jpg")
         testFile.createNewFile()
@@ -72,13 +72,13 @@ internal class CredentialImageRepositoryTest {
     }
 
     @Test
-    fun `deleteByPath handles non-existing file without exceptions`() {
+    fun `deleteByPath handles non-existing file without exceptions`() = runTest {
         val nonExistentPath = File(cacheDir, "non_existent.jpg").absolutePath
         repository.deleteByPath(nonExistentPath)
     }
 
     @Test
-    fun `deleteAllCredentialScans deletes all credential scans`() {
+    fun `deleteAllCredentialScans deletes all credential scans`() = runTest {
         cacheDir.mkdirs()
         listOf("randomFile1", "randomFile2", "randomFile3").forEach { fileName ->
             File(cacheDir, fileName).createNewFile()