@smile_identity/react-native 10.3.3 → 11.0.0

package/android/build.gradle

@@ -78,7 +78,10 @@ android {
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-
+    
+    // Read version from package.json for setWrapperInfo
+    def packageJson = new groovy.json.JsonSlurper().parseText(file("../package.json").text)
+    buildConfigField "String", "SMILE_ID_VERSION", "\"${packageJson.version}\""
   }
 
   buildTypes {

package/android/gradle.properties

@@ -3,5 +3,5 @@ SmileId_minSdkVersion=21
 SmileId_targetSdkVersion=35
 SmileId_compileSdkVersion=35
 SmileId_ndkversion=21.4.7075529
-SmileId_androidVersion=10.6.3
+SmileId_androidVersion=11.0.3
 SmileId_kotlinCompilerExtensionVersion=1.5.11

package/android/src/main/java/com/smileidentity/react/SmileIdModule.kt

@@ -9,6 +9,7 @@ import com.facebook.react.bridge.WritableArray
 import com.smileidentity.SmileID
 import com.smileidentity.SmileIDCrashReporting
 import com.smileidentity.SmileIdSpec
+import com.smileidentity.metadata.models.WrapperSdkName
 import com.smileidentity.models.AuthenticationResponse
 import com.smileidentity.models.BiometricKycJobStatusResponse
 import com.smileidentity.models.DocumentVerificationJobStatusResponse
@@ -38,10 +39,9 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 
 class SmileIdModule internal constructor(
-  context: ReactApplicationContext
+  context: ReactApplicationContext,
 ) : SmileIdSpec(context) {
-
-  override fun getName(): String =  NAME
+  override fun getName(): String = NAME
 
   @ReactMethod
   override fun initialize(
@@ -49,9 +49,18 @@ class SmileIdModule internal constructor(
     enableCrashReporting: Boolean,
     config: ReadableMap?,
     apiKey: String?,
-    promise: Promise
+    promise: Promise,
   ) {
     try {
+      // Set wrapper info for React Native SDK
+      try {
+        val version = com.smileidentity.react.BuildConfig.SMILE_ID_VERSION
+        SmileID.setWrapperInfo(WrapperSdkName.ReactNative, version)
+      } catch (e: Exception) {
+        // Fallback to default version if BuildConfig is not available
+        SmileID.setWrapperInfo(WrapperSdkName.ReactNative, "unknown")
+      }
+
       when {
         // Case 1: Initialize with API key and config
         apiKey != null && config != null -> {
@@ -60,7 +69,7 @@ class SmileIdModule internal constructor(
             apiKey = apiKey,
             config = config.toConfig(),
             useSandbox = useSandBox,
-            enableCrashReporting = enableCrashReporting
+            enableCrashReporting = enableCrashReporting,
           )
         }
         // Case 2: Initialize with just config
@@ -69,14 +78,14 @@ class SmileIdModule internal constructor(
             context = reactApplicationContext,
             config = config.toConfig(),
             useSandbox = useSandBox,
-            enableCrashReporting = enableCrashReporting
+            enableCrashReporting = enableCrashReporting,
           )
         }
         // Case 3: Basic initialization
         else -> {
           SmileID.initialize(
             context = reactApplicationContext,
-            useSandbox = useSandBox
+            useSandbox = useSandBox,
           )
         }
       }
@@ -87,7 +96,10 @@ class SmileIdModule internal constructor(
   }
 
   @ReactMethod
-  override fun setCallbackUrl(callbackUrl: String, promise: Promise) {
+  override fun setCallbackUrl(
+    callbackUrl: String,
+    promise: Promise,
+  ) {
     SmileID.setCallbackUrl(callbackUrl = URL(callbackUrl))
     promise.resolve(null)
   }
@@ -98,16 +110,22 @@ class SmileIdModule internal constructor(
   }
 
   @ReactMethod
-  override fun setAllowOfflineMode(allowOfflineMode: Boolean, promise: Promise) {
+  override fun setAllowOfflineMode(
+    allowOfflineMode: Boolean,
+    promise: Promise,
+  ) {
     SmileID.setAllowOfflineMode(allowOfflineMode)
     promise.resolve(null)
   }
 
   @ReactMethod
-  override fun submitJob(jobId: String, promise: Promise) = launch(
+  override fun submitJob(
+    jobId: String,
+    promise: Promise,
+  ) = launch(
     work = { SmileID.submitJob(jobId) },
     clazz = Unit::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
@@ -137,7 +155,10 @@ class SmileIdModule internal constructor(
   }
 
   @ReactMethod
-  override fun cleanup(jobId: String, promise: Promise) {
+  override fun cleanup(
+    jobId: String,
+    promise: Promise,
+  ) {
     try {
       SmileID.cleanup(jobId)
       promise.resolve(null)
@@ -147,102 +168,141 @@ class SmileIdModule internal constructor(
   }
 
   @ReactMethod
-  override fun authenticate(request: ReadableMap, promise: Promise) = launch(
+  override fun authenticate(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
     work = {
       SmileID.api.authenticate(request = request.toAuthenticationRequest())
     },
     clazz = AuthenticationResponse::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
-  override fun prepUpload(request: ReadableMap, promise: Promise) = launch(
+  override fun prepUpload(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
     work = { SmileID.api.prepUpload(request = request.toPrepUploadRequest()) },
     clazz = PrepUploadResponse::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
-  override fun upload(url: String, request: ReadableMap, promise: Promise) = launch(
+  override fun upload(
+    url: String,
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
     work = { SmileID.api.upload(url, request.toUploadRequest()) },
     clazz = Unit::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
-  override fun doEnhancedKyc(request: ReadableMap, promise: Promise) = launch(
+  override fun doEnhancedKyc(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
     work = { SmileID.api.doEnhancedKyc(request = request.toEnhancedKycRequest()) },
     clazz = EnhancedKycResponse::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
-  override fun doEnhancedKycAsync(request: ReadableMap, promise: Promise) = launch(
+  override fun doEnhancedKycAsync(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
     work = { SmileID.api.doEnhancedKycAsync(request = request.toEnhancedKycRequest()) },
     clazz = EnhancedKycAsyncResponse::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
-  override fun getSmartSelfieJobStatus(request: ReadableMap, promise: Promise) = launch(
+  override fun getSmartSelfieJobStatus(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
     work = { SmileID.api.getSmartSelfieJobStatus(request = request.toJobStatusRequest()) },
     clazz = SmartSelfieJobStatusResponse::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
-  override fun getDocumentVerificationJobStatus(request: ReadableMap, promise: Promise) = launch(
+  override fun getDocumentVerificationJobStatus(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
     work = { SmileID.api.getDocumentVerificationJobStatus(request = request.toJobStatusRequest()) },
     clazz = DocumentVerificationJobStatusResponse::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
-  override fun getBiometricKycJobStatus(request: ReadableMap, promise: Promise) = launch(
+  override fun getBiometricKycJobStatus(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
     work = { SmileID.api.getBiometricKycJobStatus(request = request.toJobStatusRequest()) },
     clazz = BiometricKycJobStatusResponse::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
-  override fun getEnhancedDocumentVerificationJobStatus(request: ReadableMap, promise: Promise) =
-    launch(
-      work = { SmileID.api.getEnhancedDocumentVerificationJobStatus(request = request.toJobStatusRequest()) },
-      clazz = EnhancedDocumentVerificationJobStatusResponse::class.java,
-      promise = promise
-    )
+  override fun getEnhancedDocumentVerificationJobStatus(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
+    work = { SmileID.api.getEnhancedDocumentVerificationJobStatus(request = request.toJobStatusRequest()) },
+    clazz = EnhancedDocumentVerificationJobStatusResponse::class.java,
+    promise = promise,
+  )
 
   @ReactMethod
-  override fun getProductsConfig(request: ReadableMap, promise: Promise) = launch(
+  override fun getProductsConfig(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
     work = { SmileID.api.getProductsConfig(request = request.toProductsConfigRequest()) },
     clazz = ProductsConfigResponse::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
-  override fun getValidDocuments(request: ReadableMap, promise: Promise) = launch(
+  override fun getValidDocuments(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
     work = { SmileID.api.getValidDocuments(request = request.toProductsConfigRequest()) },
     clazz = ValidDocumentsResponse::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
-  override fun getServices(promise: Promise) = launch(
-    work = { SmileID.api.getServices() },
-    clazz = ServicesResponse::class.java,
-    promise = promise
-  )
+  override fun getServices(promise: Promise) =
+    launch(
+      work = { SmileID.api.getServices() },
+      clazz = ServicesResponse::class.java,
+      promise = promise,
+    )
 
   @ReactMethod
-  override fun pollSmartSelfieJobStatus(request: ReadableMap, promise: Promise) = launch(
+  override fun pollSmartSelfieJobStatus(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
     work = {
       val jobStatusRequest = request.toJobStatusRequest()
-      val interval = request.getIntOrDefault("interval") ?: run {
-        throw IllegalArgumentException("interval is required")
-      }
-      val numAttempts = request.getIntOrDefault("numAttempts") ?: run {
-        throw IllegalArgumentException("numAttempts is required")
-      }
+      val interval =
+        request.getIntOrDefault("interval") ?: run {
+          throw IllegalArgumentException("interval is required")
+        }
+      val numAttempts =
+        request.getIntOrDefault("numAttempts") ?: run {
+          throw IllegalArgumentException("numAttempts is required")
+        }
       pollJobStatus(
         apiCall = SmileID.api::pollSmartSelfieJobStatus,
         request = jobStatusRequest,
@@ -251,19 +311,24 @@ class SmileIdModule internal constructor(
       )
     },
     clazz = SmartSelfieJobStatusResponse::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
-  override fun pollDocumentVerificationJobStatus(request: ReadableMap, promise: Promise) = launch(
+  override fun pollDocumentVerificationJobStatus(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
     work = {
       val jobStatusRequest = request.toJobStatusRequest()
-      val interval = request.getIntOrDefault("interval") ?: run {
-        throw IllegalArgumentException("interval is required")
-      }
-      val numAttempts = request.getIntOrDefault("numAttempts") ?: run {
-        throw IllegalArgumentException("numAttempts is required")
-      }
+      val interval =
+        request.getIntOrDefault("interval") ?: run {
+          throw IllegalArgumentException("interval is required")
+        }
+      val numAttempts =
+        request.getIntOrDefault("numAttempts") ?: run {
+          throw IllegalArgumentException("numAttempts is required")
+        }
       pollJobStatus(
         apiCall = SmileID.api::pollDocumentVerificationJobStatus,
         request = jobStatusRequest,
@@ -272,19 +337,24 @@ class SmileIdModule internal constructor(
       )
     },
     clazz = DocumentVerificationJobStatusResponse::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
-  override fun pollBiometricKycJobStatus(request: ReadableMap, promise: Promise) = launch(
+  override fun pollBiometricKycJobStatus(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
     work = {
       val jobStatusRequest = request.toJobStatusRequest()
-      val interval = request.getIntOrDefault("interval") ?: run {
-        throw IllegalArgumentException("interval is required")
-      }
-      val numAttempts = request.getIntOrDefault("numAttempts") ?: run {
-        throw IllegalArgumentException("numAttempts is required")
-      }
+      val interval =
+        request.getIntOrDefault("interval") ?: run {
+          throw IllegalArgumentException("interval is required")
+        }
+      val numAttempts =
+        request.getIntOrDefault("numAttempts") ?: run {
+          throw IllegalArgumentException("numAttempts is required")
+        }
       pollJobStatus(
         apiCall = SmileID.api::pollBiometricKycJobStatus,
         request = jobStatusRequest,
@@ -293,53 +363,58 @@ class SmileIdModule internal constructor(
       )
     },
     clazz = BiometricKycJobStatusResponse::class.java,
-    promise = promise
+    promise = promise,
   )
 
   @ReactMethod
-  override fun pollEnhancedDocumentVerificationJobStatus(request: ReadableMap, promise: Promise) =
-    launch(
-      work = {
-        val jobStatusRequest = request.toJobStatusRequest()
-        val interval = request.getIntOrDefault("interval") ?: run {
+  override fun pollEnhancedDocumentVerificationJobStatus(
+    request: ReadableMap,
+    promise: Promise,
+  ) = launch(
+    work = {
+      val jobStatusRequest = request.toJobStatusRequest()
+      val interval =
+        request.getIntOrDefault("interval") ?: run {
           throw IllegalArgumentException("interval is required")
         }
-        val numAttempts = request.getIntOrDefault("numAttempts") ?: run {
+      val numAttempts =
+        request.getIntOrDefault("numAttempts") ?: run {
           throw IllegalArgumentException("numAttempts is required")
         }
-        pollJobStatus(
-          apiCall = SmileID.api::pollEnhancedDocumentVerificationJobStatus,
-          request = jobStatusRequest,
-          interval = interval.toLong(),
-          numAttempts = numAttempts.toLong(),
-        )
-      },
-      clazz = EnhancedDocumentVerificationJobStatusResponse::class.java,
-      promise = promise
-    )
+      pollJobStatus(
+        apiCall = SmileID.api::pollEnhancedDocumentVerificationJobStatus,
+        request = jobStatusRequest,
+        interval = interval.toLong(),
+        numAttempts = numAttempts.toLong(),
+      )
+    },
+    clazz = EnhancedDocumentVerificationJobStatusResponse::class.java,
+    promise = promise,
+  )
 
   private suspend fun <RequestType, ResponseType> pollJobStatus(
     apiCall: suspend (RequestType, Duration, Int) -> Flow<ResponseType>,
     request: RequestType,
     interval: Long,
     numAttempts: Long,
-  ): ResponseType {
-    return try {
+  ): ResponseType =
+    try {
       val response =
         withContext(Dispatchers.IO) {
           apiCall(request, interval.milliseconds, numAttempts.toInt())
             .map {
               it
-            }
-            .last()
+            }.last()
         }
       response
     } catch (e: Exception) {
       throw e
     }
-  }
 
-  private fun <T> toJson(result: T, clazz: Class<T>): String {
+  private fun <T> toJson(
+    result: T,
+    clazz: Class<T>,
+  ): String {
     val adapter = SmileID.moshi.adapter(clazz)
     return adapter.toJson(result)
   }
@@ -348,11 +423,12 @@ class SmileIdModule internal constructor(
     work: suspend () -> T,
     clazz: Class<T>,
     promise: Promise,
-    scope: CoroutineScope = CoroutineScope(Dispatchers.IO)
+    scope: CoroutineScope = CoroutineScope(Dispatchers.IO),
   ) {
-    val handler = CoroutineExceptionHandler { _, throwable ->
-      promise.reject(throwable)
-    }
+    val handler =
+      CoroutineExceptionHandler { _, throwable ->
+        promise.reject(throwable)
+      }
     scope.launch(handler) {
       try {
         val result = work()

package/android/src/main/java/com/smileidentity/react/views/SmileIDDocumentCaptureView.kt

@@ -7,6 +7,8 @@ import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -17,9 +19,12 @@ import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import com.facebook.react.bridge.ReactApplicationContext
 import com.smileidentity.R
 import com.smileidentity.SmileID
+import com.smileidentity.compose.SmartSelfieEnrollmentEnhanced
 import com.smileidentity.compose.document.DocumentCaptureScreen
 import com.smileidentity.compose.document.DocumentCaptureSide
 import com.smileidentity.compose.theme.colorScheme
+import com.smileidentity.compose.theme.typography
+import com.smileidentity.metadata.LocalMetadataProvider
 import com.smileidentity.react.results.DocumentCaptureResult
 import com.smileidentity.react.utils.DocumentCaptureResultAdapter
 import com.smileidentity.util.randomJobId
@@ -36,16 +41,13 @@ class SmileIDDocumentCaptureView(context: ReactApplicationContext) : SmileIDView
     composeView.apply {
       val customViewModelStoreOwner = CustomViewModelStoreOwner()
       setContent {
-        CompositionLocalProvider(LocalViewModelStoreOwner provides customViewModelStoreOwner) {
-          val colorScheme = SmileID.colorScheme.copy(background = Color.White)
-          Box(
-            modifier = Modifier
-              .background(color = colorScheme.background)
-              .windowInsetsPadding(WindowInsets.statusBars)
-              .consumeWindowInsets(WindowInsets.statusBars)
-              .fillMaxSize()
-          ) {
-            RenderDocumentCaptureScreen()
+        LocalMetadataProvider.MetadataProvider {
+          CompositionLocalProvider(LocalViewModelStoreOwner provides customViewModelStoreOwner) {
+            MaterialTheme(colorScheme = SmileID.colorScheme, typography = SmileID.typography) {
+              Surface(content = {
+                RenderDocumentCaptureScreen()
+              })
+            }
           }
         }
       }
@@ -87,7 +89,7 @@ class SmileIDDocumentCaptureView(context: ReactApplicationContext) : SmileIDView
       .build()
     val result = DocumentCaptureResult(
       documentFrontFile = if (front) file else null,
-      documentBackFile =  if (!front) file else null,
+      documentBackFile = if (!front) file else null,
     )
     val json = try {
       newMoshi

package/android/src/main/java/com/smileidentity/react/views/SmileIDSmartSelfieCaptureView.kt

@@ -14,10 +14,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.runtime.toMutableStateList
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
@@ -30,19 +28,13 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.smileidentity.R
 import com.smileidentity.SmileID
 import com.smileidentity.SmileIDOptIn
-import com.smileidentity.compose.SmartSelfieEnrollment
 import com.smileidentity.compose.SmartSelfieEnrollmentEnhanced
 import com.smileidentity.compose.components.ImageCaptureConfirmationDialog
-import com.smileidentity.compose.components.LocalMetadata
 import com.smileidentity.compose.selfie.SelfieCaptureScreen
 import com.smileidentity.compose.selfie.SmartSelfieInstructionsScreen
 import com.smileidentity.compose.theme.colorScheme
 import com.smileidentity.compose.theme.typography
-import com.smileidentity.models.v2.Metadata
-import com.smileidentity.react.results.SmartSelfieCaptureResult
-import com.smileidentity.react.utils.SelfieCaptureResultAdapter
-import com.smileidentity.results.SmartSelfieResult
-import com.smileidentity.results.SmileIDResult
+import com.smileidentity.metadata.LocalMetadataProvider
 import com.smileidentity.util.randomJobId
 import com.smileidentity.util.randomUserId
 import com.smileidentity.viewmodel.SelfieUiState
@@ -59,23 +51,26 @@ class SmileIDSmartSelfieCaptureView(context: ReactApplicationContext) : SmileIDS
     composeView.apply {
       val customViewModelStoreOwner = CustomViewModelStoreOwner()
       setContent {
-        CompositionLocalProvider(LocalViewModelStoreOwner provides customViewModelStoreOwner) {
-          if (useStrictMode) {
+        LocalMetadataProvider.MetadataProvider {
+          CompositionLocalProvider(LocalViewModelStoreOwner provides customViewModelStoreOwner) {
             val userId = randomUserId()
             MaterialTheme(colorScheme = SmileID.colorScheme, typography = SmileID.typography) {
               Surface(content = {
-                SmileID.SmartSelfieEnrollmentEnhanced(
-                  userId = userId,
-                  showAttribution = showAttribution,
-                  showInstructions = showInstructions,
-                  skipApiSubmission = true,
-                  extraPartnerParams = extraPartnerParams,
-                  onResult = { res -> handleResultCallback(res) },
-                )
+                if (useStrictMode) {
+                  SmileID.SmartSelfieEnrollmentEnhanced(
+                    userId = userId,
+                    showAttribution = showAttribution,
+                    showInstructions = showInstructions,
+                    skipApiSubmission = true,
+                    extraPartnerParams = extraPartnerParams,
+                    onResult = { res -> handleResultCallback(res) },
+                  )
+                } else {
+                  RenderSmartSelfieCaptureContent()
+                }
               })
             }
-          } else {
-            RenderSmartSelfieCaptureContent()
+
           }
         }
       }
@@ -86,8 +81,6 @@ class SmileIDSmartSelfieCaptureView(context: ReactApplicationContext) : SmileIDS
   private fun RenderSmartSelfieCaptureContent() {
     val userId = randomUserId()
     val jobId = randomJobId()
-    val metadata = Metadata.default().items.toMutableStateList()
-
     val viewModel: SelfieViewModel = viewModel(
       factory = viewModelFactory {
         SelfieViewModel(
@@ -96,7 +89,7 @@ class SmileIDSmartSelfieCaptureView(context: ReactApplicationContext) : SmileIDS
           jobId = jobId,
           allowNewEnroll = false,
           skipApiSubmission = true,
-          metadata = metadata,
+          metadata = mutableListOf(),
         )
       },
     )
@@ -104,27 +97,21 @@ class SmileIDSmartSelfieCaptureView(context: ReactApplicationContext) : SmileIDS
     val uiState = viewModel.uiState.collectAsStateWithLifecycle().value
     var acknowledgedInstructions by rememberSaveable { mutableStateOf(false) }
 
-    CompositionLocalProvider(
-      LocalMetadata provides remember { metadata },
-    ) {
-      MaterialTheme(colorScheme = SmileID.colorScheme, typography = SmileID.typography) {
-        Surface(content = {
-          when {
-            showInstructions && !acknowledgedInstructions -> SmartSelfieInstructionsScreen(
-              showAttribution = showAttribution,
-            ) {
-              acknowledgedInstructions = true
-            }
-            uiState.processingState != null -> HandleProcessingState(viewModel)
-            uiState.selfieToConfirm != null -> HandleSelfieConfirmation(
-              showConfirmation,
-              uiState,
-              viewModel,
-            )
-            else -> RenderSelfieCaptureScreen(userId, jobId, allowAgentMode ?: true, viewModel)
-          }
-        })
+    when {
+      showInstructions && !acknowledgedInstructions -> SmartSelfieInstructionsScreen(
+        showAttribution = showAttribution,
+      ) {
+        acknowledgedInstructions = true
       }
+
+      uiState.processingState != null -> HandleProcessingState(viewModel)
+      uiState.selfieToConfirm != null -> HandleSelfieConfirmation(
+        showConfirmation,
+        uiState,
+        viewModel,
+      )
+
+      else -> RenderSelfieCaptureScreen(userId, jobId, allowAgentMode ?: true, viewModel)
     }
   }
 
@@ -185,7 +172,7 @@ class SmileIDSmartSelfieCaptureView(context: ReactApplicationContext) : SmileIDS
   @Composable
   private fun HandleProcessingState(viewModel: SelfieViewModel) {
     try {
-      viewModel.onFinished { res -> handleResultCallback(res)}
+      viewModel.onFinished { res -> handleResultCallback(res) }
     } catch (e: Exception) {
       emitFailure(e)
     }