@stripe/stripe-react-native 0.42.0 → 0.43.0

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

@@ -18,13 +18,31 @@ import android.widget.FrameLayout
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.fragment.app.Fragment
-import com.facebook.react.bridge.*
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.bridge.WritableNativeMap
 import com.reactnativestripesdk.addresssheet.AddressSheetView
-import com.reactnativestripesdk.utils.*
+import com.reactnativestripesdk.utils.ErrorType
+import com.reactnativestripesdk.utils.KeepJsAwakeTask
+import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
+import com.reactnativestripesdk.utils.PaymentSheetErrorType
+import com.reactnativestripesdk.utils.PaymentSheetException
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.createResult
+import com.reactnativestripesdk.utils.mapFromPaymentMethod
+import com.reactnativestripesdk.utils.mapToPreferredNetworks
+import com.reactnativestripesdk.utils.removeFragment
 import com.stripe.android.ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi
-import com.stripe.android.paymentsheet.*
+import com.stripe.android.paymentsheet.CreateIntentCallback
+import com.stripe.android.paymentsheet.CreateIntentResult
+import com.stripe.android.paymentsheet.ExperimentalCustomerSessionApi
+import com.stripe.android.paymentsheet.PaymentOptionCallback
+import com.stripe.android.paymentsheet.PaymentSheet
+import com.stripe.android.paymentsheet.PaymentSheetResult
+import com.stripe.android.paymentsheet.PaymentSheetResultCallback
 import kotlinx.coroutines.CompletableDeferred
 import java.io.ByteArrayOutputStream
 import kotlin.Exception
@@ -32,7 +50,7 @@ import kotlin.Exception
 @OptIn(ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class)
 class PaymentSheetFragment(
   private val context: ReactApplicationContext,
-  private val initPromise: Promise
+  private val initPromise: Promise,
 ) : Fragment() {
   private var paymentSheet: PaymentSheet? = null
   private var flowController: PaymentSheet.FlowController? = null
@@ -44,23 +62,24 @@ class PaymentSheetFragment(
   private var presentPromise: Promise? = null
   private var paymentSheetTimedOut = false
   internal var paymentSheetIntentCreationCallback = CompletableDeferred<ReadableMap>()
+  private var keepJsAwake: KeepJsAwakeTask? = null
 
   override fun onCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,
-    savedInstanceState: Bundle?
-  ): View {
-    return FrameLayout(requireActivity()).also {
-      it.visibility = View.GONE
-    }
-  }
+    savedInstanceState: Bundle?,
+  ): View = FrameLayout(requireActivity()).also { it.visibility = View.GONE }
 
-  @OptIn(ExperimentalPaymentMethodLayoutApi::class)
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+  override fun onViewCreated(
+    view: View,
+    savedInstanceState: Bundle?,
+  ) {
     super.onViewCreated(view, savedInstanceState)
     val merchantDisplayName = arguments?.getString("merchantDisplayName").orEmpty()
     if (merchantDisplayName.isEmpty()) {
-      initPromise.resolve(createError(ErrorType.Failed.toString(), "merchantDisplayName cannot be empty or null."))
+      initPromise.resolve(
+        createError(ErrorType.Failed.toString(), "merchantDisplayName cannot be empty or null."),
+      )
       return
     }
     val primaryButtonLabel = arguments?.getString("primaryButtonLabel")
@@ -69,238 +88,291 @@ class PaymentSheetFragment(
     val billingDetailsBundle = arguments?.getBundle("defaultBillingDetails")
     val billingConfigParams = arguments?.getBundle("billingDetailsCollectionConfiguration")
     val paymentMethodOrder = arguments?.getStringArrayList("paymentMethodOrder")
-    val allowsRemovalOfLastSavedPaymentMethod = arguments?.getBoolean("allowsRemovalOfLastSavedPaymentMethod", true) ?: true
+    val allowsRemovalOfLastSavedPaymentMethod =
+      arguments?.getBoolean("allowsRemovalOfLastSavedPaymentMethod", true) ?: true
     paymentIntentClientSecret = arguments?.getString("paymentIntentClientSecret").orEmpty()
     setupIntentClientSecret = arguments?.getString("setupIntentClientSecret").orEmpty()
-    intentConfiguration = try {
-      buildIntentConfiguration(arguments?.getBundle("intentConfiguration"))
-    } catch (error: PaymentSheetException) {
-      initPromise.resolve(createError(ErrorType.Failed.toString(), error))
-      return
-    }
-    val appearance = try {
-      buildPaymentSheetAppearance(arguments?.getBundle("appearance"), context)
-    } catch (error: PaymentSheetAppearanceException) {
-      initPromise.resolve(createError(ErrorType.Failed.toString(), error))
-      return
-    }
+    intentConfiguration =
+      try {
+        buildIntentConfiguration(arguments?.getBundle("intentConfiguration"))
+      } catch (error: PaymentSheetException) {
+        initPromise.resolve(createError(ErrorType.Failed.toString(), error))
+        return
+      }
+    val appearance =
+      try {
+        buildPaymentSheetAppearance(arguments?.getBundle("appearance"), context)
+      } catch (error: PaymentSheetAppearanceException) {
+        initPromise.resolve(createError(ErrorType.Failed.toString(), error))
+        return
+      }
 
-    val customerConfiguration = try {
-      buildCustomerConfiguration(arguments)
-    } catch (error: PaymentSheetException) {
-      initPromise.resolve(createError(ErrorType.Failed.toString(), error))
-      return
-    }
+    val customerConfiguration =
+      try {
+        buildCustomerConfiguration(arguments)
+      } catch (error: PaymentSheetException) {
+        initPromise.resolve(createError(ErrorType.Failed.toString(), error))
+        return
+      }
 
-    val shippingDetails = arguments?.getBundle("defaultShippingDetails")?.let {
-      AddressSheetView.buildAddressDetails(it)
-    }
+    val shippingDetails =
+      arguments?.getBundle("defaultShippingDetails")?.let {
+        AddressSheetView.buildAddressDetails(it)
+      }
+
+    val paymentOptionCallback =
+      PaymentOptionCallback { paymentOption ->
+        val result =
+          paymentOption?.let {
+            val bitmap = getBitmapFromVectorDrawable(context, it.drawableResourceId)
+            val imageString = getBase64FromBitmap(bitmap)
+            val option: WritableMap = WritableNativeMap()
+            option.putString("label", it.label)
+            option.putString("image", imageString)
+            createResult("paymentOption", option)
+          }
+            ?: run {
+              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 paymentOptionCallback = PaymentOptionCallback { paymentOption ->
-      val result = paymentOption?.let {
-        val bitmap = getBitmapFromVectorDrawable(context, it.drawableResourceId)
-        val imageString = getBase64FromBitmap(bitmap)
-        val option: WritableMap = WritableNativeMap()
-        option.putString("label", it.label)
-        option.putString("image", imageString)
-        createResult("paymentOption", option)
-      } ?: run {
+    val paymentResultCallback =
+      PaymentSheetResultCallback { paymentResult ->
         if (paymentSheetTimedOut) {
           paymentSheetTimedOut = false
-          createError(PaymentSheetErrorType.Timeout.toString(), "The payment has timed out")
+          resolvePaymentResult(
+            createError(PaymentSheetErrorType.Timeout.toString(), "The payment has timed out"),
+          )
         } else {
-          createError(PaymentSheetErrorType.Canceled.toString(), "The payment option selection flow has been canceled")
-        }
-      }
-      presentPromise?.resolve(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(WritableNativeMap())
-            // Remove the fragment now, we can be sure it won't be needed again if an intent is successful
-            removeFragment(context)
-            paymentSheet = null
-            flowController = null
+          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(WritableNativeMap())
+              // Remove the fragment now, we can be sure it won't be needed again if an intent is
+              // successful
+              removeFragment(context)
+              paymentSheet = null
+              flowController = null
+            }
           }
         }
       }
-    }
 
-    val createIntentCallback = CreateIntentCallback {  paymentMethod, shouldSavePaymentMethod ->
-      val stripeSdkModule: StripeSdkModule? = context.getNativeModule(StripeSdkModule::class.java)
-      if (stripeSdkModule == null || stripeSdkModule.eventListenerCount == 0) {
-        return@CreateIntentCallback CreateIntentResult.Failure(
-          cause = Exception("Tried to call confirmHandler, but no callback was found. Please file an issue: https://github.com/stripe/stripe-react-native/issues"),
-          displayMessage = "An unexpected error occurred"
+    val createIntentCallback =
+      CreateIntentCallback { paymentMethod, shouldSavePaymentMethod ->
+        val stripeSdkModule: StripeSdkModule? = context.getNativeModule(StripeSdkModule::class.java)
+        if (stripeSdkModule == null || stripeSdkModule.eventListenerCount == 0) {
+          return@CreateIntentCallback CreateIntentResult.Failure(
+            cause =
+              Exception(
+                "Tried to call confirmHandler, but no callback was found. Please file an issue: https://github.com/stripe/stripe-react-native/issues",
+              ),
+            displayMessage = "An unexpected error occurred",
           )
-      }
-      val params = Arguments.createMap().apply {
-        putMap("paymentMethod", mapFromPaymentMethod(paymentMethod))
-        putBoolean("shouldSavePaymentMethod", shouldSavePaymentMethod)
-      }
+        }
+        val params =
+          Arguments.createMap().apply {
+            putMap("paymentMethod", mapFromPaymentMethod(paymentMethod))
+            putBoolean("shouldSavePaymentMethod", shouldSavePaymentMethod)
+          }
 
-      stripeSdkModule.sendEvent(context, "onConfirmHandlerCallback", params)
+        stripeSdkModule.sendEvent(context, "onConfirmHandlerCallback", params)
 
-      val resultFromJavascript = paymentSheetIntentCreationCallback.await()
-      // reset the completable
-      paymentSheetIntentCreationCallback = CompletableDeferred<ReadableMap>()
+        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")
-        )
+        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 billingDetailsConfig = PaymentSheet.BillingDetailsCollectionConfiguration(
-      name = mapToCollectionMode(billingConfigParams?.getString("name")),
-      phone = mapToCollectionMode(billingConfigParams?.getString("phone")),
-      email = mapToCollectionMode(billingConfigParams?.getString("email")),
-      address = mapToAddressCollectionMode(billingConfigParams?.getString("address")),
-      attachDefaultsToPaymentMethod = billingConfigParams?.getBoolean("attachDefaultsToPaymentMethod")
-        ?: false
-    )
+    val billingDetailsConfig =
+      PaymentSheet.BillingDetailsCollectionConfiguration(
+        name = mapToCollectionMode(billingConfigParams?.getString("name")),
+        phone = mapToCollectionMode(billingConfigParams?.getString("phone")),
+        email = mapToCollectionMode(billingConfigParams?.getString("email")),
+        address = mapToAddressCollectionMode(billingConfigParams?.getString("address")),
+        attachDefaultsToPaymentMethod =
+          billingConfigParams?.getBoolean("attachDefaultsToPaymentMethod") ?: false,
+      )
 
     var defaultBillingDetails: PaymentSheet.BillingDetails? = null
     if (billingDetailsBundle != null) {
       val addressBundle = billingDetailsBundle.getBundle("address")
-      val address = PaymentSheet.Address(
-        addressBundle?.getString("city"),
-        addressBundle?.getString("country"),
-        addressBundle?.getString("line1"),
-        addressBundle?.getString("line2"),
-        addressBundle?.getString("postalCode"),
-        addressBundle?.getString("state"))
-      defaultBillingDetails = PaymentSheet.BillingDetails(
-        address,
-        billingDetailsBundle.getString("email"),
-        billingDetailsBundle.getString("name"),
-        billingDetailsBundle.getString("phone"))
-    }
-    val configurationBuilder = PaymentSheet.Configuration.Builder(merchantDisplayName)
-      .allowsDelayedPaymentMethods(allowsDelayedPaymentMethods ?: false)
-      .defaultBillingDetails(defaultBillingDetails)
-      .customer(customerConfiguration)
-      .googlePay(googlePayConfig)
-      .appearance(appearance)
-      .shippingDetails(shippingDetails)
-      .billingDetailsCollectionConfiguration(billingDetailsConfig)
-      .preferredNetworks(mapToPreferredNetworks(arguments?.getIntegerArrayList("preferredNetworks")))
-      .allowsRemovalOfLastSavedPaymentMethod(allowsRemovalOfLastSavedPaymentMethod)
-    primaryButtonLabel?.let {
-      configurationBuilder.primaryButtonLabel(it)
-    }
-    paymentMethodOrder?.let {
-      configurationBuilder.paymentMethodOrder(it)
+      val address =
+        PaymentSheet.Address(
+          addressBundle?.getString("city"),
+          addressBundle?.getString("country"),
+          addressBundle?.getString("line1"),
+          addressBundle?.getString("line2"),
+          addressBundle?.getString("postalCode"),
+          addressBundle?.getString("state"),
+        )
+      defaultBillingDetails =
+        PaymentSheet.BillingDetails(
+          address,
+          billingDetailsBundle.getString("email"),
+          billingDetailsBundle.getString("name"),
+          billingDetailsBundle.getString("phone"),
+        )
     }
+    val configurationBuilder =
+      PaymentSheet.Configuration
+        .Builder(merchantDisplayName)
+        .allowsDelayedPaymentMethods(allowsDelayedPaymentMethods ?: false)
+        .defaultBillingDetails(defaultBillingDetails)
+        .customer(customerConfiguration)
+        .googlePay(googlePayConfig)
+        .appearance(appearance)
+        .shippingDetails(shippingDetails)
+        .billingDetailsCollectionConfiguration(billingDetailsConfig)
+        .preferredNetworks(
+          mapToPreferredNetworks(arguments?.getIntegerArrayList("preferredNetworks")),
+        ).allowsRemovalOfLastSavedPaymentMethod(allowsRemovalOfLastSavedPaymentMethod)
+        .cardBrandAcceptance(mapToCardBrandAcceptance(arguments))
+
+    primaryButtonLabel?.let { configurationBuilder.primaryButtonLabel(it) }
+    paymentMethodOrder?.let { configurationBuilder.paymentMethodOrder(it) }
 
     configurationBuilder.paymentMethodLayout(
-      mapToPaymentMethodLayout(arguments?.getString("paymentMethodLayout"))
+      mapToPaymentMethodLayout(arguments?.getString("paymentMethodLayout")),
     )
 
     paymentSheetConfiguration = configurationBuilder.build()
 
     if (arguments?.getBoolean("customFlow") == true) {
-      flowController = if (intentConfiguration != null) {
-        PaymentSheet.FlowController.create(
-          this,
-          paymentOptionCallback = paymentOptionCallback,
-          createIntentCallback = createIntentCallback,
-          paymentResultCallback = paymentResultCallback
-        )
-      } else {
-        PaymentSheet.FlowController.create(
-          this,
-          paymentOptionCallback = paymentOptionCallback,
-          paymentResultCallback = paymentResultCallback
-        )
-      }
+      flowController =
+        if (intentConfiguration != null) {
+          PaymentSheet.FlowController.create(
+            this,
+            paymentOptionCallback = paymentOptionCallback,
+            createIntentCallback = createIntentCallback,
+            paymentResultCallback = paymentResultCallback,
+          )
+        } else {
+          PaymentSheet.FlowController.create(
+            this,
+            paymentOptionCallback = paymentOptionCallback,
+            paymentResultCallback = paymentResultCallback,
+          )
+        }
       configureFlowController()
     } else {
-      paymentSheet = if (intentConfiguration != null) {
-        PaymentSheet(
-          this,
-          createIntentCallback = createIntentCallback,
-          paymentResultCallback = paymentResultCallback
-        )
-      } else {
-        PaymentSheet(
-          this,
-          callback = paymentResultCallback
-        )
-      }
+      paymentSheet =
+        if (intentConfiguration != null) {
+          PaymentSheet(
+            this,
+            createIntentCallback = createIntentCallback,
+            paymentResultCallback = paymentResultCallback,
+          )
+        } else {
+          PaymentSheet(this, callback = paymentResultCallback)
+        }
       initPromise.resolve(WritableNativeMap())
     }
   }
 
   fun present(promise: Promise) {
-    this.presentPromise = promise
-    if(paymentSheet != null) {
+    keepJsAwake = KeepJsAwakeTask(context).apply { start() }
+    presentPromise = promise
+    if (paymentSheet != null) {
       if (!paymentIntentClientSecret.isNullOrEmpty()) {
-        paymentSheet?.presentWithPaymentIntent(paymentIntentClientSecret!!, paymentSheetConfiguration)
+        paymentSheet?.presentWithPaymentIntent(
+          paymentIntentClientSecret!!,
+          paymentSheetConfiguration,
+        )
       } else if (!setupIntentClientSecret.isNullOrEmpty()) {
         paymentSheet?.presentWithSetupIntent(setupIntentClientSecret!!, paymentSheetConfiguration)
       } else if (intentConfiguration != null) {
         paymentSheet?.presentWithIntentConfiguration(
           intentConfiguration = intentConfiguration!!,
-          configuration = paymentSheetConfiguration
+          configuration = paymentSheetConfiguration,
         )
       }
-    } else if(flowController != null) {
+    } else if (flowController != null) {
       flowController?.presentPaymentOptions()
     } else {
       promise.resolve(createMissingInitError())
     }
   }
 
-  fun presentWithTimeout(timeout: Long, promise: Promise) {
+  fun presentWithTimeout(
+    timeout: Long,
+    promise: Promise,
+  ) {
     var paymentSheetActivity: Activity? = null
 
-    val activityLifecycleCallbacks = object : Application.ActivityLifecycleCallbacks {
-      override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-        paymentSheetActivity = activity
-      }
+    val activityLifecycleCallbacks =
+      object : Application.ActivityLifecycleCallbacks {
+        override fun onActivityCreated(
+          activity: Activity,
+          savedInstanceState: Bundle?,
+        ) {
+          paymentSheetActivity = activity
+        }
 
-      override fun onActivityStarted(activity: Activity) {}
+        override fun onActivityStarted(activity: Activity) {}
 
-      override fun onActivityResumed(activity: Activity) {}
+        override fun onActivityResumed(activity: Activity) {}
 
-      override fun onActivityPaused(activity: Activity) {}
+        override fun onActivityPaused(activity: Activity) {}
 
-      override fun onActivityStopped(activity: Activity) {}
+        override fun onActivityStopped(activity: Activity) {}
 
-      override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
+        override fun onActivitySaveInstanceState(
+          activity: Activity,
+          outState: Bundle,
+        ) {}
 
-      override fun onActivityDestroyed(activity: Activity) {
-        paymentSheetActivity = null
-        context.currentActivity?.application?.unregisterActivityLifecycleCallbacks(this)
+        override fun onActivityDestroyed(activity: Activity) {
+          paymentSheetActivity = null
+          context.currentActivity?.application?.unregisterActivityLifecycleCallbacks(this)
+        }
       }
-    }
 
-    Handler(Looper.getMainLooper()).postDelayed({
-      paymentSheetActivity?.let {
-        it.finish()
-        paymentSheetTimedOut = true
-      }
-    }, timeout)
+    Handler(Looper.getMainLooper())
+      .postDelayed(
+        {
+          paymentSheetActivity?.let {
+            it.finish()
+            paymentSheetTimedOut = true
+          }
+        },
+        timeout,
+      )
 
-    context.currentActivity?.application?.registerActivityLifecycleCallbacks(activityLifecycleCallbacks)
+    context.currentActivity
+      ?.application
+      ?.registerActivityLifecycleCallbacks(activityLifecycleCallbacks)
 
     this.present(promise)
   }
@@ -311,70 +383,81 @@ class PaymentSheetFragment(
   }
 
   private fun configureFlowController() {
-    val onFlowControllerConfigure = PaymentSheet.FlowController.ConfigCallback { _, _ ->
-      val result = flowController?.getPaymentOption()?.let {
-        val bitmap = getBitmapFromVectorDrawable(context, it.drawableResourceId)
-        val imageString = getBase64FromBitmap(bitmap)
-        val option: WritableMap = WritableNativeMap()
-        option.putString("label", it.label)
-        option.putString("image", imageString)
-        createResult("paymentOption", option)
-      } ?: run {
-        WritableNativeMap()
+    val onFlowControllerConfigure =
+      PaymentSheet.FlowController.ConfigCallback { _, _ ->
+        val result =
+          flowController?.getPaymentOption()?.let {
+            val bitmap = getBitmapFromVectorDrawable(context, it.drawableResourceId)
+            val imageString = getBase64FromBitmap(bitmap)
+            val option: WritableMap = WritableNativeMap()
+            option.putString("label", it.label)
+            option.putString("image", imageString)
+            createResult("paymentOption", option)
+          } ?: run { WritableNativeMap() }
+        initPromise.resolve(result)
       }
-      initPromise.resolve(result)
-    }
 
     if (!paymentIntentClientSecret.isNullOrEmpty()) {
       flowController?.configureWithPaymentIntent(
         paymentIntentClientSecret = paymentIntentClientSecret!!,
         configuration = paymentSheetConfiguration,
-        callback = onFlowControllerConfigure
+        callback = onFlowControllerConfigure,
       )
     } else if (!setupIntentClientSecret.isNullOrEmpty()) {
       flowController?.configureWithSetupIntent(
         setupIntentClientSecret = setupIntentClientSecret!!,
         configuration = paymentSheetConfiguration,
-        callback = onFlowControllerConfigure
+        callback = onFlowControllerConfigure,
       )
     } else if (intentConfiguration != null) {
       flowController?.configureWithIntentConfiguration(
         intentConfiguration = intentConfiguration!!,
         configuration = paymentSheetConfiguration,
-        callback = onFlowControllerConfigure
+        callback = onFlowControllerConfigure,
       )
     } else {
-      initPromise.resolve(createError(ErrorType.Failed.toString(), "One of `paymentIntentClientSecret`, `setupIntentClientSecret`, or `intentConfiguration` is required"))
+      initPromise.resolve(
+        createError(
+          ErrorType.Failed.toString(),
+          "One of `paymentIntentClientSecret`, `setupIntentClientSecret`, or `intentConfiguration` is required",
+        ),
+      )
       return
     }
   }
 
+  private fun resolvePresentPromise(value: Any?) {
+    keepJsAwake?.stop()
+    presentPromise?.resolve(value)
+  }
+
   private fun resolvePaymentResult(map: WritableMap) {
     confirmPromise?.let {
       it.resolve(map)
       confirmPromise = null
-    } ?: run {
-      presentPromise?.resolve(map)
-    }
+    } ?: run { resolvePresentPromise(map) }
   }
 
   companion object {
     internal const val TAG = "payment_sheet_launch_fragment"
 
-    private val mapIntToButtonType = mapOf(
-      1 to PaymentSheet.GooglePayConfiguration.ButtonType.Buy,
-      6 to PaymentSheet.GooglePayConfiguration.ButtonType.Book,
-      5 to PaymentSheet.GooglePayConfiguration.ButtonType.Checkout,
-      4 to PaymentSheet.GooglePayConfiguration.ButtonType.Donate,
-      11 to PaymentSheet.GooglePayConfiguration.ButtonType.Order,
-      1000 to PaymentSheet.GooglePayConfiguration.ButtonType.Pay,
-      7 to PaymentSheet.GooglePayConfiguration.ButtonType.Subscribe,
-      1001 to PaymentSheet.GooglePayConfiguration.ButtonType.Plain,
-    )
+    private val mapIntToButtonType =
+      mapOf(
+        1 to PaymentSheet.GooglePayConfiguration.ButtonType.Buy,
+        6 to PaymentSheet.GooglePayConfiguration.ButtonType.Book,
+        5 to PaymentSheet.GooglePayConfiguration.ButtonType.Checkout,
+        4 to PaymentSheet.GooglePayConfiguration.ButtonType.Donate,
+        11 to PaymentSheet.GooglePayConfiguration.ButtonType.Order,
+        1000 to PaymentSheet.GooglePayConfiguration.ButtonType.Pay,
+        7 to PaymentSheet.GooglePayConfiguration.ButtonType.Subscribe,
+        1001 to PaymentSheet.GooglePayConfiguration.ButtonType.Plain,
+      )
 
-    internal fun createMissingInitError(): WritableMap {
-      return createError(PaymentSheetErrorType.Failed.toString(), "No payment sheet has been initialized yet. You must call `initPaymentSheet` before `presentPaymentSheet`.")
-    }
+    internal fun createMissingInitError(): WritableMap =
+      createError(
+        PaymentSheetErrorType.Failed.toString(),
+        "No payment sheet has been initialized yet. You must call `initPaymentSheet` before `presentPaymentSheet`.",
+      )
 
     internal fun buildGooglePayConfig(params: Bundle?): PaymentSheet.GooglePayConfiguration? {
       if (params == null) {
@@ -386,16 +469,22 @@ class PaymentSheetFragment(
       val testEnv = params.getBoolean("testEnv")
       val amount = params.getString("amount")?.toLongOrNull()
       val label = params.getString("label")
-      val buttonType = mapIntToButtonType.get(params.getInt("buttonType")) ?: PaymentSheet.GooglePayConfiguration.ButtonType.Pay
-
+      val buttonType =
+        mapIntToButtonType.get(params.getInt("buttonType"))
+          ?: PaymentSheet.GooglePayConfiguration.ButtonType.Pay
 
       return PaymentSheet.GooglePayConfiguration(
-        environment = if (testEnv) PaymentSheet.GooglePayConfiguration.Environment.Test else PaymentSheet.GooglePayConfiguration.Environment.Production,
+        environment =
+          if (testEnv) {
+            PaymentSheet.GooglePayConfiguration.Environment.Test
+          } else {
+            PaymentSheet.GooglePayConfiguration.Environment.Production
+          },
         countryCode = countryCode,
         currencyCode = currencyCode,
         amount = amount,
         label = label,
-        buttonType = buttonType
+        buttonType = buttonType,
       )
     }
 
@@ -404,18 +493,26 @@ class PaymentSheetFragment(
       if (intentConfigurationParams == null) {
         return null
       }
-      val modeParams = intentConfigurationParams.getBundle("mode")
-              ?: throw PaymentSheetException("If `intentConfiguration` is provided, `intentConfiguration.mode` is required")
+      val modeParams =
+        intentConfigurationParams.getBundle("mode")
+          ?: throw PaymentSheetException(
+            "If `intentConfiguration` is provided, `intentConfiguration.mode` is required",
+          )
 
       return PaymentSheet.IntentConfiguration(
         mode = buildIntentConfigurationMode(modeParams),
-        paymentMethodTypes = intentConfigurationParams.getStringArrayList("paymentMethodTypes")?.toList() ?: emptyList(),
+        paymentMethodTypes =
+          intentConfigurationParams.getStringArrayList("paymentMethodTypes")?.toList()
+            ?: emptyList(),
       )
     }
 
     private fun buildIntentConfigurationMode(modeParams: Bundle): PaymentSheet.IntentConfiguration.Mode {
-      val currencyCode = modeParams.getString("currencyCode")
-        ?: throw PaymentSheetException("You must provide a value to intentConfiguration.mode.currencyCode")
+      val currencyCode =
+        modeParams.getString("currencyCode")
+          ?: throw PaymentSheetException(
+            "You must provide a value to intentConfiguration.mode.currencyCode",
+          )
 
       return if (modeParams.containsKey("amount")) {
         PaymentSheet.IntentConfiguration.Mode.Payment(
@@ -425,11 +522,14 @@ class PaymentSheetFragment(
           captureMethod = mapToCaptureMethod(modeParams.getString("captureMethod")),
         )
       } else {
-        val setupFutureUsage = mapToSetupFutureUse(modeParams.getString("setupFutureUsage"))
-          ?: throw PaymentSheetException("You must provide a value to intentConfiguration.mode.setupFutureUsage")
+        val setupFutureUsage =
+          mapToSetupFutureUse(modeParams.getString("setupFutureUsage"))
+            ?: throw PaymentSheetException(
+              "You must provide a value to intentConfiguration.mode.setupFutureUsage",
+            )
         PaymentSheet.IntentConfiguration.Mode.Setup(
           currency = currencyCode,
-          setupFutureUse = setupFutureUsage
+          setupFutureUse = setupFutureUsage,
         )
       }
     }
@@ -440,25 +540,33 @@ class PaymentSheetFragment(
       val customerId = bundle?.getString("customerId").orEmpty()
       val customerEphemeralKeySecret = bundle?.getString("customerEphemeralKeySecret").orEmpty()
       val customerSessionClientSecret = bundle?.getString("customerSessionClientSecret").orEmpty()
-      return if (customerSessionClientSecret.isNotEmpty() && customerEphemeralKeySecret.isNotEmpty()) {
-        throw PaymentSheetException("`customerEphemeralKeySecret` and `customerSessionClientSecret` cannot both be set")
+      return if (customerSessionClientSecret.isNotEmpty() &&
+        customerEphemeralKeySecret.isNotEmpty()
+      ) {
+        throw PaymentSheetException(
+          "`customerEphemeralKeySecret` and `customerSessionClientSecret` cannot both be set",
+        )
       } else if (customerId.isNotEmpty() && customerSessionClientSecret.isNotEmpty()) {
         PaymentSheet.CustomerConfiguration.createWithCustomerSession(
           id = customerId,
-          clientSecret = customerSessionClientSecret
+          clientSecret = customerSessionClientSecret,
         )
-      }
-      else if (customerId.isNotEmpty() && customerEphemeralKeySecret.isNotEmpty()) {
+      } else if (customerId.isNotEmpty() && customerEphemeralKeySecret.isNotEmpty()) {
         PaymentSheet.CustomerConfiguration(
           id = customerId,
-          ephemeralKeySecret = customerEphemeralKeySecret
+          ephemeralKeySecret = customerEphemeralKeySecret,
         )
-      } else null
+      } else {
+        null
+      }
     }
   }
 }
 
-fun getBitmapFromVectorDrawable(context: Context?, drawableId: Int): Bitmap? {
+fun getBitmapFromVectorDrawable(
+  context: Context?,
+  drawableId: Int,
+): Bitmap? {
   val drawable = AppCompatResources.getDrawable(context!!, drawableId) ?: return null
   return getBitmapFromDrawable(drawable)
 }
@@ -468,7 +576,12 @@ fun getBitmapFromDrawable(drawable: Drawable): Bitmap? {
   if (drawableCompat.intrinsicWidth <= 0 || drawableCompat.intrinsicHeight <= 0) {
     return null
   }
-  val bitmap = Bitmap.createBitmap(drawableCompat.intrinsicWidth, drawableCompat.intrinsicHeight, Bitmap.Config.ARGB_8888)
+  val bitmap =
+    Bitmap.createBitmap(
+      drawableCompat.intrinsicWidth,
+      drawableCompat.intrinsicHeight,
+      Bitmap.Config.ARGB_8888,
+    )
   bitmap.eraseColor(Color.WHITE)
   val canvas = Canvas(bitmap)
   drawable.setBounds(0, 0, canvas.width, canvas.height)
@@ -486,45 +599,76 @@ fun getBase64FromBitmap(bitmap: Bitmap?): String? {
   return Base64.encodeToString(imageBytes, Base64.DEFAULT)
 }
 
-fun mapToCollectionMode(str: String?): PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode {
-  return when (str) {
+fun mapToCollectionMode(str: String?): PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode =
+  when (str) {
     "automatic" -> PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode.Automatic
     "never" -> PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode.Never
     "always" -> PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode.Always
     else -> PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode.Automatic
   }
-}
 
-fun mapToPaymentMethodLayout(str: String?): PaymentSheet.PaymentMethodLayout {
-  return when (str) {
+fun mapToPaymentMethodLayout(str: String?): PaymentSheet.PaymentMethodLayout =
+  when (str) {
     "Horizontal" -> PaymentSheet.PaymentMethodLayout.Horizontal
     "Vertical" -> PaymentSheet.PaymentMethodLayout.Vertical
     else -> PaymentSheet.PaymentMethodLayout.Automatic
   }
-}
 
-fun mapToAddressCollectionMode(str: String?): PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode {
-  return when (str) {
-    "automatic" -> PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode.Automatic
+fun mapToAddressCollectionMode(str: String?): PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode =
+  when (str) {
+    "automatic" ->
+      PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode.Automatic
     "never" -> PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode.Never
     "full" -> PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode.Full
     else -> PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode.Automatic
   }
-}
 
-fun mapToSetupFutureUse(type: String?): PaymentSheet.IntentConfiguration.SetupFutureUse? {
-  return when (type) {
-    "OffSession" ->  PaymentSheet.IntentConfiguration.SetupFutureUse.OffSession
-    "OnSession" ->  PaymentSheet.IntentConfiguration.SetupFutureUse.OnSession
-    else ->  null
+fun mapToSetupFutureUse(type: String?): PaymentSheet.IntentConfiguration.SetupFutureUse? =
+  when (type) {
+    "OffSession" -> PaymentSheet.IntentConfiguration.SetupFutureUse.OffSession
+    "OnSession" -> PaymentSheet.IntentConfiguration.SetupFutureUse.OnSession
+    else -> null
   }
-}
 
-fun mapToCaptureMethod(type: String?): PaymentSheet.IntentConfiguration.CaptureMethod {
-  return when (type) {
-    "Automatic" ->  PaymentSheet.IntentConfiguration.CaptureMethod.Automatic
-    "Manual" ->  PaymentSheet.IntentConfiguration.CaptureMethod.Manual
-    "AutomaticAsync" ->  PaymentSheet.IntentConfiguration.CaptureMethod.AutomaticAsync
-    else ->  PaymentSheet.IntentConfiguration.CaptureMethod.Automatic
+fun mapToCaptureMethod(type: String?): PaymentSheet.IntentConfiguration.CaptureMethod =
+  when (type) {
+    "Automatic" -> PaymentSheet.IntentConfiguration.CaptureMethod.Automatic
+    "Manual" -> PaymentSheet.IntentConfiguration.CaptureMethod.Manual
+    "AutomaticAsync" -> PaymentSheet.IntentConfiguration.CaptureMethod.AutomaticAsync
+    else -> PaymentSheet.IntentConfiguration.CaptureMethod.Automatic
+  }
+
+fun mapToCardBrandAcceptance(params: Bundle?): PaymentSheet.CardBrandAcceptance {
+  val cardBrandAcceptanceParams = params?.getBundle("cardBrandAcceptance") ?: return PaymentSheet.CardBrandAcceptance.all()
+  val filter = cardBrandAcceptanceParams.getString("filter") ?: return PaymentSheet.CardBrandAcceptance.all()
+
+  return when (filter) {
+    "all" -> PaymentSheet.CardBrandAcceptance.all()
+    "allowed" -> {
+      val brands = cardBrandAcceptanceParams.getStringArrayList("brands") ?: return PaymentSheet.CardBrandAcceptance.all()
+      val brandCategories = brands.mapNotNull { mapToCardBrandCategory(it) }
+      if (brandCategories.isEmpty()) {
+        return PaymentSheet.CardBrandAcceptance.all()
+      }
+      PaymentSheet.CardBrandAcceptance.allowed(brandCategories)
+    }
+    "disallowed" -> {
+      val brands = cardBrandAcceptanceParams.getStringArrayList("brands") ?: return PaymentSheet.CardBrandAcceptance.all()
+      val brandCategories = brands.mapNotNull { mapToCardBrandCategory(it) }
+      if (brandCategories.isEmpty()) {
+        return PaymentSheet.CardBrandAcceptance.all()
+      }
+      PaymentSheet.CardBrandAcceptance.disallowed(brandCategories)
+    }
+    else -> PaymentSheet.CardBrandAcceptance.all()
   }
 }
+
+fun mapToCardBrandCategory(brand: String): PaymentSheet.CardBrandAcceptance.BrandCategory? =
+  when (brand) {
+    "visa" -> PaymentSheet.CardBrandAcceptance.BrandCategory.Visa
+    "mastercard" -> PaymentSheet.CardBrandAcceptance.BrandCategory.Mastercard
+    "amex" -> PaymentSheet.CardBrandAcceptance.BrandCategory.Amex
+    "discover" -> PaymentSheet.CardBrandAcceptance.BrandCategory.Discover
+    else -> null
+  }