assentify-sdk-react-native 0.0.42 → 1.0.0-Beta

package/README.md

@@ -58,7 +58,7 @@ yarn add assentify-sdk-react-native
 ## Installation iOS
 **Podfile**
 ```
-   platform :ios, '14.0'
+   platform :ios, '18.0'
    dynamic_frameworks = ['AssentifySdk', 'TensorFlowLiteSwift']
 
    permissions_path = '../node_modules/react-native-permissions/ios'
@@ -92,6 +92,10 @@ yarn add assentify-sdk-react-native
 ```
 
 ## Versions
+
+**1.0.0-Beta**
+1. **Full Flows Integration**
+
 **0.0.42**
 1. **Updated Gson to version 2.11.0**
 2. **Updated AndroidX Navigation to version 2.8.4**

package/android/build.gradle

@@ -1,37 +1,40 @@
 buildscript {
   // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["AssentifySdk_kotlinVersion"]
+  def kotlin_version = rootProject.ext.has("kotlinVersion")
+    ? rootProject.ext.get("kotlinVersion")
+    : project.properties["AssentifySdk_kotlinVersion"]
 
   repositories {
     google()
     mavenCentral()
+
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:8.1.1'
+    classpath 'com.android.tools.build:gradle:8.13.1'
     classpath 'de.undercouch:gradle-download-task:4.1.1'
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20"
   }
 }
 
 def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
+  return rootProject.hasProperty("newArchEnabled") &&
+    rootProject.getProperty("newArchEnabled") == "true"
 }
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
-
 def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["AssentifySdk_" + name]
+  return rootProject.ext.has(name)
+    ? rootProject.ext.get(name)
+    : project.properties["AssentifySdk_" + name]
 }
 
 def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["AssentifySdk_" + name]).toInteger()
+  return rootProject.ext.has(name)
+    ? rootProject.ext.get(name)
+    : (project.properties["AssentifySdk_" + name]).toInteger()
 }
 
 def supportsNamespace() {
@@ -59,7 +62,6 @@ android {
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-
   }
 
   buildTypes {
@@ -73,42 +75,37 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
+
+  kotlinOptions {
+    jvmTarget = "17"
+  }
+
   packagingOptions {
     pickFirst '**/libc++_shared.so'
     pickFirst '**/libfbjni.so'
   }
-
 }
 
 repositories {
-  jcenter()
-  mavenCentral()
   google()
+  mavenCentral()
   maven { url 'https://jitpack.io' }
 }
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-  // For < 0.71, this will be from the local maven repo
-  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"
+  compileOnly("com.facebook.react:react-android")
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  implementation 'com.github.AssentifyLTD:Assentify.SDK.Android:0.0.90'
-
-  /* Assentify Sdk Dependencies */
-  implementation 'com.google.code.gson:gson:2.11.0'
-  implementation 'androidx.navigation:navigation-fragment-ktx:2.8.4'
-  implementation 'androidx.navigation:navigation-ui-ktx:2.8.4'
-  implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.29'
-  implementation 'com.squareup.picasso:picasso:2.8'
-
-
+  implementation 'com.github.AssentifyLTD:Assentify.SDK.Android:1.0.0-Beta.10'
 
+  implementation 'com.google.code.gson:gson:2.13.2'
+  implementation 'androidx.navigation:navigation-fragment-ktx:2.9.7'
+  implementation 'androidx.navigation:navigation-ui-ktx:2.9.7'
+  implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.31'
+  implementation 'com.squareup.picasso:picasso:2.71828'
 }
-

package/android/gradle.properties

@@ -1,7 +1,7 @@
-AssentifySdk_kotlinVersion=1.8.22
+AssentifySdk_kotlinVersion=2.1.20
 AssentifySdk_minSdkVersion=24
 AssentifySdk_targetSdkVersion=33
-AssentifySdk_compileSdkVersion=33
+AssentifySdk_compileSdkVersion=36
 AssentifySdk_ndkversion=25.1.8937393
 android.useAndroidX=true
 android.enableJetifier=true

package/android/src/main/java/com/assentifysdk/AssentifySdkModule.kt

@@ -35,14 +35,13 @@ import ImageToBase64Converter
 import com.assentify.sdk.RemoteClient.Models.CreateUserDocumentResponseModel
 import com.assentify.sdk.RemoteClient.Models.DocumentTokensModel
 import com.assentify.sdk.RemoteClient.Models.SignatureResponseModel
-import com.assentify.sdk.CheckEnvironment.ContextAwareSigning
-import com.assentify.sdk.ContextAware.ContextAwareSigningCallback
 import com.assentify.sdk.Core.Constants.ActiveLiveType
+import com.assentify.sdk.Core.Constants.StepsNames
 
+import com.facebook.react.bridge.ReadableArray
 
 class AssentifySdkModule(context: ReactApplicationContext) :
-  AssentifySdkBaseModule(context), AssentifySdkCallback, SubmitDataCallback,
-  ContextAwareSigningCallback {
+  AssentifySdkBaseModule(context), AssentifySdkCallback, SubmitDataCallback{
 
   private lateinit var assentifySdk: AssentifySdk
   private lateinit var timeStarted: String
@@ -52,7 +51,6 @@ class AssentifySdkModule(context: ReactApplicationContext) :
   private val mainHandler = Handler(Looper.getMainLooper())
   private lateinit var environmentalConditions: EnvironmentalConditions
   private lateinit var templatesByCountry: List<TemplatesByCountry>
-  private lateinit var contextAwareSigning: ContextAwareSigning;
   private lateinit var userDocumentResponseModel: CreateUserDocumentResponseModel;
   private var documentURL = "";
 
@@ -64,7 +62,6 @@ class AssentifySdkModule(context: ReactApplicationContext) :
     performLivenessFace: Boolean? = null,
     ENV_CustomColor: String? = null,
     enableDetect: Boolean = true,
-    enableGuide: Boolean = true,
     androidMotionCardLimit :Int =  10,
     androidMotionPassportLimit:Int = 15,
     iOSMotionCardsLimit:Int = 30,
@@ -75,12 +72,13 @@ class AssentifySdkModule(context: ReactApplicationContext) :
     iOSBrightnessLowThreshold:Int = 50,
     activeLiveType : String =  "NONE",
     activeLivenessCheckCount:Int = 0,
-    retryCount:Int = 3,
     faceLivenessRetryCount:Int = 2,
     minRam:Int = 8,
     iOSMinRam:Int = 2,
     minCPUCores:Int = 6,
-    manualClickColor: String? = null
+    manualClickColor: String? = null,
+
+   countDownNumbersColor: String? = null
 
   ) {
     try {
@@ -104,7 +102,6 @@ class AssentifySdkModule(context: ReactApplicationContext) :
       println("$tag performLivenessFace: $performLivenessFace")
       println("$tag ENV_CustomColor: $ENV_CustomColor")
       println("$tag enableDetect: $enableDetect")
-      println("$tag enableGuide: $enableGuide")
       println("$tag androidMotionCardLimit: $androidMotionCardLimit")
       println("$tag androidMotionPassportLimit: $androidMotionPassportLimit")
       println("$tag iOSMotionCardsLimit: $iOSMotionCardsLimit")
@@ -115,12 +112,12 @@ class AssentifySdkModule(context: ReactApplicationContext) :
       println("$tag iOSBrightnessLowThreshold: $iOSBrightnessLowThreshold")
       println("$tag ActiveLiveType: $activeLiveType")
       println("$tag ActiveLivenessCheckCount: $activeLivenessCheckCount")
-      println("$tag RetryCount: $retryCount")
       println("$tag FaceLivenessRetryCount: $faceLivenessRetryCount")
       println("$tag MinRam: $minRam")
       println("$tag iOSMinRam: $iOSMinRam")
       println("$tag MinCPUCores: $minCPUCores")
       println("$tag ManualClickColor: $manualClickColor")
+      println("$tag countDownNumbersColor: $countDownNumbersColor")
       println("$tag ==============================================")
 
       val typeActive: ActiveLiveType = when (activeLiveType) {
@@ -134,16 +131,14 @@ class AssentifySdkModule(context: ReactApplicationContext) :
       environmentalConditions =
         EnvironmentalConditions(
           enableDetect,
-          enableGuide,
-          "#ffffff",
           ENV_CustomColor ?: "#f5a103",
+          CountDownNumbersColor = countDownNumbersColor!!,
           MotionCardLimit =  androidMotionCardLimit,
           MotionPassportLimit =  androidMotionPassportLimit,
           BRIGHTNESS_HIGH_THRESHOLD = androidBrightnessHighThreshold,
           BRIGHTNESS_LOW_THRESHOLD  = androidBrightnessLowThreshold,
           activeLiveType = typeActive,
           activeLivenessCheckCount = activeLivenessCheckCount,
-          retryCount = retryCount,
           faceLivenessRetryCount = faceLivenessRetryCount ,
           minRam = minRam,
           minCPUCores = minCPUCores
@@ -183,7 +178,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
     if (intent.resolveActivity(reactApplicationContext.packageManager) !== null) {
       intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
       intent.putExtra("holdHandColor", environmentalConditions.HoldHandColor)
-      intent.putExtra("processingColor", environmentalConditions.CustomColor)
+      intent.putExtra("processingColor", "#ffffff")
       intent.putExtra("language", language)
       intent.putExtra("showCountDown", true)
       intent.putExtra("apiKey", this.apiKey)
@@ -200,7 +195,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
     val intent = Intent(reactApplicationContext.currentActivity, ScanOtherActivity::class.java)
     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
     intent.putExtra("holdHandColor", environmentalConditions.HoldHandColor)
-    intent.putExtra("processingColor", environmentalConditions.CustomColor)
+    intent.putExtra("processingColor", "#ffffff")
     intent.putExtra("language", language)
     intent.putExtra("showCountDown", true)
     intent.putExtra("apiKey", this.apiKey)
@@ -210,7 +205,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun startScanQrPage(  jsonStringKycDocumentDetails: String,
+  fun startScanQrPage(  templatesByCountryObject: String,
                         language: String,
                         stepID :Int) {
     timeStarted = getCurrentDateTimeUTC();
@@ -218,8 +213,8 @@ class AssentifySdkModule(context: ReactApplicationContext) :
     val intent = Intent(reactApplicationContext.currentActivity, QrActivity::class.java)
     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
     intent.putExtra("holdHandColor", environmentalConditions.HoldHandColor)
-    intent.putExtra("processingColor", environmentalConditions.CustomColor)
-    intent.putExtra("kycDocumentDetails", jsonStringKycDocumentDetails)
+    intent.putExtra("processingColor", "#ffffff")
+    intent.putExtra("templatesByCountryObject", templatesByCountryObject)
     intent.putExtra("language", language)
     intent.putExtra("stepID", stepID)
     intent.putExtra("manualClickColor", this.manualClickColor)
@@ -228,7 +223,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
 
   @ReactMethod
   fun startScanIDPage(
-    jsonStringKycDocumentDetails: String,
+    templatesByCountryObject: String,
     language: String,
     flippingCard: Boolean,
     stepID :Int
@@ -239,11 +234,11 @@ class AssentifySdkModule(context: ReactApplicationContext) :
       val intent = Intent(reactApplicationContext.currentActivity, ScanIDActivity::class.java)
       intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
       intent.putExtra("holdHandColor", environmentalConditions.HoldHandColor)
-      intent.putExtra("processingColor", environmentalConditions.CustomColor)
-      intent.putExtra("kycDocumentDetails", jsonStringKycDocumentDetails)
+      intent.putExtra("processingColor", "#ffffff")
+      intent.putExtra("templatesByCountryObject", templatesByCountryObject)
       intent.putExtra("language", language)
       intent.putExtra("flippingCard", flippingCard)
-      intent.putExtra("title", getIdTitle(jsonStringKycDocumentDetails!!))
+      intent.putExtra("title", "ID Scan")
       intent.putExtra("showCountDown", true)
       intent.putExtra("apiKey", this.apiKey)
       intent.putExtra("stepID", stepID)
@@ -268,7 +263,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
     val intent = Intent(reactApplicationContext, FaceMatchActivity::class.java)
     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     intent.putExtra("holdHandColor", environmentalConditions.HoldHandColor)
-    intent.putExtra("processingColor", environmentalConditions.CustomColor)
+    intent.putExtra("processingColor", "#ffffff")
     intent.putExtra("showCountDown", showCountDown)
     intent.putExtra("stepID", stepID)
     intent.putExtra("manualClickColor", this.manualClickColor)
@@ -316,8 +311,8 @@ class AssentifySdkModule(context: ReactApplicationContext) :
         // }
         // sendEvent("AppResult", eventResultMap)
         this.configModel = configModel;
-        templatesByCountry = assentifySdk.getTemplates();
-
+        templatesByCountry = assentifySdk.getTemplates( configModel.stepMap.filter { it.stepDefinition == StepsNames.IdentificationDocumentCapture }.first().id
+        );
         val eventResultMap =
           Arguments.createMap().apply {
             val jsonTemplates = encodeTemplatesByCountryToJson(templatesByCountry)
@@ -346,7 +341,6 @@ class AssentifySdkModule(context: ReactApplicationContext) :
 
       var wrapUp: SubmitRequestModel? = null
       var blockLoader: SubmitRequestModel? = null
-      var contextAwareSigningModel: SubmitRequestModel? = null
       var submitRequestList: MutableList<SubmitRequestModel> = mutableListOf()
       val sharedStepDefinitions =
         reactApplicationContext.getSharedPreferences("StepDefinitions", Context.MODE_PRIVATE)
@@ -358,21 +352,10 @@ class AssentifySdkModule(context: ReactApplicationContext) :
 
       steps!!.forEach { item ->
         // ** Context Aware Signing *//
-        if (item.stepDefinition == StepsName.ContextAwareSigning) {
-          if (this.documentURL != "") {
-            val values: MutableMap<String, String> = mutableMapOf()
-            item.outputProperties.forEach { property ->
-              if (property.key.contains(ContextAwareSigningKeys.DocumentURL)) {
-                values.put(property.key, this.documentURL)
-              }
-            }
-            contextAwareSigningModel =
-              SubmitRequestModel(item.stepId, StepsName.ContextAwareSigning, values)
-          }
-        }
+
 
         // ** WrapUp *//
-        else if (item.stepDefinition == StepsName.WrapUp) {
+         if (item.stepDefinition == StepsName.WrapUp) {
           val values: MutableMap<String, String> = mutableMapOf()
           item.outputProperties.forEach { property ->
             if (property.key.contains(WrapUpKeys.TimeEnded)) {
@@ -444,9 +427,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
 
       submitRequestList.add(wrapUp!!)
       submitRequestList.add(blockLoader!!)
-      if (contextAwareSigningModel != null) {
-        submitRequestList.add(contextAwareSigningModel!!)
-      }
+
 
 
       assentifySdk.startSubmitData(this@AssentifySdkModule, submitRequestList)
@@ -471,65 +452,8 @@ class AssentifySdkModule(context: ReactApplicationContext) :
   }
 
 
-  /** Context Aware Signing */
-  @ReactMethod
-  fun startContextAwareSigning() {
-    contextAwareSigning = assentifySdk.startContextAwareSigning(this);
-  }
-
-  @ReactMethod
-  fun createUserDocumentInstance(data: ReadableMap? = null) {
-    val map: Map<String, String> =
-      data?.toHashMap()?.mapValues { it.value.toString() } ?: emptyMap()
-    contextAwareSigning.createUserDocumentInstance(map)
-  }
-
-  @ReactMethod
-  fun signature(signature: String) {
-    contextAwareSigning.signature(
-      this.userDocumentResponseModel.templateInstanceId,
-      this.userDocumentResponseModel.documentId,
-      signature
-    );
-  }
-
-
-  override fun onHasTokens(documentTokens: List<DocumentTokensModel>) {
-    val gson = Gson()
-    val jsonString = gson.toJson(documentTokens)
-
-    val eventResultMap =
-      Arguments.createMap().apply {
-        putString("documentTokens", jsonString)
-      }
-    sendEvent("onHasTokens", eventResultMap)
-  }
-
-  override fun onCreateUserDocumentInstance(userDocumentResponseModel: CreateUserDocumentResponseModel) {
-    this.userDocumentResponseModel = userDocumentResponseModel;
-    val gson = Gson()
-    val jsonString = gson.toJson(userDocumentResponseModel)
-
-    val eventResultMap =
-      Arguments.createMap().apply {
-        putString("userDocumentResponseModel", jsonString)
-      }
-    sendEvent("onCreateUserDocumentInstance", eventResultMap)
-  }
-
-  override fun onSignature(signatureResponseModel: SignatureResponseModel) {
-    this.documentURL = signatureResponseModel.signedDocumentUri;
-    val gson = Gson()
-    val jsonString = gson.toJson(signatureResponseModel)
 
-    val eventResultMap =
-      Arguments.createMap().apply {
-        putString("signatureResponseModel", jsonString)
-      }
-    sendEvent("onSignature", eventResultMap)
-  }
 
-  override fun onError(message: String) {}
 
 
   fun getCurrentDateTimeUTC(): String {
@@ -567,25 +491,64 @@ class AssentifySdkModule(context: ReactApplicationContext) :
     return resultMap
   }
 
-  private fun getIdTitle(jsonStringKycDocumentDetails: String): String {
-    var title = "";
-    val gson = Gson()
-    val listType = object : TypeToken<List<KycDocumentDetails>>() {}.type
-    val kycDocumentDetails: List<KycDocumentDetails> =
-      gson.fromJson(jsonStringKycDocumentDetails, listType)
-
-    val key0 = kycDocumentDetails.firstOrNull()
-      ?.templateProcessingKeyInformation
-
-    title = if (key0 == null) title else
-      templatesByCountry
-        .asSequence()
-        .flatMap { it.templates.asSequence() }
-        .firstOrNull { t ->
-          t.kycDocumentDetails.any { kd -> kd.templateProcessingKeyInformation == key0 }
-        }
-        ?.kycDocumentType ?: title
+  @ReactMethod
+  fun startFlow(
+    logoUrl: String,
+    svgBackgroundImageUrl: String,
+    textColor: String,
+    secondaryTextColor: String? = null,
+    backgroundCardColor: String? = null,
+    accentColor: String? = null,
+    backgroundColors: ReadableArray? = null,
+    clickColors: ReadableArray? = null,
+    angleDegreesBackgroundColors: Double? = null,
+    holdUntilBackgroundColors: Double? = null,
+    angleDegreesClickColors: Double? = null,
+    holdUntilClickColors: Double? = null,
+    backgroundType: String? = null,
+    clear: Boolean? = null,
+    language: String,
+    enableNfc: Boolean? = null,
+    enableQr: Boolean? = null,
+    jsonBlockLoaderCustomProperties: String? = null
+  ) {
+    val intent = Intent(reactApplicationContext, FlowActivity::class.java)
+    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    intent.putExtra("logoUrl", logoUrl)
+    intent.putExtra("svgBackgroundImageUrl", svgBackgroundImageUrl)
+    intent.putExtra("textColor", textColor)
+    intent.putExtra("secondaryTextColor", secondaryTextColor)
+    intent.putExtra("backgroundCardColor", backgroundCardColor)
+    intent.putExtra("accentColor", accentColor)
+    intent.putExtra("backgroundType", backgroundType)
+    intent.putExtra("clear", clear)
+    intent.putStringArrayListExtra(
+      "backgroundColors",
+      readableArrayToArrayList(backgroundColors)
+    )
+    intent.putExtra("angleDegreesBackgroundColors", angleDegreesBackgroundColors)
+    intent.putExtra("holdUntilBackgroundColors", holdUntilBackgroundColors)
+    intent.putStringArrayListExtra(
+      "clickColors",
+      readableArrayToArrayList(clickColors)
+    )
+    intent.putExtra("angleDegreesClickColors", angleDegreesClickColors)
+    intent.putExtra("holdUntilClickColors", holdUntilClickColors)
+    intent.putExtra("language", language)
+    intent.putExtra("enableNfc", enableNfc)
+    intent.putExtra("enableQr", enableQr)
+    intent.putExtra("jsonBlockLoaderCustomProperties", jsonBlockLoaderCustomProperties)
+    reactApplicationContext.currentActivity?.startActivity(intent)
+  }
+
+  private fun readableArrayToArrayList(array: ReadableArray?): ArrayList<String> {
+    val list = arrayListOf<String>()
+    if (array == null) return list
+
+    for (i in 0 until array.size()) {
+      array.getString(i)?.let { list.add(it) }
+    }
 
-    return title;
+    return list
   }
 }

package/android/src/main/java/com/assentifysdk/FaceMatchActivity.kt

@@ -37,7 +37,6 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.assentify.sdk.Core.Constants.BrightnessEvents
 import com.assentify.sdk.Core.Constants.FaceEvents
 import com.assentify.sdk.Core.Constants.ActiveLiveEvents
-import com.assentify.sdk.Core.Constants.DoneFlags
 import com.assentify.sdk.FaceMatch.FaceMatchManual
 import com.assentify.sdk.FaceMatch.FaceMatchResult
 
@@ -276,8 +275,8 @@ private lateinit var assentifySdk: AssentifySdk
     }
   }
 
-  override fun onComplete(dataModel: FaceResponseModel,doneFlag: DoneFlags) {
-    triggerCompleteEvent("onComplete",dataModel,doneFlag)
+  override fun onComplete(dataModel: FaceResponseModel) {
+    triggerCompleteEvent("onComplete",dataModel)
     /** Data To Submit **/
     val documentCaptureSharedPreferences =
       reactApplicationContext.getSharedPreferences("SubmitStepModel", Context.MODE_PRIVATE)
@@ -316,10 +315,11 @@ private lateinit var assentifySdk: AssentifySdk
     motion: MotionType,
     faceEvents: FaceEvents,
     zoomType: ZoomType,
-    detectedFaces:Int
+    detectedFaces:Int,
+    isCentered: Boolean,
   ) {
     runOnUiThread {
-      if(start == false && currentActiveLiveEvents == ActiveLiveEvents.Good){
+      if (start == false && currentActiveLiveEvents == ActiveLiveEvents.Good) {
         infoLayout.visibility = View.VISIBLE
         if(detectedFaces > 1){
           infoText.setText("We detected more than one face.Please keep just your face in view.")
@@ -333,57 +333,58 @@ private lateinit var assentifySdk: AssentifySdk
             infoText.setText("Please Move Further")
             infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.zoom_out))
           }
-        }
-        else if (motion != MotionType.SENDING && motion != MotionType.NO_DETECT) {
+        } else if (motion != MotionType.SENDING && motion != MotionType.NO_DETECT) {
           infoText.setText("Please Hold Your Hand")
           infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.info_icon))
 
-        } else if(brightnessEvents != BrightnessEvents.Good){
-          if(brightnessEvents == BrightnessEvents.TooDark){
+        } else if (brightnessEvents != BrightnessEvents.Good) {
+          if (brightnessEvents == BrightnessEvents.TooDark) {
             infoText.setText("Please increase the lighting")
             infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.info_icon))
           }
-          if(brightnessEvents == BrightnessEvents.TooBright){
+          if (brightnessEvents == BrightnessEvents.TooBright) {
             infoText.setText("Please reduce the lighting")
             infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.info_icon))
           }
-        } else if(faceEvents != FaceEvents.Good && faceEvents != FaceEvents.NO_DETECT) {
-          if(faceEvents == FaceEvents.RollLeft){
+        } else if (faceEvents != FaceEvents.Good && faceEvents != FaceEvents.NO_DETECT) {
+          if (faceEvents == FaceEvents.RollLeft) {
             infoText.setText("Please tilt your head to the right")
             infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.info_icon))
           }
-          if(faceEvents == FaceEvents.RollRight){
+          if (faceEvents == FaceEvents.RollRight) {
             infoText.setText("Please tilt your head to the left")
             infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.info_icon))
           }
-          if(faceEvents == FaceEvents.YawLeft){
+          if (faceEvents == FaceEvents.YawLeft) {
             infoText.setText("Please turn your head to the right")
             infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.info_icon))
           }
-          if(faceEvents == FaceEvents.YawRight){
+          if (faceEvents == FaceEvents.YawRight) {
             infoText.setText("Please turn your head to the left")
             infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.info_icon))
           }
-          if(faceEvents == FaceEvents.PitchUp){
+          if (faceEvents == FaceEvents.PitchUp) {
             infoText.setText("Please lower your head")
             infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.info_icon))
           }
-          if(faceEvents == FaceEvents.PitchDown){
+          if (faceEvents == FaceEvents.PitchDown) {
             infoText.setText("Please raise your head")
             infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.info_icon))
           }
-        }
-        else {
-          if (motion == MotionType.SENDING && zoomType == ZoomType.SENDING && brightnessEvents == BrightnessEvents.Good && faceEvents == FaceEvents.Good){
+        } else {
+          if (motion == MotionType.SENDING && zoomType == ZoomType.SENDING && brightnessEvents == BrightnessEvents.Good && faceEvents == FaceEvents.Good) {
             infoText.setText("Hold Steady")
             infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.info_icon))
           }
-          if (motion == MotionType.NO_DETECT && zoomType == ZoomType.NO_DETECT && faceEvents == FaceEvents.NO_DETECT){
+          if (motion == MotionType.NO_DETECT && zoomType == ZoomType.NO_DETECT && faceEvents == FaceEvents.NO_DETECT) {
             infoText.setText("Please face within circle")
             infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.info_icon))
+          }else if(!isCentered){
+            infoText.setText("Please center your face")
+            infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.info_icon))
           }
         }
-      }else {
+      } else {
         if(currentActiveLiveEvents == ActiveLiveEvents.Good){
           infoLayout.visibility = View.GONE
         }
@@ -410,14 +411,16 @@ private lateinit var assentifySdk: AssentifySdk
 
   }
 
+  override fun onCollectingManualImages(){
+  }
+
 
-  private fun triggerCompleteEvent(eventName:String, dataModel: FaceResponseModel?,doneFlag: DoneFlags){
+  private fun triggerCompleteEvent(eventName:String, dataModel: FaceResponseModel?){
       val eventResultMap = Arguments.createMap().apply {
         if(dataModel!=null){
           val gson = Gson()
           val jsonString = gson.toJson(dataModel.faceExtractedModel!!)
           putString("FaceMatchDataModel", jsonString)
-          putString("DoneFlag", doneFlag.toString())
         }
       }
       reactApplicationContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)