@stripe/stripe-react-native 0.13.1 → 0.16.0

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

@@ -2,6 +2,7 @@ package com.reactnativestripesdk
 
 import android.graphics.Color
 import android.os.Bundle
+import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
 import com.stripe.android.paymentsheet.PaymentSheet
 
 fun PaymentSheetFragment.buildPaymentSheetAppearance(userParams: Bundle?): PaymentSheet.Appearance {

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

@@ -18,6 +18,9 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
+import com.reactnativestripesdk.utils.*
+import com.reactnativestripesdk.utils.createError
+import com.reactnativestripesdk.utils.createResult
 import com.stripe.android.paymentsheet.PaymentOptionCallback
 import com.stripe.android.paymentsheet.PaymentSheet
 import com.stripe.android.paymentsheet.PaymentSheetResult
@@ -49,12 +52,13 @@ class PaymentSheetFragment(
   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."))
+      return
+    }
     val customerId = arguments?.getString("customerId").orEmpty()
     val customerEphemeralKeySecret = arguments?.getString("customerEphemeralKeySecret").orEmpty()
-    val countryCode = arguments?.getString("merchantCountryCode").orEmpty()
-    val currencyCode = arguments?.getString("currencyCode").orEmpty()
-    val googlePayEnabled = arguments?.getBoolean("googlePay")
-    val testEnv = arguments?.getBoolean("testEnv")
+    val googlePayConfig = buildGooglePayConfig(arguments?.getBundle("googlePay"))
     val allowsDelayedPaymentMethods = arguments?.getBoolean("allowsDelayedPaymentMethods")
     val billingDetailsBundle = arguments?.getBundle("defaultBillingDetails")
     paymentIntentClientSecret = arguments?.getString("paymentIntentClientSecret").orEmpty()
@@ -67,40 +71,33 @@ class PaymentSheetFragment(
     }
 
     val paymentOptionCallback = PaymentOptionCallback { paymentOption ->
-      if (paymentOption != null) {
-        val bitmap = getBitmapFromVectorDrawable(context, paymentOption.drawableResourceId)
+      val result = paymentOption?.let {
+        val bitmap = getBitmapFromVectorDrawable(context, it.drawableResourceId)
         val imageString = getBase64FromBitmap(bitmap)
         val option: WritableMap = WritableNativeMap()
-        option.putString("label", paymentOption.label)
+        option.putString("label", it.label)
         option.putString("image", imageString)
-        presentPromise?.resolve(createResult("paymentOption", option))
-      } else {
-        presentPromise?.resolve(createError(PaymentSheetErrorType.Canceled.toString(), "The payment option selection flow has been canceled"))
+        createResult("paymentOption", option)
+      } ?: run {
+        createError(PaymentSheetErrorType.Canceled.toString(), "The payment option selection flow has been canceled")
       }
+      presentPromise?.resolve(result)
     }
 
     val paymentResultCallback = PaymentSheetResultCallback { paymentResult ->
       when (paymentResult) {
         is PaymentSheetResult.Canceled -> {
-          val message = "The payment flow has been canceled"
-          confirmPromise?.resolve(createError(PaymentSheetErrorType.Canceled.toString(), message))
-            ?: run {
-              presentPromise?.resolve(createError(PaymentSheetErrorType.Canceled.toString(), message))
-            }
+          resolvePaymentResult(createError(PaymentSheetErrorType.Canceled.toString(), "The payment flow has been canceled"))
         }
         is PaymentSheetResult.Failed -> {
-          confirmPromise?.resolve(createError(PaymentSheetErrorType.Failed.toString(), paymentResult.error))
-            ?: run {
-              presentPromise?.resolve(createError(PaymentSheetErrorType.Failed.toString(), paymentResult.error))
-            }
+          resolvePaymentResult(createError(PaymentSheetErrorType.Failed.toString(), paymentResult.error))
         }
         is PaymentSheetResult.Completed -> {
-          confirmPromise?.resolve(WritableNativeMap()) ?: run {
-            presentPromise?.resolve(WritableNativeMap())
-          }
+          resolvePaymentResult(WritableNativeMap())
+          // Remove the fragment now, we can be sure it won't be needed again if an intent is successful
+          (context.currentActivity as? AppCompatActivity)?.supportFragmentManager?.beginTransaction()?.remove(this)?.commitAllowingStateLoss()
         }
       }
-      (context.currentActivity as? AppCompatActivity)?.supportFragmentManager?.beginTransaction()?.remove(this)?.commitAllowingStateLoss()
     }
 
     var defaultBillingDetails: PaymentSheet.BillingDetails? = null
@@ -128,11 +125,7 @@ class PaymentSheetFragment(
         id = customerId,
         ephemeralKeySecret = customerEphemeralKeySecret
       ) else null,
-      googlePay = if (googlePayEnabled == true) PaymentSheet.GooglePayConfiguration(
-        environment = if (testEnv == true) PaymentSheet.GooglePayConfiguration.Environment.Test else PaymentSheet.GooglePayConfiguration.Environment.Production,
-        countryCode = countryCode,
-        currencyCode = currencyCode
-      ) else null,
+      googlePay = googlePayConfig,
       appearance = appearance
     )
 
@@ -192,6 +185,33 @@ class PaymentSheetFragment(
       )
     }
   }
+
+  private fun resolvePaymentResult(map: WritableMap) {
+    confirmPromise?.let {
+      it.resolve(map)
+      confirmPromise = null
+    } ?: run {
+      presentPromise?.resolve(map)
+    }
+  }
+
+  companion object {
+    internal fun buildGooglePayConfig(params: Bundle?): PaymentSheet.GooglePayConfiguration? {
+      if (params == null) {
+        return null
+      }
+
+      val countryCode = params.getString("merchantCountryCode").orEmpty()
+      val currencyCode = params.getString("currencyCode").orEmpty()
+      val testEnv = params.getBoolean("testEnv")
+
+      return PaymentSheet.GooglePayConfiguration(
+        environment = if (testEnv) PaymentSheet.GooglePayConfiguration.Environment.Test else PaymentSheet.GooglePayConfiguration.Environment.Production,
+        countryCode = countryCode,
+        currencyCode = currencyCode
+      )
+    }
+  }
 }
 
 fun getBitmapFromVectorDrawable(context: Context?, drawableId: Int): Bitmap? {

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

@@ -7,9 +7,13 @@ import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import com.facebook.react.bridge.*
 import com.facebook.react.module.annotations.ReactModule
+import com.reactnativestripesdk.pushprovisioning.PushProvisioningProxy
+import com.reactnativestripesdk.utils.*
+import com.reactnativestripesdk.utils.createError
+import com.reactnativestripesdk.utils.createMissingActivityError
 import com.stripe.android.*
-import com.stripe.android.core.AppInfo
 import com.stripe.android.core.ApiVersion
+import com.stripe.android.core.AppInfo
 import com.stripe.android.model.*
 import com.stripe.android.payments.bankaccount.CollectBankAccountConfiguration
 import com.stripe.android.view.AddPaymentMethodActivityStarter
@@ -17,6 +21,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
+
 @ReactModule(name = StripeSdkModule.NAME)
 class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
   override fun getName(): String {
@@ -116,6 +121,10 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
   @ReactMethod
   fun initPaymentSheet(params: ReadableMap, promise: Promise) {
     getCurrentActivityOrResolveWithError(promise)?.let { activity ->
+      paymentSheetFragment?.let {
+        // If a payment sheet was already initialized, we want to remove its fragment first
+        activity.supportFragmentManager.beginTransaction().remove(it).commitAllowingStateLoss()
+      }
       paymentSheetFragment = PaymentSheetFragment(reactApplicationContext, promise).also {
         val bundle = toBundleObject(params)
         it.arguments = bundle
@@ -168,7 +177,7 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
           )
         } else {
           Log.e("StripeReactNative", "FPX payment failed. Promise and/or client secret is not set.")
-          confirmPromise?.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), "FPX payment failed."))
+          confirmPromise?.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), "FPX payment failed. Client secret is not set."))
         }
       }
       is AddPaymentMethodActivityStarter.Result.Failure -> {
@@ -184,27 +193,30 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
 
   @ReactMethod
   fun createPaymentMethod(data: ReadableMap, options: ReadableMap, promise: Promise) {
-    val cardParams = (cardFieldView?.cardParams ?: cardFormView?.cardParams) ?: run {
-      promise.resolve(createError("Failed", "Card details not complete"))
+    val paymentMethodType = getValOr(data, "paymentMethodType")?.let { mapToPaymentMethodType(it) } ?: run {
+      promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), "You must provide paymentMethodType"))
       return
     }
-    val cardAddress = cardFieldView?.cardAddress ?: cardFormView?.cardAddress
     val paymentMethodData = getMapOrNull(data, "paymentMethodData")
-    val billingDetailsParams = mapToBillingDetails(getMapOrNull(paymentMethodData, "billingDetails"), cardAddress)
-
-    val paymentMethodCreateParams = PaymentMethodCreateParams.create(cardParams, billingDetailsParams)
-    stripe.createPaymentMethod(
-      paymentMethodCreateParams,
-      callback = object : ApiResultCallback<PaymentMethod> {
-        override fun onError(e: Exception) {
-          promise.resolve(createError("Failed", e))
-        }
+    val factory = PaymentMethodCreateParamsFactory(paymentMethodData, options, cardFieldView, cardFormView)
+    try {
+      val paymentMethodCreateParams = factory.createPaymentMethodParams(paymentMethodType)
+      stripe.createPaymentMethod(
+        paymentMethodCreateParams,
+        callback = object : ApiResultCallback<PaymentMethod> {
+          override fun onError(e: Exception) {
+            promise.resolve(createError("Failed", e))
+          }
 
-        override fun onSuccess(result: PaymentMethod) {
-          val paymentMethodMap: WritableMap = mapFromPaymentMethod(result)
-          promise.resolve(createResult("paymentMethod", paymentMethodMap))
+          override fun onSuccess(result: PaymentMethod) {
+            val paymentMethodMap: WritableMap = mapFromPaymentMethod(result)
+            promise.resolve(createResult("paymentMethod", paymentMethodMap))
+          }
         }
-      })
+      )
+    } catch (error: PaymentMethodCreateParamsException) {
+      promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), error))
+    }
   }
 
   @ReactMethod
@@ -382,10 +394,10 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
 //      return
 //    }
 
-    val factory = PaymentMethodCreateParamsFactory(paymentIntentClientSecret, paymentMethodData, options, cardFieldView, cardFormView)
+    val factory = PaymentMethodCreateParamsFactory(paymentMethodData, options, cardFieldView, cardFormView)
 
     try {
-      val confirmParams = factory.createConfirmParams(paymentMethodType)
+      val confirmParams = factory.createParams(paymentIntentClientSecret, paymentMethodType, isPaymentIntent = true) as ConfirmPaymentIntentParams
       urlScheme?.let {
         confirmParams.returnUrl = mapToReturnURL(urlScheme)
       }
@@ -435,10 +447,10 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
       return
     }
 
-    val factory = PaymentMethodCreateParamsFactory(setupIntentClientSecret, getMapOrNull(params, "paymentMethodData"), options, cardFieldView, cardFormView)
+    val factory = PaymentMethodCreateParamsFactory(getMapOrNull(params, "paymentMethodData"), options, cardFieldView, cardFormView)
 
     try {
-      val confirmParams = factory.createSetupParams(paymentMethodType)
+      val confirmParams = factory.createParams(setupIntentClientSecret, paymentMethodType, isPaymentIntent = false) as ConfirmSetupIntentParams
       urlScheme?.let {
         confirmParams.returnUrl = mapToReturnURL(urlScheme)
       }
@@ -525,6 +537,31 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     googlePayFragment?.createPaymentMethod(currencyCode, amount, promise)
   }
 
+  @ReactMethod
+  fun canAddCardToWallet(params: ReadableMap, promise: Promise) {
+    val last4 = getValOr(params, "cardLastFour", null) ?: run {
+      promise.resolve(createError("Failed", "You must provide cardLastFour"))
+      return
+    }
+
+    if (!PushProvisioningProxy.isNFCEnabled(reactApplicationContext)) {
+      promise.resolve(createCanAddCardResult(false, "UNSUPPORTED_DEVICE"))
+      return
+    }
+
+    getCurrentActivityOrResolveWithError(promise)?.let {
+      PushProvisioningProxy.isCardInWallet(it, last4) { isCardInWallet, token, error ->
+        val result = error?.let {
+          createCanAddCardResult(false, "MISSING_CONFIGURATION", null)
+        } ?: run {
+          val status = if (isCardInWallet) "CARD_ALREADY_EXISTS" else null
+          createCanAddCardResult(!isCardInWallet, status, token)
+        }
+        promise.resolve(result)
+      }
+    }
+  }
+
   @ReactMethod
   fun isCardInWallet(params: ReadableMap, promise: Promise) {
     val last4 = getValOr(params, "cardLastFour", null) ?: run {
@@ -532,7 +569,15 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
       return
     }
     getCurrentActivityOrResolveWithError(promise)?.let {
-      PushProvisioningProxy.isCardInWallet(it, last4, promise)
+      PushProvisioningProxy.isCardInWallet(it, last4) { isCardInWallet, token, error ->
+        val result: WritableMap = error ?: run {
+          val map = WritableNativeMap()
+          map.putBoolean("isInWallet", isCardInWallet)
+          map.putMap("token", token)
+          map
+        }
+        promise.resolve(result)
+      }
     }
   }
 
@@ -596,6 +641,7 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
         promise.resolve(createResult("paymentIntent", mapFromPaymentIntentResult(result)))
       }
     }
+
     val setupCallback = object : ApiResultCallback<SetupIntent> {
       override fun onError(e: Exception) {
         promise.resolve(createError(ErrorType.Failed.toString(), e))

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

@@ -17,8 +17,7 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerModule
 import com.facebook.react.uimanager.events.EventDispatcher
-import com.reactnativestripesdk.PushProvisioningProxy
-import com.reactnativestripesdk.createError
+import com.reactnativestripesdk.utils.createError
 
 
 class AddToWalletButtonView(private val context: ThemedReactContext, private val requestManager: RequestManager) : AppCompatImageView(context) {

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

@@ -1,13 +1,16 @@
-package com.reactnativestripesdk
+package com.reactnativestripesdk.pushprovisioning
 
 import android.app.Activity
 import android.app.Activity.RESULT_OK
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.nfc.NfcAdapter
 import android.util.Log
-import com.facebook.react.bridge.*
-import com.reactnativestripesdk.pushprovisioning.AddToWalletButtonView
-import com.reactnativestripesdk.pushprovisioning.EphemeralKeyProvider
-import com.reactnativestripesdk.pushprovisioning.TapAndPayProxy
+import com.facebook.react.bridge.BaseActivityEventListener
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
+import com.reactnativestripesdk.utils.createError
+import com.reactnativestripesdk.utils.mapError
 import com.stripe.android.pushProvisioning.PushProvisioningActivity
 import com.stripe.android.pushProvisioning.PushProvisioningActivityStarter
 
@@ -27,6 +30,15 @@ object PushProvisioningProxy {
     }
   }
 
+  fun isNFCEnabled(context: ReactApplicationContext): Boolean {
+    return if (context.packageManager.hasSystemFeature(PackageManager.FEATURE_NFC)) {
+      val adapter = NfcAdapter.getDefaultAdapter(context)
+      adapter.isEnabled
+    } else {
+      false
+    }
+  }
+
   fun invoke(
           context: ReactApplicationContext,
           view: AddToWalletButtonView,
@@ -57,8 +69,8 @@ object PushProvisioningProxy {
     }
   }
 
-  fun isCardInWallet(activity: Activity, cardLastFour: String, promise: Promise) {
-    TapAndPayProxy.invoke(activity, cardLastFour, promise)
+  fun isCardInWallet(activity: Activity, cardLastFour: String, callback: TokenCheckHandler) {
+    TapAndPayProxy.findExistingToken(activity, cardLastFour, callback)
   }
 
   private fun createActivityEventListener(context: ReactApplicationContext, view: AddToWalletButtonView) {

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

@@ -2,54 +2,68 @@ package com.reactnativestripesdk.pushprovisioning
 
 import android.app.Activity
 import android.util.Log
-import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
-import com.reactnativestripesdk.createError
+import com.reactnativestripesdk.utils.createError
 import com.google.android.gms.tasks.Task
 
+typealias TokenCheckHandler = (isCardInWallet: Boolean, token: WritableMap?, error: WritableMap?) -> Unit
+
 object TapAndPayProxy {
   private const val TAG = "StripeTapAndPay"
   private var tapAndPayClient: Any? = null
   const val REQUEST_CODE_TOKENIZE = 90909
 
-  fun invoke(activity: Activity, newCardLastFour: String, promise: Promise) {
-    try {
+  private fun getTapandPayTokens(activity: Activity): Task<List<Any>>? {
+    return try {
       val tapAndPayClass = Class.forName("com.google.android.gms.tapandpay.TapAndPay")
-      val getClientMethod = tapAndPayClass.getMethod("getClient", Activity::class.java)
+      val getClientMethod = tapAndPayClass.getMethod(
+        "getClient",
+        Activity::class.java)
+      val client = getClientMethod.invoke(null, activity)
 
-      tapAndPayClient = getClientMethod.invoke(null, activity).also {
-        val tapAndPayClientClass = Class.forName("com.google.android.gms.tapandpay.TapAndPayClient")
-        val listTokensMethod = tapAndPayClientClass.getMethod("listTokens")
+      val tapAndPayClientClass = Class.forName("com.google.android.gms.tapandpay.TapAndPayClient")
+      val listTokensMethod = tapAndPayClientClass.getMethod("listTokens")
 
-        val tokens = listTokensMethod.invoke(it) as Task<List<Any>>
-        tokens.addOnCompleteListener { task ->
-          if (task.isSuccessful) {
-            for (token in task.result) {
-              try {
-                val getFpanLastFourMethod = Class.forName("com.google.android.gms.tapandpay.issuer.TokenInfo").getMethod("getFpanLastFour")
-                val existingFpanLastFour = getFpanLastFourMethod.invoke(token) as String
-                if (existingFpanLastFour == newCardLastFour) {
-                  promise.resolve(
-                    createResult(
-                      true,
-                      token))
-                  return@addOnCompleteListener
-                }
-              } catch (e: Exception) {
-                Log.e(TAG, "There was a problem finding the class com.google.android.gms.tapandpay.issuer.TokenInfo. Make sure you've included Google's TapAndPay dependency.")
-              }
-            }
-          } else {
-            Log.e(TAG, "Unable to fetch existing tokens from Google TapAndPay.")
+      listTokensMethod.invoke(client) as Task<List<Any>>
+    } catch (e: Exception) {
+      Log.e(TAG, "Google TapAndPay dependency not found")
+      null
+    }
+  }
+
+  internal fun isTokenInWallet(token: Any, newLastFour: String): Boolean {
+    return try {
+      val getFpanLastFourMethod = Class.forName("com.google.android.gms.tapandpay.issuer.TokenInfo").getMethod("getFpanLastFour")
+      val existingFpanLastFour = getFpanLastFourMethod.invoke(token) as String
+      existingFpanLastFour == newLastFour
+    } catch (e: Exception) {
+      Log.e(TAG, "There was a problem finding the class com.google.android.gms.tapandpay.issuer.TokenInfo. Make sure you've included Google's TapAndPay dependency.")
+      false
+    }
+  }
+
+
+  fun findExistingToken(activity: Activity, newCardLastFour: String, callback: TokenCheckHandler) {
+    val tokens = getTapandPayTokens(activity)
+    if (tokens == null) {
+      callback(false, null, createError("Failed", "Google TapAndPay dependency not found."))
+      return
+    }
+
+    tokens.addOnCompleteListener { task ->
+      if (task.isSuccessful) {
+        for (token in task.result) {
+          if (isTokenInWallet(token, newCardLastFour)) {
+            callback(true,  mapFromTokenInfo(token), null)
+            return@addOnCompleteListener
           }
-          promise.resolve(createResult(false))
         }
+      } else {
+        Log.e(TAG, "Unable to fetch existing tokens from Google TapAndPay.")
       }
-    } catch (e: Exception) {
-      Log.e(TAG, "Google TapAndPay dependency not found")
-      promise.resolve(createError("Failed", "Google TapAndPay dependency not found."))
+      callback(false, null, null)
     }
   }
 
@@ -69,13 +83,6 @@ object TapAndPayProxy {
     }
   }
 
-  private fun createResult(cardIsInWallet: Boolean, token: Any? = null): WritableMap {
-    val result = WritableNativeMap()
-    result.putBoolean("isInWallet", cardIsInWallet)
-    result.putMap("token", mapFromTokenInfo(token))
-    return result
-  }
-
   private fun mapFromTokenInfo(token: Any?): WritableMap? {
     if (token == null) {
       return null

package/android/src/main/java/com/reactnativestripesdk/{Errors.kt → utils/Errors.kt}

@@ -1,4 +1,4 @@
-package com.reactnativestripesdk
+package com.reactnativestripesdk.utils
 
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap

package/android/src/main/java/com/reactnativestripesdk/{Extensions.kt → utils/Extensions.kt}

@@ -1,4 +1,4 @@
-package com.reactnativestripesdk
+package com.reactnativestripesdk.utils
 
 import android.content.Context
 import android.view.View

package/android/src/main/java/com/reactnativestripesdk/{Mappers.kt → utils/Mappers.kt}

@@ -1,4 +1,4 @@
-package com.reactnativestripesdk
+package com.reactnativestripesdk.utils
 
 import android.os.Bundle
 import android.util.Log
@@ -14,6 +14,22 @@ internal fun createResult(key: String, value: WritableMap): WritableMap {
   return map
 }
 
+internal fun createCanAddCardResult(canAddCard: Boolean, status: String? = null, token: WritableMap? = null): WritableNativeMap {
+  val result = WritableNativeMap()
+  val details = WritableNativeMap()
+  if (status != null) {
+    result.putBoolean("canAddCard", false)
+    details.putString("status", status)
+  } else {
+    result.putBoolean("canAddCard", canAddCard)
+    if (token != null) {
+      details.putMap("token", token)
+    }
+  }
+  result.putMap("details", details)
+  return result
+}
+
 internal fun mapIntentStatus(status: StripeIntent.Status?): String {
   return when (status) {
     StripeIntent.Status.Succeeded -> "Succeeded"
@@ -108,6 +124,7 @@ internal fun mapPaymentMethodType(type: PaymentMethod.Type?): String {
     PaymentMethod.Type.Klarna -> "Klarna"
     PaymentMethod.Type.USBankAccount -> "USBankAccount"
     PaymentMethod.Type.PayPal -> "PayPal"
+    PaymentMethod.Type.Affirm -> "Affirm"
     else -> "Unknown"
   }
 }
@@ -136,6 +153,7 @@ internal fun mapToPaymentMethodType(type: String?): PaymentMethod.Type? {
     "Klarna" -> PaymentMethod.Type.Klarna
     "USBankAccount" -> PaymentMethod.Type.USBankAccount
     "PayPal" -> PaymentMethod.Type.PayPal
+    "Affirm" -> PaymentMethod.Type.Affirm
     else -> null
   }
 }

package/android/src/main/java/com/reactnativestripesdk/utils/PostalCodeUtilities.kt

@@ -0,0 +1,18 @@
+package com.reactnativestripesdk.utils
+
+class PostalCodeUtilities {
+
+  companion object {
+    internal fun isValidGlobalPostalCodeCharacter(c: Char): Boolean {
+      return Character.isLetterOrDigit(c)
+        || c.isWhitespace()
+        || c == '-'
+    }
+
+    internal fun isValidUsPostalCodeCharacter(c: Char): Boolean {
+      return Character.isDigit(c)
+        || c.isWhitespace()
+        || c == '-'
+    }
+  }
+}

package/android/src/main/res/{drawable-night/googlepay_button_background.xml → drawable/googlepay_button_background_dark.xml}

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/googlepay_button_background_image" />
+        android:drawable="@drawable/googlepay_button_background_image_dark" />
 </selector>