assentify-sdk-react-native 0.0.16 → 0.0.17

package/README.md

@@ -92,6 +92,11 @@ yarn add assentify-sdk-react-native
 ```
 
 ## Versions
+
+**0.0.17**
+- Active liveness improvements
+- Multiple Steps handling
+
 **0.0.16**
 - Active liveness
 

package/android/build.gradle

@@ -99,7 +99,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  implementation 'com.github.AssentifyLTD:Assentify.SDK.Android:0.0.68'
+  implementation 'com.github.AssentifyLTD:Assentify.SDK.Android:0.0.69'
 
   /* Assentify Sdk Dependencies */
   implementation 'com.google.code.gson:gson:2.8.9'

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

@@ -15,6 +15,7 @@ import android.util.Log
 import com.assentify.sdk.Core.Constants.EnvironmentalConditions
 import com.assentify.sdk.RemoteClient.Models.ConfigModel
 import com.assentify.sdk.RemoteClient.Models.StepDefinitions
+import com.assentify.sdk.RemoteClient.Models.StepMap
 import com.assentify.sdk.RemoteClient.Models.TemplatesByCountry
 import com.assentify.sdk.RemoteClient.Models.encodeTemplatesByCountryToJson
 import com.assentify.sdk.SubmitData.SubmitDataCallback
@@ -51,6 +52,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
   private lateinit var contextAwareSigning: ContextAwareSigning;
   private lateinit var userDocumentResponseModel: CreateUserDocumentResponseModel;
   private var documentURL = "";
+
   @ReactMethod
   fun initialize(
     apiKey: String,
@@ -130,7 +132,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun startScanPassport(language: String) {
+  fun startScanPassport(language: String,stepID :Int) {
     timeStarted = getCurrentDateTimeUTC();
     /** Nav To Passport Scan Page */
     val intent = Intent(reactApplicationContext, ScanPassportActivity::class.java)
@@ -141,12 +143,13 @@ class AssentifySdkModule(context: ReactApplicationContext) :
       intent.putExtra("language", language)
       intent.putExtra("showCountDown", true)
       intent.putExtra("apiKey", this.apiKey)
+      intent.putExtra("stepID", stepID)
       reactApplicationContext?.startActivity(intent)
     }
   }
 
   @ReactMethod
-  fun startScanOtherIDPage(language: String) {
+  fun startScanOtherIDPage(language: String ,stepID :Int) {
     timeStarted = getCurrentDateTimeUTC();
     /** Nav To Other Scan Page */
     val intent = Intent(currentActivity, ScanOtherActivity::class.java)
@@ -156,6 +159,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
     intent.putExtra("language", language)
     intent.putExtra("showCountDown", true)
     intent.putExtra("apiKey", this.apiKey)
+    intent.putExtra("stepID", stepID)
     currentActivity?.startActivity(intent)
   }
 
@@ -164,6 +168,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
     jsonStringKycDocumentDetails: String,
     language: String,
     flippingCard: Boolean,
+    stepID :Int
   ) {
     timeStarted = getCurrentDateTimeUTC();
     try {
@@ -178,6 +183,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
       intent.putExtra("title", getIdTitle(jsonStringKycDocumentDetails!!))
       intent.putExtra("showCountDown", true)
       intent.putExtra("apiKey", this.apiKey)
+      intent.putExtra("stepID", stepID)
       currentActivity?.startActivity(intent)
     } catch (e: Exception) {
       Log.e(NAME, e.toString())
@@ -185,7 +191,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun startFaceMatch(imageUrl: String, showCountDown: Boolean) {
+  fun startFaceMatch(imageUrl: String, showCountDown: Boolean,stepID :Int) {
     /**  Nav To Face Match Page **/
     var base64Image = ImageToBase64Converter(apiKey).execute(imageUrl).get()
     val sharedPreferences = reactApplicationContext.getSharedPreferences(
@@ -200,6 +206,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
     intent.putExtra("holdHandColor", environmentalConditions.HoldHandColor)
     intent.putExtra("processingColor", environmentalConditions.CustomColor)
     intent.putExtra("showCountDown", showCountDown)
+    intent.putExtra("stepID", stepID)
     currentActivity?.startActivity(intent)
   }
 
@@ -217,7 +224,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
       try {
         val documentCaptureStepModelPreferences =
           reactApplicationContext.getSharedPreferences(
-            "DocumentCaptureStepModel",
+            "SubmitStepModel",
             Context.MODE_PRIVATE
           )
         documentCaptureStepModelPreferences.edit().clear().apply()
@@ -230,6 +237,8 @@ class AssentifySdkModule(context: ReactApplicationContext) :
         editor.putString("Steps", json)
         editor.apply()
 
+        val jsonStepDefinitions: String = gson.toJson(configModel.stepDefinitions)
+
         /** Store React Application Context */
         AssentifySdkObject.setAssentifySdkObject(assentifySdk)
         ReactApplicationContextObject.setReactApplicationContextObject(reactApplicationContext)
@@ -244,9 +253,10 @@ class AssentifySdkModule(context: ReactApplicationContext) :
 
         val eventResultMap =
           Arguments.createMap().apply {
-            val jsonString = encodeTemplatesByCountryToJson(templatesByCountry)
+            val jsonTemplates = encodeTemplatesByCountryToJson(templatesByCountry)
             putBoolean("assentifySdkInitSuccess", true)
-            putString("AssentifySdkHasTemplates", jsonString)
+            putString("AssentifySdkHasTemplates", jsonTemplates)
+            putString("StepDefinitions", jsonStepDefinitions)
           }
         sendEvent("AppResult", eventResultMap)
       } catch (e: Exception) {
@@ -269,7 +279,7 @@ 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)
       val gson = Gson()
@@ -279,21 +289,21 @@ class AssentifySdkModule(context: ReactApplicationContext) :
 
       steps!!.forEach { item ->
         // ** Context Aware Signing *//
-        if(this.documentURL != ""){
-          if (item.stepDefinition == StepsName.ContextAwareSigning) {
+        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)
+            contextAwareSigningModel =
+              SubmitRequestModel(item.stepId, StepsName.ContextAwareSigning, values)
           }
         }
 
-
         // ** WrapUp *//
-        if (item.stepDefinition == StepsName.WrapUp) {
+        else if (item.stepDefinition == StepsName.WrapUp) {
           val values: MutableMap<String, String> = mutableMapOf()
           item.outputProperties.forEach { property ->
             if (property.key.contains(WrapUpKeys.TimeEnded)) {
@@ -303,7 +313,7 @@ class AssentifySdkModule(context: ReactApplicationContext) :
           wrapUp = SubmitRequestModel(item.stepId, StepsName.WrapUp, values)
         }
         // ** BlockLoader *//
-        if (item.stepDefinition == StepsName.BlockLoader) {
+        else if (item.stepDefinition == StepsName.BlockLoader) {
           val values: MutableMap<String, String> = mutableMapOf()
           item.outputProperties.forEach { property ->
             if (property.key.contains(BlockLoaderKeys.TimeStarted)) {
@@ -335,47 +345,34 @@ class AssentifySdkModule(context: ReactApplicationContext) :
           }
 
           blockLoader = SubmitRequestModel(item.stepId, StepsName.BlockLoader, values)
+        } else {
+          // ** Created Steps *//
+          val sharedStepDefinitionsDoc =
+            reactApplicationContext.getSharedPreferences(
+              "SubmitStepModel",
+              Context.MODE_PRIVATE
+            )
+          val gsonSharedStepDefinitions = Gson()
+          val jsonSharedStepDefinitions: String =
+            sharedStepDefinitionsDoc.getString(item.stepId.toString(), "")!!
+          val sharedStepDefinitionsStep: SubmitRequestModel =
+            gsonSharedStepDefinitions.fromJson(
+              jsonSharedStepDefinitions,
+              object : TypeToken<SubmitRequestModel>() {}.type
+            )
+          submitRequestList.add(sharedStepDefinitionsStep)
         }
       }
 
-      // ** Doc *//
-      val sharedStepDefinitionsDoc =
-        reactApplicationContext.getSharedPreferences(
-          "DocumentCaptureStepModel",
-          Context.MODE_PRIVATE
-        )
-      val gsonSharedStepDefinitionsDoc = Gson()
-      val jsonSharedStepDefinitionsDoc: String =
-        sharedStepDefinitionsDoc.getString("DocumentCaptureStep", "")!!
-      val sharedStepDefinitionsStepDoc: SubmitRequestModel =
-        gsonSharedStepDefinitionsDoc.fromJson(
-          jsonSharedStepDefinitionsDoc,
-          object : TypeToken<SubmitRequestModel>() {}.type
-        )
 
-      // ** Face *//
-      val sharedStepDefinitionsFace =
-        reactApplicationContext.getSharedPreferences("FaceMatchStepModel", Context.MODE_PRIVATE)
-      val gsonSharedStepDefinitionsFace = Gson()
-      val jsonSharedStepDefinitionsFace: String =
-        sharedStepDefinitionsFace.getString("FaceMatchStep", "")!!
-      val sharedStepDefinitionsStepFace: SubmitRequestModel =
-        gsonSharedStepDefinitionsFace.fromJson(
-          jsonSharedStepDefinitionsFace,
-          object : TypeToken<SubmitRequestModel>() {}.type
-        )
 
-      var submitRequestList: MutableList<SubmitRequestModel> = mutableListOf()
-      submitRequestList.add(sharedStepDefinitionsStepDoc)
-      submitRequestList.add(sharedStepDefinitionsStepFace)
       submitRequestList.add(wrapUp!!)
       submitRequestList.add(blockLoader!!)
-      if(contextAwareSigningModel !=null){
+      if (contextAwareSigningModel != null) {
         submitRequestList.add(contextAwareSigningModel!!)
       }
 
 
-
       assentifySdk.startSubmitData(this@AssentifySdkModule, submitRequestList)
     }
   }
@@ -406,13 +403,18 @@ class AssentifySdkModule(context: ReactApplicationContext) :
 
   @ReactMethod
   fun createUserDocumentInstance(data: ReadableMap? = null) {
-    val map: Map<String, String> = data?.toHashMap()?.mapValues { it.value.toString() } ?: emptyMap()
+    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);
+    contextAwareSigning.signature(
+      this.userDocumentResponseModel.templateInstanceId,
+      this.userDocumentResponseModel.documentId,
+      signature
+    );
   }
 
 

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

@@ -20,6 +20,7 @@ import com.assentify.sdk.Models.encodeBaseResponseDataModelToJson
 import com.assentify.sdk.RemoteClient.Models.KycDocumentDetails
 import com.assentify.sdk.FaceMatch.FaceMatchCallback
 import com.assentify.sdk.RemoteClient.Models.StepDefinitions
+import com.assentify.sdk.RemoteClient.Models.StepMap
 import com.assentify.sdk.FaceMatch.FaceResponseModel
 import com.assentify.sdk.FaceMatch.FaceMatch
 import com.google.gson.Gson
@@ -31,7 +32,6 @@ import android.content.Intent
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
-import android.util.Log
 import com.assentify.sdk.Core.Constants.BrightnessEvents
 import com.assentify.sdk.Core.Constants.FaceEvents
 import com.assentify.sdk.Core.Constants.ActiveLiveEvents
@@ -55,6 +55,7 @@ private lateinit var assentifySdk: AssentifySdk
   private lateinit var processingColor: String;
   private  var showCountDown: Boolean = true;
   private var start: Boolean = false;
+  private var stepID: Int = -1;
   private var currentActiveLiveEvents: ActiveLiveEvents = ActiveLiveEvents.Good
 
 
@@ -66,6 +67,7 @@ private lateinit var assentifySdk: AssentifySdk
     showCountDown = intent.getBooleanExtra("showCountDown",true)
     holdHandColor = intent.getStringExtra("holdHandColor")!!
     processingColor = intent.getStringExtra("processingColor")!!
+    stepID = intent.getIntExtra("stepID",-1)!!
 
     startAssentifySdk()
 
@@ -171,7 +173,7 @@ private lateinit var assentifySdk: AssentifySdk
     faceMatch = assentifySdk!!.startFaceMatch(
       this@FaceMatchActivity,
       base64SecondImage!!,
-      showCountDown
+      showCountDown,stepID!!
     );
     Thread.sleep(500);
     var fragmentManager = supportFragmentManager
@@ -216,30 +218,19 @@ private lateinit var assentifySdk: AssentifySdk
 
   override fun onComplete(dataModel: FaceResponseModel) {
     triggerCompleteEvent("onComplete",dataModel)
-    val sharedStepDefinitions =
-      reactApplicationContext.getSharedPreferences("StepDefinitions", Context.MODE_PRIVATE)
-    val gson = Gson()
-    val json: String = sharedStepDefinitions.getString("Steps", "")!!
-    val steps: List<StepDefinitions>? =
-      gson.fromJson(json, object : TypeToken<List<StepDefinitions>>() {}.type)
-    steps!!.forEach { item ->
-      if (item.stepDefinition == StepsName.FaceMatch) {
+      val documentCaptureSharedPreferences = reactApplicationContext.getSharedPreferences("SubmitStepModel", Context.MODE_PRIVATE)
         val documentCaptureModel = SubmitRequestModel(
-          item.stepId, StepsName.FaceMatch,
+          stepID, StepsName.FaceMatch,
           convertMap(dataModel.faceExtractedModel!!.outputProperties)
         );
-        val documentCaptureSharedPreferences =
-          reactApplicationContext.getSharedPreferences("FaceMatchStepModel", Context.MODE_PRIVATE)
         val documentCaptureSharedPreferencesEditor = documentCaptureSharedPreferences.edit()
         val documentCaptureGson = Gson()
         val documentCaptureStep: String = documentCaptureGson.toJson(documentCaptureModel)
         documentCaptureSharedPreferencesEditor.putString(
-          "FaceMatchStep",
+          stepID.toString(),
           documentCaptureStep
         );
         documentCaptureSharedPreferencesEditor.apply()
-      }
-    }
 
     runOnUiThread{
       start = false

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

@@ -27,6 +27,7 @@ import com.google.gson.reflect.TypeToken
 import com.facebook.react.bridge.ReactApplicationContext
 import pl.droidsonroids.gif.GifImageView
 import com.assentify.sdk.RemoteClient.Models.StepDefinitions
+import com.assentify.sdk.RemoteClient.Models.StepMap
 import ImageToBase64Converter
 import android.content.Intent
 import com.assentify.sdk.Core.Constants.BrightnessEvents
@@ -63,7 +64,7 @@ class ScanIDActivity: AppCompatActivity(),
   private  var showCountDown: Boolean = true;
   private  var apiKey: String = "";
   val values: MutableMap<String, String> = mutableMapOf()
-
+  private var stepID: Int = -1;
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_scan)
@@ -81,6 +82,7 @@ class ScanIDActivity: AppCompatActivity(),
     isFlippingCard = intent.getBooleanExtra("flippingCard",false)!!
     showCountDown = intent.getBooleanExtra("showCountDown",true)
     apiKey = intent.getStringExtra("apiKey")!!
+    stepID = intent.getIntExtra("stepID",-1)!!
     startAssentifySdk()
 
 
@@ -192,7 +194,7 @@ class ScanIDActivity: AppCompatActivity(),
   fun startAssentifySdk() {
     assentifySdk = AssentifySdkObject.getAssentifySdkObject();
     scanID = assentifySdk!!.startScanIDCard(
-      this@ScanIDActivity,kycDocumentDetails,language
+      this@ScanIDActivity,kycDocumentDetails,language,stepID!!
     );
     Thread.sleep(500);
     var fragmentManager = supportFragmentManager
@@ -254,35 +256,24 @@ class ScanIDActivity: AppCompatActivity(),
         if(order == kycDocumentDetails.size -1 ){
           scanID.stopScanning();
           /** Data To Submit **/
-          val sharedStepDefinitions =
-            getSharedPreferences("StepDefinitions", Context.MODE_PRIVATE)
-          val gson = Gson()
-          val json: String = sharedStepDefinitions.getString("Steps", "")!!
-          val steps: List<StepDefinitions>? =
-            gson.fromJson(json, object : TypeToken<List<StepDefinitions>>() {}.type)
-          steps!!.forEach { item ->
-            if (item.stepDefinition == StepsName.DocumentCapture) {
+
+            val documentCaptureSharedPreferences = reactApplicationContext.getSharedPreferences("SubmitStepModel", Context.MODE_PRIVATE)
               val documentCaptureModel = SubmitRequestModel(
-                item.stepId!!, item.stepDefinition,
+                stepID!!,StepsName.DocumentCapture,
                 values
               );
-              val documentCaptureSharedPreferences =
-                getSharedPreferences(
-                  "DocumentCaptureStepModel",
-                  Context.MODE_PRIVATE
-                )
               val documentCaptureSharedPreferencesEditor =
                 documentCaptureSharedPreferences.edit()
               val documentCaptureGson = Gson()
               val documentCaptureStep: String =
                 documentCaptureGson.toJson(documentCaptureModel)
               documentCaptureSharedPreferencesEditor.putString(
-                "DocumentCaptureStep",
+                stepID.toString(),
                 documentCaptureStep
               );
               documentCaptureSharedPreferencesEditor.apply()
-            }
-          }
+
+
           /** **/
           runOnUiThread {
             finish()
@@ -311,35 +302,23 @@ class ScanIDActivity: AppCompatActivity(),
       }else{
         scanID.stopScanning();
         /** Data To Submit **/
-        val sharedStepDefinitions =
-          getSharedPreferences("StepDefinitions", Context.MODE_PRIVATE)
-        val gson = Gson()
-        val json: String = sharedStepDefinitions.getString("Steps", "")!!
-        val steps: List<StepDefinitions>? =
-          gson.fromJson(json, object : TypeToken<List<StepDefinitions>>() {}.type)
-        steps!!.forEach { item ->
-          if (item.stepDefinition == StepsName.DocumentCapture) {
+          val documentCaptureSharedPreferences = reactApplicationContext.getSharedPreferences("SubmitStepModel", Context.MODE_PRIVATE)
             val documentCaptureModel = SubmitRequestModel(
-              item.stepId!!, item.stepDefinition,
+              stepID!!,StepsName.DocumentCapture,
               values
             );
-            val documentCaptureSharedPreferences =
-              getSharedPreferences(
-                "DocumentCaptureStepModel",
-                Context.MODE_PRIVATE
-              )
             val documentCaptureSharedPreferencesEditor =
               documentCaptureSharedPreferences.edit()
             val documentCaptureGson = Gson()
             val documentCaptureStep: String =
               documentCaptureGson.toJson(documentCaptureModel)
             documentCaptureSharedPreferencesEditor.putString(
-              "DocumentCaptureStep",
+              stepID.toString(),
               documentCaptureStep
             );
             documentCaptureSharedPreferencesEditor.apply()
-          }
-        }
+
+
         /** **/
         runOnUiThread {
           finish()

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

@@ -58,6 +58,7 @@ class ScanOtherActivity: AppCompatActivity(),
   private var start: Boolean = false;
   private  var showCountDown: Boolean = true;
   private  var apiKey: String = "";
+  private var stepID: Int = -1;
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_scan)
@@ -67,6 +68,7 @@ class ScanOtherActivity: AppCompatActivity(),
     language = intent.getStringExtra("language")!!
     apiKey = intent.getStringExtra("apiKey")!!
     showCountDown = intent.getBooleanExtra("showCountDown",true)
+    stepID = intent.getIntExtra("stepID",-1)!!
     startAssentifySdk()
 
 
@@ -174,7 +176,7 @@ class ScanOtherActivity: AppCompatActivity(),
     assentifySdk = AssentifySdkObject.getAssentifySdkObject();
     scanOther = assentifySdk!!.startScanOther(
       this@ScanOtherActivity,
-      language
+      language,stepID!!
     );
     Thread.sleep(500);
     var fragmentManager = supportFragmentManager
@@ -215,26 +217,18 @@ class ScanOtherActivity: AppCompatActivity(),
   override fun onComplete(dataModel: OtherResponseModel) {
     triggerCompleteEvent("onComplete",dataModel)
       /** Steps **/
-      val sharedStepDefinitions =
-        reactApplicationContext.getSharedPreferences("StepDefinitions", Context.MODE_PRIVATE)
-      val gson = Gson()
-      val json: String = sharedStepDefinitions.getString("Steps", "")!!
-      val steps: List<StepDefinitions>? =
-        gson.fromJson(json, object : TypeToken<List<StepDefinitions>>() {}.type)
-      steps!!.forEach { item ->
-        if (item.stepDefinition == StepsName.DocumentCapture) {
+        val documentCaptureSharedPreferences = reactApplicationContext.getSharedPreferences("SubmitStepModel", Context.MODE_PRIVATE)
           val documentCaptureModel = SubmitRequestModel(
-            item.stepId, StepsName.DocumentCapture,
+            stepID, StepsName.DocumentCapture,
             convertMap(dataModel.otherExtractedModel!!.transformedProperties)
           );
-          val documentCaptureSharedPreferences = reactApplicationContext.getSharedPreferences("DocumentCaptureStepModel", Context.MODE_PRIVATE)
           val documentCaptureSharedPreferencesEditor = documentCaptureSharedPreferences.edit()
           val documentCaptureGson = Gson()
           val documentCaptureStep: String = documentCaptureGson.toJson(documentCaptureModel)
-          documentCaptureSharedPreferencesEditor.putString("DocumentCaptureStep", documentCaptureStep);
+          documentCaptureSharedPreferencesEditor.putString(stepID.toString(), documentCaptureStep);
           documentCaptureSharedPreferencesEditor.apply()
-        }
-      }
+
+
       /** End **/
     runOnUiThread {
       scanOther.stopScanning();

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

@@ -17,6 +17,7 @@ import androidx.appcompat.widget.Toolbar
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.assentify.sdk.RemoteClient.Models.StepDefinitions
+import com.assentify.sdk.RemoteClient.Models.StepMap
 import com.assentify.sdk.Models.BaseResponseDataModel
 import com.assentify.sdk.ScanPassport.PassportResponseModel
 import com.assentify.sdk.ScanPassport.ScanPassportCallback
@@ -33,7 +34,6 @@ import android.graphics.PorterDuff
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import java.text.SimpleDateFormat
-import android.util.Log
 import com.assentify.sdk.Core.Constants.BrightnessEvents
 
 class ScanPassportActivity : AppCompatActivity(),
@@ -58,6 +58,7 @@ class ScanPassportActivity : AppCompatActivity(),
   private var start: Boolean = false;
   private var isDone: Boolean = false;
   private  var apiKey: String = "";
+  private var stepID: Int = -1;
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
@@ -68,6 +69,7 @@ class ScanPassportActivity : AppCompatActivity(),
     language = intent.getStringExtra("language")!!
     apiKey = intent.getStringExtra("apiKey")!!
     showCountDown = intent.getBooleanExtra("showCountDown",true)
+    stepID = intent.getIntExtra("stepID",-1)!!
 
     startAssentifySdk()
 
@@ -174,7 +176,7 @@ class ScanPassportActivity : AppCompatActivity(),
     assentifySdk = AssentifySdkObject.getAssentifySdkObject();
     scanPassport = assentifySdk!!.startScanPassport(
       this@ScanPassportActivity,
-      language
+      language,stepID!!
     );
     Thread.sleep(500);
     var fragmentManager = supportFragmentManager
@@ -228,31 +230,22 @@ class ScanPassportActivity : AppCompatActivity(),
     } else {
       triggerCompleteEvent("onComplete", dataModel)
       /** Steps **/
-      val sharedStepDefinitions =
-        reactApplicationContext.getSharedPreferences("StepDefinitions", Context.MODE_PRIVATE)
-      val gson = Gson()
-      val json: String = sharedStepDefinitions.getString("Steps", "")!!
-      val steps: List<StepDefinitions>? =
-        gson.fromJson(json, object : TypeToken<List<StepDefinitions>>() {}.type)
-      steps!!.forEach { item ->
-        if (item.stepDefinition == StepsName.DocumentCapture) {
+        val documentCaptureSharedPreferences = reactApplicationContext.getSharedPreferences("SubmitStepModel", Context.MODE_PRIVATE)
           val documentCaptureModel = SubmitRequestModel(
-            item.stepId, StepsName.DocumentCapture,
+            stepID, StepsName.DocumentCapture,
             convertMap(dataModel.passportExtractedModel!!.transformedProperties)
           );
-          val documentCaptureSharedPreferences = reactApplicationContext.getSharedPreferences(
-            "DocumentCaptureStepModel",
-            Context.MODE_PRIVATE
-          )
+
           val documentCaptureSharedPreferencesEditor = documentCaptureSharedPreferences.edit()
           val documentCaptureGson = Gson()
           val documentCaptureStep: String = documentCaptureGson.toJson(documentCaptureModel)
           documentCaptureSharedPreferencesEditor.putString(
-            "DocumentCaptureStep",
+            stepID.toString(),
             documentCaptureStep
           );
           documentCaptureSharedPreferencesEditor.apply()
-        }
+
+
         runOnUiThread {
           scanPassport.stopScanning();
           /** End **/
@@ -276,7 +269,7 @@ class ScanPassportActivity : AppCompatActivity(),
 
 
         }
-      }
+
     }
 
 

package/assentify-sdk.podspec

@@ -38,6 +38,6 @@ Pod::Spec.new do |s|
 
 
   s.dependency "React-Core"
-  s.dependency "AssentifySdk", '0.0.53'
+  s.dependency "AssentifySdk", '0.0.54'
 
 end

package/ios/NativeAssentifySdk.mm

@@ -19,16 +19,20 @@ RCT_EXTERN_METHOD(initialize: (NSString *)apiKey
                   )
 RCT_EXTERN_METHOD(startScanPassport:
                   (NSString *)language
+                  stepID:(NSNumber *)stepID
                   )
 RCT_EXTERN_METHOD(startScanOtherIDPage:
                   (NSString *)language
+                  stepID:(NSNumber *)stepID
                   )
 RCT_EXTERN_METHOD(startScanIDPage:(NSString *)kycDocumentDetails
                           language:(NSString *)language
                       flippingCard:(BOOL)flippingCard
+                      stepID:(NSNumber *)stepID
                       )
 RCT_EXTERN_METHOD(startFaceMatch:(NSString *)imageUrl
                       showCountDown:(BOOL)showCountDown
+                      stepID:(NSNumber *)stepID
                       )
 
 RCT_EXTERN_METHOD(startContextAwareSigning)