@stripe/stripe-react-native 0.4.0 → 0.7.0

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

@@ -5,43 +5,42 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.os.AsyncTask
 import android.os.Parcelable
 import android.util.Log
-import androidx.activity.ComponentActivity
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.lifecycleScope
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.facebook.react.bridge.*
 import com.facebook.react.module.annotations.ReactModule
 import com.stripe.android.*
+import com.stripe.android.core.AppInfo
 import com.stripe.android.googlepaylauncher.GooglePayLauncher
 import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
 import com.stripe.android.model.*
+import com.stripe.android.payments.bankaccount.CollectBankAccountConfiguration
 import com.stripe.android.paymentsheet.PaymentSheetResult
 import com.stripe.android.view.AddPaymentMethodActivityStarter
-import kotlinx.coroutines.*
-
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 @ReactModule(name = StripeSdkModule.NAME)
 class StripeSdkModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
-  var cardFieldView: StripeSdkCardView? = null
+  var cardFieldView: CardFieldView? = null
   var cardFormView: CardFormView? = null
-  private lateinit var localBroadcastManager: LocalBroadcastManager
 
   override fun getName(): String {
     return "StripeSdk"
   }
   private lateinit var stripe: Stripe
 
+  private lateinit var paymentLauncherFragment: PaymentLauncherFragment
+
   private lateinit var publishableKey: String
   private var stripeAccountId: String? = null
   private var paymentSheetFragment: PaymentSheetFragment? = null
 
   private var urlScheme: String? = null
   private var confirmPromise: Promise? = null
-  private var handleCardActionPromise: Promise? = null
-  private var confirmSetupIntentPromise: Promise? = null
   private var confirmPaymentSheetPaymentPromise: Promise? = null
   private var presentPaymentSheetPromise: Promise? = null
   private var initPaymentSheetPromise: Promise? = null
@@ -54,89 +53,8 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
   private val mActivityEventListener = object : BaseActivityEventListener() {
     override fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
       if (::stripe.isInitialized) {
-        stripe.onSetupResult(requestCode, data, object : ApiResultCallback<SetupIntentResult> {
-          override fun onSuccess(result: SetupIntentResult) {
-            val setupIntent = result.intent
-            when (setupIntent.status) {
-              StripeIntent.Status.Succeeded -> {
-                confirmSetupIntentPromise?.resolve(createResult("setupIntent", mapFromSetupIntentResult(setupIntent)))
-              }
-              StripeIntent.Status.Canceled -> {
-                confirmSetupIntentPromise?.resolve(createError(ConfirmSetupIntentErrorType.Canceled.toString(), setupIntent.lastSetupError))
-              }
-              StripeIntent.Status.RequiresAction -> {
-                confirmSetupIntentPromise?.resolve(createError(ConfirmSetupIntentErrorType.Canceled.toString(), setupIntent.lastSetupError))
-              }
-              else -> {
-                val errorMessage = "unhandled error: ${setupIntent.status}"
-                confirmSetupIntentPromise?.resolve(createError(ConfirmSetupIntentErrorType.Failed.toString(), errorMessage))
-              }
-            }
-          }
-
-          override fun onError(e: Exception) {
-            confirmSetupIntentPromise?.resolve(createError(ConfirmSetupIntentErrorType.Failed.toString(), e))
-          }
-        })
-
-        stripe.onPaymentResult(requestCode, data, object : ApiResultCallback<PaymentIntentResult> {
-          override fun onSuccess(result: PaymentIntentResult) {
-            val paymentIntent = result.intent
-
-            when (paymentIntent.status) {
-              StripeIntent.Status.Succeeded,
-              StripeIntent.Status.Processing,
-              StripeIntent.Status.RequiresCapture -> {
-                val pi = createResult("paymentIntent", mapFromPaymentIntentResult(paymentIntent))
-                confirmPromise?.resolve(pi)
-                handleCardActionPromise?.resolve(pi)
-              }
-              StripeIntent.Status.RequiresAction -> {
-                if (isPaymentIntentNextActionVoucherBased(paymentIntent.nextActionType)) {
-                  val pi = createResult("paymentIntent", mapFromPaymentIntentResult(paymentIntent))
-                  confirmPromise?.resolve(pi)
-                  handleCardActionPromise?.resolve(pi)
-                } else {
-                  (paymentIntent.lastPaymentError)?.let {
-                    confirmPromise?.resolve(createError(ConfirmPaymentErrorType.Canceled.toString(), it))
-                    handleCardActionPromise?.resolve(createError(NextPaymentActionErrorType.Canceled.toString(), it))
-                  } ?: run {
-                    confirmPromise?.resolve(createError(ConfirmPaymentErrorType.Canceled.toString(), "The payment has been canceled"))
-                    handleCardActionPromise?.resolve(createError(NextPaymentActionErrorType.Canceled.toString(), "The payment has been canceled"))
-                  }
-                }
-              }
-              StripeIntent.Status.RequiresPaymentMethod -> {
-                val error = paymentIntent.lastPaymentError
-                confirmPromise?.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), error))
-                handleCardActionPromise?.resolve(createError(NextPaymentActionErrorType.Failed.toString(), error))
-              }
-              StripeIntent.Status.RequiresConfirmation -> {
-                val pi = createResult("paymentIntent", mapFromPaymentIntentResult(paymentIntent))
-                handleCardActionPromise?.resolve(pi)
-              }
-              StripeIntent.Status.Canceled -> {
-                val error = paymentIntent.lastPaymentError
-                confirmPromise?.resolve(createError(ConfirmPaymentErrorType.Canceled.toString(), error))
-                handleCardActionPromise?.resolve(createError(NextPaymentActionErrorType.Canceled.toString(), error))
-              }
-              else -> {
-                val errorMessage = "unhandled error: ${paymentIntent.status}"
-                confirmPromise?.resolve(createError(ConfirmPaymentErrorType.Unknown.toString(), errorMessage))
-                handleCardActionPromise?.resolve(createError(NextPaymentActionErrorType.Unknown.toString(), errorMessage))
-              }
-            }
-          }
-
-          override fun onError(e: Exception) {
-            confirmPromise?.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), e))
-            handleCardActionPromise?.resolve(createError(NextPaymentActionErrorType.Failed.toString(), e))
-          }
-        })
-
         paymentSheetFragment?.activity?.activityResultRegistry?.dispatchResult(requestCode, resultCode, data)
         googlePayFragment?.activity?.activityResultRegistry?.dispatchResult(requestCode, resultCode, data)
-
         try {
           val result = AddPaymentMethodActivityStarter.Result.fromIntent(data)
           if (data?.getParcelableExtra<Parcelable>("extra_activity_result") != null) {
@@ -150,7 +68,7 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
   }
 
   init {
-    reactContext.addActivityEventListener(mActivityEventListener);
+    reactContext.addActivityEventListener(mActivityEventListener)
   }
 
   private fun configure3dSecure(params: ReadableMap) {
@@ -171,16 +89,17 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
 
   private val googlePayReceiver: BroadcastReceiver = object : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent) {
-      if (intent.action == ON_GOOGLE_PAY_FRAGMENT_CREATED) {
-        googlePayFragment = (currentActivity as AppCompatActivity).supportFragmentManager.findFragmentByTag("google_pay_launch_fragment") as GooglePayFragment
-      }
       if (intent.action == ON_INIT_GOOGLE_PAY) {
         val isReady = intent.extras?.getBoolean("isReady") ?: false
-
         if (isReady) {
           initGooglePayPromise?.resolve(WritableNativeMap())
         } else {
-          initGooglePayPromise?.resolve(createError(GooglePayErrorType.Failed.toString(), "Google Pay is not available on this device"))
+          initGooglePayPromise?.resolve(
+            createError(
+              GooglePayErrorType.Failed.toString(),
+              "Google Pay is not available on this device. You can use isGooglePaySupported to preemptively check for Google Pay support."
+            )
+          )
         }
       }
       if (intent.action == ON_GOOGLE_PAYMENT_METHOD_RESULT) {
@@ -276,8 +195,8 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
     val appInfo = getMapOrNull(params, "appInfo") as ReadableMap
     this.stripeAccountId = getValOr(params, "stripeAccountId", null)
     val urlScheme = getValOr(params, "urlScheme", null)
-    val setUrlSchemeOnAndroid = getBooleanOrFalse(params, "setUrlSchemeOnAndroid")
-    this.urlScheme = if (setUrlSchemeOnAndroid) urlScheme else null
+    val setReturnUrlSchemeOnAndroid = getBooleanOrFalse(params, "setReturnUrlSchemeOnAndroid")
+    this.urlScheme = if (setReturnUrlSchemeOnAndroid) urlScheme else null
 
     getMapOrNull(params, "threeDSecureParams")?.let {
       configure3dSecure(it)
@@ -295,38 +214,39 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
 
     PaymentConfiguration.init(reactApplicationContext, publishableKey, stripeAccountId)
 
-    val localBroadcastManager = LocalBroadcastManager.getInstance(reactApplicationContext)
-    localBroadcastManager.registerReceiver(mPaymentSheetReceiver, IntentFilter(ON_PAYMENT_RESULT_ACTION));
-    localBroadcastManager.registerReceiver(mPaymentSheetReceiver, IntentFilter(ON_PAYMENT_OPTION_ACTION));
-    localBroadcastManager.registerReceiver(mPaymentSheetReceiver, IntentFilter(ON_CONFIGURE_FLOW_CONTROLLER));
-    localBroadcastManager.registerReceiver(mPaymentSheetReceiver, IntentFilter(ON_INIT_PAYMENT_SHEET));
+    paymentLauncherFragment = PaymentLauncherFragment(stripe, publishableKey, stripeAccountId)
+    getCurrentActivityOrResolveWithError(promise)?.let {
+      it.supportFragmentManager.beginTransaction()
+        .add(paymentLauncherFragment, "payment_launcher_fragment")
+        .commit()
+
+      val localBroadcastManager = LocalBroadcastManager.getInstance(reactApplicationContext)
+      localBroadcastManager.registerReceiver(mPaymentSheetReceiver, IntentFilter(ON_PAYMENT_RESULT_ACTION))
+      localBroadcastManager.registerReceiver(mPaymentSheetReceiver, IntentFilter(ON_PAYMENT_OPTION_ACTION))
+      localBroadcastManager.registerReceiver(mPaymentSheetReceiver, IntentFilter(ON_CONFIGURE_FLOW_CONTROLLER))
+      localBroadcastManager.registerReceiver(mPaymentSheetReceiver, IntentFilter(ON_INIT_PAYMENT_SHEET))
 
-    localBroadcastManager.registerReceiver(googlePayReceiver, IntentFilter(ON_GOOGLE_PAY_FRAGMENT_CREATED))
-    localBroadcastManager.registerReceiver(googlePayReceiver, IntentFilter(ON_INIT_GOOGLE_PAY))
-    localBroadcastManager.registerReceiver(googlePayReceiver, IntentFilter(ON_GOOGLE_PAY_RESULT))
-    localBroadcastManager.registerReceiver(googlePayReceiver, IntentFilter(ON_GOOGLE_PAYMENT_METHOD_RESULT))
+      localBroadcastManager.registerReceiver(googlePayReceiver, IntentFilter(ON_INIT_GOOGLE_PAY))
+      localBroadcastManager.registerReceiver(googlePayReceiver, IntentFilter(ON_GOOGLE_PAY_RESULT))
+      localBroadcastManager.registerReceiver(googlePayReceiver, IntentFilter(ON_GOOGLE_PAYMENT_METHOD_RESULT))
 
-    promise.resolve(null)
+      promise.resolve(null)
+    }
   }
 
   @ReactMethod
   fun initPaymentSheet(params: ReadableMap, promise: Promise) {
-    val activity = currentActivity as AppCompatActivity?
+    getCurrentActivityOrResolveWithError(promise)?.let { activity ->
+      this.initPaymentSheetPromise = promise
 
-    if (activity == null) {
-      promise.resolve(createError("Failed", "Activity doesn't exist"))
-      return
-    }
-
-    this.initPaymentSheetPromise = promise
-
-    paymentSheetFragment = PaymentSheetFragment().also {
-      val bundle = toBundleObject(params)
-      it.arguments = bundle
+      paymentSheetFragment = PaymentSheetFragment().also {
+        val bundle = toBundleObject(params)
+        it.arguments = bundle
+      }
+      activity.supportFragmentManager.beginTransaction()
+        .add(paymentSheetFragment!!, "payment_sheet_launch_fragment")
+        .commit()
     }
-    activity.supportFragmentManager.beginTransaction()
-      .add(paymentSheetFragment!!, "payment_sheet_launch_fragment")
-      .commit()
   }
 
   @ReactMethod
@@ -342,23 +262,31 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
   }
 
   private fun payWithFpx() {
-    AddPaymentMethodActivityStarter(currentActivity as AppCompatActivity)
-      .startForResult(AddPaymentMethodActivityStarter.Args.Builder()
-        .setPaymentMethodType(PaymentMethod.Type.Fpx)
-        .build()
-      )
+    getCurrentActivityOrResolveWithError(confirmPromise)?.let {
+      AddPaymentMethodActivityStarter(it)
+        .startForResult(AddPaymentMethodActivityStarter.Args.Builder()
+                          .setPaymentMethodType(PaymentMethod.Type.Fpx)
+                          .build()
+        )
+    }
   }
 
   private fun onFpxPaymentMethodResult(result: AddPaymentMethodActivityStarter.Result) {
     when (result) {
       is AddPaymentMethodActivityStarter.Result.Success -> {
-        val activity = currentActivity as ComponentActivity
-
-        stripe.confirmPayment(activity,
-          ConfirmPaymentIntentParams.createWithPaymentMethodId(
-            result.paymentMethod.id!!,
+        if (confirmPaymentClientSecret != null && confirmPromise != null) {
+          paymentLauncherFragment.confirm(
+            ConfirmPaymentIntentParams.createWithPaymentMethodId(
+              result.paymentMethod.id!!,
+              confirmPaymentClientSecret!!
+            ),
             confirmPaymentClientSecret!!,
-          ));
+            confirmPromise!!
+          )
+        } else {
+          Log.e("StripeReactNative", "FPX payment failed. Promise and/or client secret is not set.")
+          confirmPromise?.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), "FPX payment failed."))
+        }
       }
       is AddPaymentMethodActivityStarter.Result.Failure -> {
         confirmPromise?.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), result.exception))
@@ -368,6 +296,7 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
       }
     }
     this.confirmPaymentClientSecret = null
+    this.confirmPromise = null
   }
 
   @ReactMethod
@@ -384,8 +313,8 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
     stripe.createPaymentMethod(
       paymentMethodCreateParams,
       callback = object : ApiResultCallback<PaymentMethod> {
-        override fun onError(error: Exception) {
-          promise.resolve(createError("Failed", error))
+        override fun onError(e: Exception) {
+          promise.resolve(createError("Failed", e))
         }
 
         override fun onSuccess(result: PaymentMethod) {
@@ -458,7 +387,8 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
       expYear = cardParamsMap["exp_year"] as Int,
       cvc = cardParamsMap["cvc"] as String,
       address = mapToAddress(address, cardAddress),
-      name = getValOr(params, "name", null)
+      name = getValOr(params, "name", null),
+      currency = getValOr(params, "currency", null),
     )
 
     CoroutineScope(Dispatchers.IO).launch {
@@ -486,45 +416,42 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
           promise.resolve(res)
         }
 
-        override fun onError(error: Exception) {
-          promise.resolve(createError("Failed", error))
+        override fun onError(e: Exception) {
+          promise.resolve(createError("Failed", e))
         }
       }
     )
   }
 
   @ReactMethod
-  fun handleCardAction(paymentIntentClientSecret: String, promise: Promise) {
-    val activity = currentActivity as ComponentActivity
-    if (activity != null) {
-      handleCardActionPromise = promise
-      stripe.handleNextActionForPayment(activity, paymentIntentClientSecret)
-    }
+  fun handleNextAction(paymentIntentClientSecret: String, promise: Promise) {
+    paymentLauncherFragment.handleNextActionForPaymentIntent(
+      paymentIntentClientSecret,
+      promise
+    )
   }
 
-  private fun payWithWeChatPay(paymentIntentClientSecret: String, appId: String) {
-    val activity = currentActivity as ComponentActivity
-
-    activity.lifecycleScope.launch {
-      stripe.createPaymentMethod(PaymentMethodCreateParams.createWeChatPay()).id?.let { paymentMethodId ->
-        val confirmPaymentIntentParams =
-          ConfirmPaymentIntentParams.createWithPaymentMethodId(
-            paymentMethodId = paymentMethodId,
-            clientSecret = paymentIntentClientSecret,
-            paymentMethodOptions = PaymentMethodOptionsParams.WeChatPay(
-              appId
-            )
-          )
-        stripe.confirmPayment(activity, confirmPaymentIntentParams)
-      }
-    }
-  }
+// TODO: Uncomment when WeChat is re-enabled in stripe-ios
+//  private fun payWithWeChatPay(paymentIntentClientSecret: String, appId: String) {
+//    val activity = currentActivity as ComponentActivity
+//
+//    activity.lifecycleScope.launch {
+//      stripe.createPaymentMethod(PaymentMethodCreateParams.createWeChatPay()).id?.let { paymentMethodId ->
+//        val confirmPaymentIntentParams =
+//          ConfirmPaymentIntentParams.createWithPaymentMethodId(
+//            paymentMethodId = paymentMethodId,
+//            clientSecret = paymentIntentClientSecret,
+//            paymentMethodOptions = PaymentMethodOptionsParams.WeChatPay(
+//              appId
+//            )
+//          )
+//        paymentLauncherFragment.paymentLauncher.confirm(confirmPaymentIntentParams)
+//      }
+//    }
+//  }
 
   @ReactMethod
   fun confirmPayment(paymentIntentClientSecret: String, params: ReadableMap, options: ReadableMap, promise: Promise) {
-    confirmPromise = promise
-    confirmPaymentClientSecret = paymentIntentClientSecret
-
     val paymentMethodType = getValOr(params, "type")?.let { mapToPaymentMethodType(it) } ?: run {
       promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), "You must provide paymentMethodType"))
       return
@@ -533,6 +460,8 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
     val testOfflineBank = getBooleanOrFalse(params, "testOfflineBank")
 
     if (paymentMethodType == PaymentMethod.Type.Fpx && !testOfflineBank) {
+      confirmPaymentClientSecret = paymentIntentClientSecret
+      confirmPromise = promise
       payWithFpx()
       return
     }
@@ -542,7 +471,7 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
 //        promise.resolve(createError("Failed", "You must provide appId"))
 //        return
 //      }
-//      payWithWeChatPay(paymentIntentClientSecret, appId)
+//      payWithWeChatPay(paymentIntentClientSecret, appId, promise)
 //
 //      return
 //    }
@@ -550,10 +479,16 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
     val factory = PaymentMethodCreateParamsFactory(paymentIntentClientSecret, params, cardFieldView, cardFormView)
 
     try {
-      val activity = currentActivity as ComponentActivity
       val confirmParams = factory.createConfirmParams(paymentMethodType)
+      urlScheme?.let {
+        confirmParams.returnUrl = mapToReturnURL(urlScheme)
+      }
       confirmParams.shipping = mapToShippingDetails(getMapOrNull(params, "shippingDetails"))
-      stripe.confirmPayment(activity, confirmParams)
+      paymentLauncherFragment.confirm(
+        confirmParams,
+        paymentIntentClientSecret,
+        promise
+      )
     } catch (error: PaymentMethodCreateParamsException) {
       promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), error))
     }
@@ -561,7 +496,7 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
 
   @ReactMethod
   fun retrievePaymentIntent(clientSecret: String, promise: Promise) {
-    AsyncTask.execute {
+    CoroutineScope(Dispatchers.IO).launch {
       val paymentIntent = stripe.retrievePaymentIntentSynchronous(clientSecret)
       paymentIntent?.let {
         promise.resolve(createResult("paymentIntent", mapFromPaymentIntentResult(it)))
@@ -573,7 +508,7 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
 
   @ReactMethod
   fun retrieveSetupIntent(clientSecret: String, promise: Promise) {
-    AsyncTask.execute {
+    CoroutineScope(Dispatchers.IO).launch {
       val setupIntent = stripe.retrieveSetupIntentSynchronous(clientSecret)
       setupIntent?.let {
         promise.resolve(createResult("setupIntent", mapFromSetupIntentResult(it)))
@@ -585,8 +520,6 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
 
   @ReactMethod
   fun confirmSetupIntent(setupIntentClientSecret: String, params: ReadableMap, options: ReadableMap, promise: Promise) {
-    confirmSetupIntentPromise = promise
-
     val paymentMethodType = getValOr(params, "type")?.let { mapToPaymentMethodType(it) } ?: run {
       promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), "You must provide paymentMethodType"))
       return
@@ -595,9 +528,15 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
     val factory = PaymentMethodCreateParamsFactory(setupIntentClientSecret, params, cardFieldView, cardFormView)
 
     try {
-      val activity = currentActivity as ComponentActivity
       val confirmParams = factory.createSetupParams(paymentMethodType)
-      stripe.confirmSetupIntent(activity, confirmParams)
+      urlScheme?.let {
+        confirmParams.returnUrl = mapToReturnURL(urlScheme)
+      }
+      paymentLauncherFragment.confirm(
+        confirmParams,
+        setupIntentClientSecret,
+        promise
+      )
     } catch (error: PaymentMethodCreateParamsException) {
       promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), error))
     }
@@ -606,30 +545,33 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
   @ReactMethod
   fun isGooglePaySupported(params: ReadableMap?, promise: Promise) {
     val fragment = GooglePayPaymentMethodLauncherFragment(
-      currentActivity as AppCompatActivity,
+      reactContext,
       getBooleanOrFalse(params, "testEnv"),
       getBooleanOrFalse(params, "existingPaymentMethodRequired"),
       promise
     )
 
-    (currentActivity as AppCompatActivity).supportFragmentManager.beginTransaction()
-      .add(fragment, "google_pay_support_fragment")
-      .commit()
+    getCurrentActivityOrResolveWithError(promise)?.let {
+      it.supportFragmentManager.beginTransaction()
+        .add(fragment, "google_pay_support_fragment")
+        .commit()
+    }
   }
 
   @ReactMethod
   fun initGooglePay(params: ReadableMap, promise: Promise) {
-    val activity = currentActivity as AppCompatActivity
-    val fragment = GooglePayFragment().also {
+    googlePayFragment = GooglePayFragment().also {
       val bundle = toBundleObject(params)
       it.arguments = bundle
     }
 
-    initGooglePayPromise = promise
+    getCurrentActivityOrResolveWithError(promise)?.let {
+      initGooglePayPromise = promise
 
-    activity.supportFragmentManager.beginTransaction()
-      .add(fragment, "google_pay_launch_fragment")
-      .commit()
+      it.supportFragmentManager.beginTransaction()
+        .add(googlePayFragment!!, "google_pay_launch_fragment")
+        .commit()
+    }
   }
 
   @ReactMethod
@@ -664,15 +606,119 @@ class StripeSdkModule(private val reactContext: ReactApplicationContext) : React
     googlePayFragment?.createPaymentMethod(currencyCode, amount)
   }
 
+  @ReactMethod
+  fun collectBankAccount(isPaymentIntent: Boolean, clientSecret: String, params: ReadableMap, promise: Promise) {
+    val paymentMethodType = mapToPaymentMethodType(getValOr(params, "type", null))
+    if (paymentMethodType != PaymentMethod.Type.USBankAccount) {
+      promise.resolve(createError(ErrorType.Failed.toString(), "collectBankAccount currently only accepts the USBankAccount payment method type."))
+      return
+    }
+
+    val billingDetails = getMapOrNull(params, "billingDetails")
+
+    val name = billingDetails?.getString("name")
+    if (name.isNullOrEmpty()) {
+      promise.resolve(createError(ErrorType.Failed.toString(), "You must provide a name when collecting US bank account details."))
+      return
+    }
+
+    val collectParams = CollectBankAccountConfiguration.USBankAccount(
+      name,
+      billingDetails.getString("email")
+    )
+
+    val fragment = CollectBankAccountLauncherFragment(
+      reactContext,
+      publishableKey,
+      clientSecret,
+      isPaymentIntent,
+      collectParams,
+      promise
+    )
+    getCurrentActivityOrResolveWithError(promise)?.let {
+      it.supportFragmentManager.beginTransaction()
+        .add(fragment, "collect_bank_account_launcher_fragment")
+        .commit()
+    }
+  }
+
+  @ReactMethod
+  fun verifyMicrodeposits(isPaymentIntent: Boolean, clientSecret: String, params: ReadableMap, promise: Promise) {
+    val amounts = params.getArray("amounts")
+    val descriptorCode = params.getString("descriptorCode")
+
+    if ((amounts != null && descriptorCode != null) || (amounts == null && descriptorCode == null)) {
+      promise.resolve(createError(ErrorType.Failed.toString(), "You must provide either amounts OR descriptorCode, not both."))
+      return
+    }
+
+    val paymentCallback = object : ApiResultCallback<PaymentIntent> {
+      override fun onError(e: Exception) {
+        promise.resolve(createError(ErrorType.Failed.toString(), e))
+      }
+
+      override fun onSuccess(result: PaymentIntent) {
+        promise.resolve(createResult("paymentIntent", mapFromPaymentIntentResult(result)))
+      }
+    }
+    val setupCallback = object : ApiResultCallback<SetupIntent> {
+      override fun onError(e: Exception) {
+        promise.resolve(createError(ErrorType.Failed.toString(), e))
+      }
+
+      override fun onSuccess(result: SetupIntent) {
+        promise.resolve(createResult("setupIntent", mapFromSetupIntentResult(result)))
+      }
+    }
+
+    amounts?.let {
+      if (it.size() != 2) {
+        promise.resolve(createError(ErrorType.Failed.toString(), "Expected 2 integers in the amounts array, but received ${it.size()}"))
+        return
+      }
+
+      if (isPaymentIntent) {
+        stripe.verifyPaymentIntentWithMicrodeposits(
+          clientSecret,
+          it.getInt(0),
+          it.getInt(1),
+          paymentCallback
+        )
+      } else {
+        stripe.verifySetupIntentWithMicrodeposits(
+          clientSecret,
+          it.getInt(0),
+          it.getInt(1),
+          setupCallback
+        )
+      }
+    } ?: descriptorCode?.let {
+      if (isPaymentIntent) {
+        stripe.verifyPaymentIntentWithMicrodeposits(
+          clientSecret,
+          it,
+          paymentCallback
+        )
+      } else {
+        stripe.verifySetupIntentWithMicrodeposits(
+          clientSecret,
+          it,
+          setupCallback
+        )
+      }
+    }
+  }
 
-  /// Check paymentIntent.nextAction is voucher-based payment method.
-  /// If it's voucher-based, the paymentIntent status stays in requiresAction until the voucher is paid or expired.
-  /// Currently only OXXO payment is voucher-based.
-  private fun isPaymentIntentNextActionVoucherBased(nextAction: StripeIntent.NextActionType?): Boolean {
-    nextAction?.let {
-      return it == StripeIntent.NextActionType.DisplayOxxoDetails
+  /**
+   * Safely get and cast the current activity as an AppCompatActivity. If that fails, the promise
+   * provided will be resolved with an error message instructing the user to retry the method.
+   */
+  private fun getCurrentActivityOrResolveWithError(promise: Promise?): AppCompatActivity? {
+    (currentActivity as? AppCompatActivity)?.let {
+      return it
     }
-    return false
+    promise?.resolve(createMissingActivityError())
+    return null
   }
 
   companion object {

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

@@ -11,6 +11,6 @@ class StripeSdkPackage : ReactPackage {
     }
 
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-      return listOf<ViewManager<*, *>>(StripeSdkCardViewManager(), AuBECSDebitFormViewManager(), StripeContainerManager(), CardFormViewManager(), GooglePayButtonManager())
+      return listOf<ViewManager<*, *>>(CardFieldViewManager(), AuBECSDebitFormViewManager(), StripeContainerManager(), CardFormViewManager(), GooglePayButtonManager())
     }
 }

package/ios/AuBECSDebitFormView.swift

@@ -43,6 +43,21 @@ class AuBECSDebitFormView: UIView, STPAUBECSDebitFormViewDelegate {
         if let backgroundColor = formStyle["backgroundColor"] as? String {
             auBecsFormView?.formBackgroundColor = UIColor(hexString: backgroundColor)
         }
+        if let placeholderColor = formStyle["placeholderColor"] as? String {
+            auBecsFormView?.formPlaceholderColor = UIColor(hexString: placeholderColor)
+        }
+        if let textErrorColor = formStyle["textErrorColor"] as? String {
+            auBecsFormView?.formTextErrorColor = UIColor(hexString: textErrorColor)
+        }
+        if let borderColor = formStyle["borderColor"] as? String {
+            auBecsFormView?.layer.borderColor = UIColor(hexString: borderColor).cgColor
+        }
+        if let borderRadius = formStyle["borderRadius"] as? CGFloat {
+            auBecsFormView?.layer.cornerRadius = borderRadius
+        }
+        if let borderWidth = formStyle["borderWidth"] as? CGFloat {
+            auBecsFormView?.layer.borderWidth = borderWidth
+        }
     }
     
     func auBECSDebitForm(_ form: STPAUBECSDebitFormView, didChangeToStateComplete complete: Bool) {