@stripe/stripe-react-native 0.60.0 → 0.62.0

package/android/.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="17" />
+  </component>
+</project>

package/android/.idea/gradle.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/lint-rules" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

package/android/.idea/kotlinc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="externalSystemId" value="Gradle" />
+    <option name="version" value="1.8.0" />
+  </component>
+</project>

package/android/.idea/migrations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>

package/android/.idea/misc.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

package/android/.idea/runConfigurations.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

package/android/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

package/android/gradle.properties

@@ -1,6 +1,6 @@
-StripeSdk_kotlinVersion=2.3.10
+StripeSdk_kotlinVersion=2.2.21
 StripeSdk_compileSdkVersion=30
 StripeSdk_targetSdkVersion=28
 StripeSdk_minSdkVersion=21
 # Keep StripeSdk_stripeVersion in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/android/gradle.properties
-StripeSdk_stripeVersion=23.0.2
+StripeSdk_stripeVersion=23.2.+

package/android/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Fri Aug 30 15:10:34 EDT 2024
+sdk.dir=/Users/samer/Library/Android/sdk

package/android/src/main/java/com/reactnativestripesdk/PaymentSheetManager.kt

@@ -86,209 +86,15 @@ class PaymentSheetManager(
   internal var paymentSheetIntentCreationCallback = CompletableDeferred<ReadableMap>()
   internal var paymentSheetConfirmationTokenCreationCallback = CompletableDeferred<ReadableMap>()
   private var keepJsAwake: KeepJsAwakeTask? = null
+  private var lastConfigureWasCustomFlow: Boolean? = null
 
   @SuppressLint("RestrictedApi")
   override fun onCreate() {
-    val activity = getCurrentActivityOrResolveWithError(initPromise) ?: return
-    val merchantDisplayName = arguments.getString("merchantDisplayName").orEmpty()
-    if (merchantDisplayName.isEmpty()) {
-      initPromise.resolve(
-        createError(ErrorType.Failed.toString(), "merchantDisplayName cannot be empty or null."),
-      )
-      return
-    }
-    paymentIntentClientSecret = arguments.getString("paymentIntentClientSecret").orEmpty()
-    setupIntentClientSecret = arguments.getString("setupIntentClientSecret").orEmpty()
-    intentConfiguration =
-      try {
-        buildIntentConfiguration(arguments.getMap("intentConfiguration"))
-      } catch (error: PaymentSheetException) {
-        initPromise.resolve(createError(ErrorType.Failed.toString(), error))
-        return
-      }
-
-    // Determine which callback type to use based on what's provided
-    val intentConfigMap = arguments.getMap("intentConfiguration")
-    val useConfirmationTokenCallback = intentConfigMap?.hasKey("confirmationTokenConfirmHandler") == true
-
-    val paymentOptionCallback =
-      PaymentOptionResultCallback { paymentOptionResult ->
-        paymentOptionResult.paymentOption?.let { paymentOption ->
-          // Convert drawable to bitmap asynchronously to avoid shared state issues
-          CoroutineScope(Dispatchers.Default).launch {
-            val imageString =
-              try {
-                convertDrawableToBase64(paymentOption.icon())
-              } catch (e: Exception) {
-                val result =
-                  createError(
-                    PaymentSheetErrorType.Failed.toString(),
-                    "Failed to process payment option image: ${e.message}",
-                  )
-                resolvePresentPromise(result)
-                return@launch
-              }
-
-            val option: WritableMap = Arguments.createMap()
-            option.putString("label", paymentOption.label)
-            option.putString("image", imageString)
-            val additionalFields: Map<String, Any> = mapOf("didCancel" to paymentOptionResult.didCancel)
-            val result = createResult("paymentOption", option, additionalFields)
-            resolvePresentPromise(result)
-          }
-        } ?: run {
-          val result =
-            if (paymentSheetTimedOut) {
-              paymentSheetTimedOut = false
-              createError(PaymentSheetErrorType.Timeout.toString(), "The payment has timed out")
-            } else {
-              createError(
-                PaymentSheetErrorType.Canceled.toString(),
-                "The payment option selection flow has been canceled",
-              )
-            }
-          resolvePresentPromise(result)
-        }
-      }
-
-    val paymentResultCallback =
-      PaymentSheetResultCallback { paymentResult ->
-        if (paymentSheetTimedOut) {
-          paymentSheetTimedOut = false
-          resolvePaymentResult(
-            createError(PaymentSheetErrorType.Timeout.toString(), "The payment has timed out"),
-          )
-        } else {
-          when (paymentResult) {
-            is PaymentSheetResult.Canceled -> {
-              resolvePaymentResult(
-                createError(
-                  PaymentSheetErrorType.Canceled.toString(),
-                  "The payment flow has been canceled",
-                ),
-              )
-            }
-
-            is PaymentSheetResult.Failed -> {
-              resolvePaymentResult(
-                createError(PaymentSheetErrorType.Failed.toString(), paymentResult.error),
-              )
-            }
-
-            is PaymentSheetResult.Completed -> {
-              resolvePaymentResult(Arguments.createMap())
-            }
-          }
-        }
-      }
-
-    val createIntentCallback =
-      CreateIntentCallback { paymentMethod, shouldSavePaymentMethod ->
-        val stripeSdkModule: StripeSdkModule? = context.getNativeModule(StripeSdkModule::class.java)
-        val params =
-          Arguments.createMap().apply {
-            putMap("paymentMethod", mapFromPaymentMethod(paymentMethod))
-            putBoolean("shouldSavePaymentMethod", shouldSavePaymentMethod)
-          }
-
-        stripeSdkModule?.eventEmitter?.emitOnConfirmHandlerCallback(params)
-
-        val resultFromJavascript = paymentSheetIntentCreationCallback.await()
-        // reset the completable
-        paymentSheetIntentCreationCallback = CompletableDeferred<ReadableMap>()
-
-        return@CreateIntentCallback resultFromJavascript.getString("clientSecret")?.let {
-          CreateIntentResult.Success(clientSecret = it)
-        }
-          ?: run {
-            val errorMap = resultFromJavascript.getMap("error")
-            CreateIntentResult.Failure(
-              cause = Exception(errorMap?.getString("message")),
-              displayMessage = errorMap?.getString("localizedMessage"),
-            )
-          }
-      }
-
-    val createConfirmationTokenCallback =
-      CreateIntentWithConfirmationTokenCallback { confirmationToken ->
-        val stripeSdkModule: StripeSdkModule? = context.getNativeModule(StripeSdkModule::class.java)
-        val params =
-          Arguments.createMap().apply {
-            putMap("confirmationToken", mapFromConfirmationToken(confirmationToken))
-          }
-
-        stripeSdkModule?.eventEmitter?.emitOnConfirmationTokenHandlerCallback(params)
-
-        val resultFromJavascript = paymentSheetConfirmationTokenCreationCallback.await()
-        // reset the completable
-        paymentSheetConfirmationTokenCreationCallback = CompletableDeferred<ReadableMap>()
-
-        return@CreateIntentWithConfirmationTokenCallback resultFromJavascript.getString("clientSecret")?.let {
-          CreateIntentResult.Success(clientSecret = it)
-        }
-          ?: run {
-            val errorMap = resultFromJavascript.getMap("error")
-            CreateIntentResult.Failure(
-              cause = Exception(errorMap?.getString("message")),
-              displayMessage = errorMap?.getString("localizedMessage"),
-            )
-          }
-      }
-
-    if (arguments.getBooleanOr("customFlow", false)) {
-      if (flowController == null) {
-        flowController =
-          if (intentConfiguration != null) {
-            val builder =
-              PaymentSheet.FlowController
-                .Builder(
-                  resultCallback = paymentResultCallback,
-                  paymentOptionResultCallback = paymentOptionCallback,
-                )
-            if (useConfirmationTokenCallback) {
-              builder.createIntentCallback(createConfirmationTokenCallback)
-            } else {
-              builder.createIntentCallback(createIntentCallback)
-            }
-            builder
-              .confirmCustomPaymentMethodCallback(this)
-              .build(activity)
-          } else {
-            PaymentSheet.FlowController
-              .Builder(
-                resultCallback = paymentResultCallback,
-                paymentOptionResultCallback = paymentOptionCallback,
-              ).confirmCustomPaymentMethodCallback(this)
-              .build(activity)
-          }
-      }
-    } else {
-      if (paymentSheet == null) {
-        paymentSheet =
-          if (intentConfiguration != null) {
-            val builder = PaymentSheet.Builder(paymentResultCallback)
-            if (useConfirmationTokenCallback) {
-              builder.createIntentCallback(createConfirmationTokenCallback)
-            } else {
-              builder.createIntentCallback(createIntentCallback)
-            }
-            @SuppressLint("RestrictedApi")
-            builder
-              .confirmCustomPaymentMethodCallback(this)
-              .build(activity, signal)
-          } else {
-            @SuppressLint("RestrictedApi")
-            PaymentSheet
-              .Builder(paymentResultCallback)
-              .confirmCustomPaymentMethodCallback(this)
-              .build(activity, signal)
-          }
-      }
-    }
     configure(arguments, initPromise)
   }
 
   override fun onDestroy() {
+    super.onDestroy()
     flowController = null
     paymentSheet = null
   }
@@ -380,15 +186,211 @@ class PaymentSheetManager(
 
     paymentSheetConfiguration = configurationBuilder.build()
     if (args.getBooleanOr("customFlow", false)) {
+      lastConfigureWasCustomFlow = true
+      if (flowController == null) {
+        initFlowController(args, promise)
+      }
       configureFlowController(promise)
     } else {
+      lastConfigureWasCustomFlow = false
+      if (paymentSheet == null) {
+        initPaymentSheet(args, promise)
+      }
       promise.resolve(Arguments.createMap())
     }
   }
 
+  private fun initPaymentSheet(
+    args: ReadableMap,
+    promise: Promise,
+  ) {
+    val activity = getCurrentActivityOrResolveWithError(promise) ?: return
+    val intentConfigMap = args.getMap("intentConfiguration")
+    val useConfirmationTokenCallback = intentConfigMap?.hasKey("confirmationTokenConfirmHandler") == true
+    paymentSheet =
+      if (intentConfiguration != null) {
+        val builder = PaymentSheet.Builder(buildPaymentSheetResultCallback())
+        if (useConfirmationTokenCallback) {
+          builder.createIntentCallback(buildCreateConfirmationTokenCallback())
+        } else {
+          builder.createIntentCallback(buildIntentCreationCallback())
+        }
+        @SuppressLint("RestrictedApi")
+        builder
+          .confirmCustomPaymentMethodCallback(this)
+          .build(activity, signal)
+      } else {
+        @SuppressLint("RestrictedApi")
+        PaymentSheet
+          .Builder(buildPaymentSheetResultCallback())
+          .confirmCustomPaymentMethodCallback(this)
+          .build(activity, signal)
+      }
+  }
+
+  private fun initFlowController(
+    args: ReadableMap,
+    promise: Promise,
+  ) {
+    val activity = getCurrentActivityOrResolveWithError(promise) ?: return
+    val intentConfigMap = args.getMap("intentConfiguration")
+    val useConfirmationTokenCallback =
+      intentConfigMap?.hasKey("confirmationTokenConfirmHandler") == true
+    flowController =
+      if (intentConfiguration != null) {
+        val builder =
+          PaymentSheet.FlowController
+            .Builder(
+              resultCallback = buildPaymentSheetResultCallback(),
+              paymentOptionResultCallback = buildPaymentOptionCallback(),
+            )
+        if (useConfirmationTokenCallback) {
+          builder.createIntentCallback(buildCreateConfirmationTokenCallback())
+        } else {
+          builder.createIntentCallback(buildIntentCreationCallback())
+        }
+        builder.confirmCustomPaymentMethodCallback(this)
+        builder.build(activity)
+      } else {
+        PaymentSheet.FlowController
+          .Builder(
+            resultCallback = buildPaymentSheetResultCallback(),
+            paymentOptionResultCallback = buildPaymentOptionCallback(),
+          ).confirmCustomPaymentMethodCallback(this)
+          .build(activity)
+      }
+  }
+
+  private fun buildCreateConfirmationTokenCallback(): CreateIntentWithConfirmationTokenCallback {
+    return CreateIntentWithConfirmationTokenCallback { confirmationToken ->
+      val stripeSdkModule: StripeSdkModule? = context.getNativeModule(StripeSdkModule::class.java)
+      val params =
+        Arguments.createMap().apply {
+          putMap("confirmationToken", mapFromConfirmationToken(confirmationToken))
+        }
+
+      stripeSdkModule?.eventEmitter?.emitOnConfirmationTokenHandlerCallback(params)
+
+      val resultFromJavascript = paymentSheetConfirmationTokenCreationCallback.await()
+      // reset the completable
+      paymentSheetConfirmationTokenCreationCallback = CompletableDeferred<ReadableMap>()
+
+      return@CreateIntentWithConfirmationTokenCallback resultFromJavascript.getString("clientSecret")?.let {
+        CreateIntentResult.Success(clientSecret = it)
+      }
+        ?: run {
+          val errorMap = resultFromJavascript.getMap("error")
+          CreateIntentResult.Failure(
+            cause = Exception(errorMap?.getString("message")),
+            displayMessage = errorMap?.getString("localizedMessage"),
+          )
+        }
+    }
+  }
+
+  private fun buildIntentCreationCallback(): CreateIntentCallback {
+    return CreateIntentCallback { paymentMethod, shouldSavePaymentMethod ->
+      val stripeSdkModule: StripeSdkModule? = context.getNativeModule(StripeSdkModule::class.java)
+      val params =
+        Arguments.createMap().apply {
+          putMap("paymentMethod", mapFromPaymentMethod(paymentMethod))
+          putBoolean("shouldSavePaymentMethod", shouldSavePaymentMethod)
+        }
+
+      stripeSdkModule?.eventEmitter?.emitOnConfirmHandlerCallback(params)
+
+      val resultFromJavascript = paymentSheetIntentCreationCallback.await()
+      // reset the completable
+      paymentSheetIntentCreationCallback = CompletableDeferred<ReadableMap>()
+
+      return@CreateIntentCallback resultFromJavascript.getString("clientSecret")?.let {
+        CreateIntentResult.Success(clientSecret = it)
+      }
+        ?: run {
+          val errorMap = resultFromJavascript.getMap("error")
+          CreateIntentResult.Failure(
+            cause = Exception(errorMap?.getString("message")),
+            displayMessage = errorMap?.getString("localizedMessage"),
+          )
+        }
+    }
+  }
+
+  private fun buildPaymentSheetResultCallback(): PaymentSheetResultCallback =
+    PaymentSheetResultCallback { paymentResult ->
+      if (paymentSheetTimedOut) {
+        paymentSheetTimedOut = false
+        resolvePaymentResult(
+          createError(PaymentSheetErrorType.Timeout.toString(), "The payment has timed out"),
+        )
+      } else {
+        when (paymentResult) {
+          is PaymentSheetResult.Canceled -> {
+            resolvePaymentResult(
+              createError(
+                PaymentSheetErrorType.Canceled.toString(),
+                "The payment flow has been canceled",
+              ),
+            )
+          }
+
+          is PaymentSheetResult.Failed -> {
+            resolvePaymentResult(
+              createError(PaymentSheetErrorType.Failed.toString(), paymentResult.error),
+            )
+          }
+
+          is PaymentSheetResult.Completed -> {
+            resolvePaymentResult(Arguments.createMap())
+          }
+        }
+      }
+    }
+
+  private fun buildPaymentOptionCallback(): PaymentOptionResultCallback {
+    return PaymentOptionResultCallback { paymentOptionResult ->
+      paymentOptionResult.paymentOption?.let { paymentOption ->
+        // Convert drawable to bitmap asynchronously to avoid shared state issues
+        CoroutineScope(Dispatchers.Default).launch {
+          val imageString =
+            try {
+              convertDrawableToBase64(paymentOption.icon())
+            } catch (e: Exception) {
+              val result =
+                createError(
+                  PaymentSheetErrorType.Failed.toString(),
+                  "Failed to process payment option image: ${e.message}",
+                )
+              resolvePresentPromise(result)
+              return@launch
+            }
+
+          val option: WritableMap = Arguments.createMap()
+          option.putString("label", paymentOption.label)
+          option.putString("image", imageString)
+          val additionalFields: Map<String, Any> = mapOf("didCancel" to paymentOptionResult.didCancel)
+          val result = createResult("paymentOption", option, additionalFields)
+          resolvePresentPromise(result)
+        }
+      } ?: run {
+        val result =
+          if (paymentSheetTimedOut) {
+            paymentSheetTimedOut = false
+            createError(PaymentSheetErrorType.Timeout.toString(), "The payment has timed out")
+          } else {
+            createError(
+              PaymentSheetErrorType.Canceled.toString(),
+              "The payment option selection flow has been canceled",
+            )
+          }
+        resolvePresentPromise(result)
+      }
+    }
+  }
+
   override fun onPresent() {
     keepJsAwake = KeepJsAwakeTask(context).apply { start() }
-    if (paymentSheet != null) {
+    if (lastConfigureWasCustomFlow == false) {
       if (!paymentIntentClientSecret.isNullOrEmpty()) {
         paymentSheet?.presentWithPaymentIntent(
           paymentIntentClientSecret!!,
@@ -402,7 +404,7 @@ class PaymentSheetManager(
           configuration = paymentSheetConfiguration,
         )
       }
-    } else if (flowController != null) {
+    } else if (lastConfigureWasCustomFlow == true && flowController != null) {
       flowController?.presentPaymentOptions()
     } else {
       promise?.resolve(createMissingInitError())

package/android/src/main/java/com/reactnativestripesdk/StripeSdkModule.kt

@@ -258,7 +258,9 @@ class StripeSdkModule(
     promise: Promise,
   ) {
     if (paymentSheetManager != null) {
-      paymentSheetManager?.configure(params, promise)
+      UiThreadUtil.runOnUiThread {
+        paymentSheetManager?.configure(params, promise)
+      }
     } else {
       paymentSheetManager =
         PaymentSheetManager(reactApplicationContext, params, promise).also {

package/android/src/main/java/com/reactnativestripesdk/pushprovisioning/AddToWalletButtonView.kt

@@ -2,6 +2,7 @@ package com.reactnativestripesdk.pushprovisioning
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
+import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.RippleDrawable
 import android.view.MotionEvent
@@ -12,10 +13,9 @@ import androidx.core.graphics.toColorInt
 import androidx.core.net.toUri
 import com.facebook.common.executors.UiThreadImmediateExecutorService
 import com.facebook.common.references.CloseableReference
-import com.facebook.datasource.BaseDataSubscriber
 import com.facebook.datasource.DataSource
 import com.facebook.drawee.backends.pipeline.Fresco
-import com.facebook.imagepipeline.image.CloseableBitmap
+import com.facebook.imagepipeline.datasource.BaseBitmapReferenceDataSubscriber
 import com.facebook.imagepipeline.image.CloseableImage
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.facebook.react.bridge.ReadableMap
@@ -36,6 +36,7 @@ class AddToWalletButtonView(
 
   private var loadedSource: String? = null
   private var currentDataSource: DataSource<CloseableReference<CloseableImage>>? = null
+  private var currentBitmapReference: CloseableReference<Bitmap>? = null
 
   init {
     scaleType = ScaleType.CENTER_CROP
@@ -118,20 +119,14 @@ class AddToWalletButtonView(
     currentDataSource = dataSource
 
     dataSource.subscribe(
-      object : BaseDataSubscriber<CloseableReference<CloseableImage>>() {
-        override fun onNewResultImpl(dataSource: DataSource<CloseableReference<CloseableImage>>) {
-          if (!dataSource.isFinished) return
-          val imageRef = dataSource.result ?: return
-
-          try {
-            val image = imageRef.get()
-            if (image is CloseableBitmap) {
-              val drawable = image.underlyingBitmap.toDrawable(resources)
-              setImageWithRipple(drawable)
-            }
-          } finally {
-            CloseableReference.closeSafely(imageRef)
-          }
+      object : BaseBitmapReferenceDataSubscriber() {
+        override fun onNewResultImpl(bitmapReference: CloseableReference<Bitmap>?) {
+          val image = bitmapReference?.get() ?: return
+
+          currentBitmapReference = bitmapReference.cloneOrNull()
+
+          val drawable = image.toDrawable(resources)
+          setImageWithRipple(drawable)
         }
 
         override fun onFailureImpl(dataSource: DataSource<CloseableReference<CloseableImage>>) {
@@ -165,6 +160,12 @@ class AddToWalletButtonView(
 
   private fun cancelCurrentRequest() {
     currentDataSource?.close()
+
+    currentBitmapReference?.let {
+      CloseableReference.closeSafely(it)
+    }
+
+    currentBitmapReference = null
     currentDataSource = null
   }
 

package/android/src/onramp/java/com/reactnativestripesdk/OnrampSdkModule.kt

@@ -47,7 +47,6 @@ import com.stripe.android.link.LinkController.PaymentMethodPreview
 import com.stripe.android.link.PaymentMethodPreviewDetails
 import com.stripe.android.model.CardBrand
 import com.stripe.android.model.DateOfBirth
-import com.stripe.android.paymentsheet.PaymentSheet
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -289,35 +288,8 @@ class OnrampSdkModule(
       }
     CoroutineScope(Dispatchers.IO).launch {
       val firstName = kycInfo.getString("firstName")
-      if (firstName.isNullOrEmpty()) {
-        promise.resolve(
-          createError(
-            ErrorType.Unknown.toString(),
-            "Missing required field: firstName",
-          ),
-        )
-        return@launch
-      }
       val lastName = kycInfo.getString("lastName")
-      if (lastName.isNullOrEmpty()) {
-        promise.resolve(
-          createError(
-            ErrorType.Unknown.toString(),
-            "Missing required field: lastName",
-          ),
-        )
-        return@launch
-      }
       val idNumber = kycInfo.getString("idNumber")
-      if (idNumber.isNullOrEmpty()) {
-        promise.resolve(
-          createError(
-            ErrorType.Unknown.toString(),
-            "Missing required field: idNumber",
-          ),
-        )
-        return@launch
-      }
 
       val dateOfBirthMap = kycInfo.getMap("dateOfBirth")
       val dob =
@@ -333,17 +305,11 @@ class OnrampSdkModule(
             year = dateOfBirthMap.getInt("year"),
           )
         } else {
-          promise.resolve(
-            createError(
-              ErrorType.Unknown.toString(),
-              "Missing required field: dateOfBirth",
-            ),
-          )
-          return@launch
+          null
         }
 
       val addressMap = kycInfo.getMap("address")
-      val addressObj = mapToPaymentSheetAddress(addressMap) ?: PaymentSheet.Address()
+      val addressObj = mapToPaymentSheetAddress(addressMap)
 
       val kycInfoObj =
         KycInfo(