@stripe/stripe-react-native 0.23.0 → 0.23.2

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## Unreleased
 
+## 0.23.2 - 2023-02-06
+
+## Fixes
+
+- Fixed a bug on Android where `canAddCardToWallet` wouldn't correctly return the `details.token` object. [#1282](https://github.com/stripe/stripe-react-native/pull/1282)
+
+## 0.23.1 - 2023-01-25
+
+## Fixes
+
+- Fixed an issue with `confirmPlatformPaySetupIntent` on iOS. [#1266](https://github.com/stripe/stripe-react-native/pull/1266)
+- Fixed types so that Klarna accepts the `shippingDetails` property. [#1272](https://github.com/stripe/stripe-react-native/pull/1272)
+- Both [`PaymentIntent.Result`](https://stripe.dev/stripe-react-native/api-reference/interfaces/PaymentIntent.Result.html) and [`SetupIntent.Result`](https://stripe.dev/stripe-react-native/api-reference/interfaces/SetupIntent.Result.html) types now include a `paymentMethod` field. This replaces the `paymentMethodId` field, which will be removed in a later release. [#1272](https://github.com/stripe/stripe-react-native/pull/1272)
+
 ## 0.23.0 - 2023-01-09
 
 ### Breaking changes

package/android/gradle.properties

@@ -1,2 +1,2 @@
 StripeSdk_kotlinVersion=1.6.21
-StripeSdk_stripeVersion=20.16.+
+StripeSdk_stripeVersion=20.19.+

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

@@ -5,8 +5,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.*
 import com.reactnativestripesdk.utils.*
 import com.reactnativestripesdk.utils.createError
@@ -69,7 +69,7 @@ class FinancialConnectionsSheetFragment : Fragment() {
       }
       is FinancialConnectionsSheetForTokenResult.Completed -> {
         promise.resolve(createTokenResult(result))
-        (context.currentActivity as? AppCompatActivity)?.supportFragmentManager?.beginTransaction()?.remove(this)?.commitAllowingStateLoss()
+        (context.currentActivity as? FragmentActivity)?.supportFragmentManager?.beginTransaction()?.remove(this)?.commitAllowingStateLoss()
       }
     }
   }
@@ -92,7 +92,7 @@ class FinancialConnectionsSheetFragment : Fragment() {
               it.putMap("session", mapFromSession(result.financialConnectionsSession))
             }
         )
-        (context.currentActivity as? AppCompatActivity)?.supportFragmentManager?.beginTransaction()?.remove(this)?.commitAllowingStateLoss()
+        (context.currentActivity as? FragmentActivity)?.supportFragmentManager?.beginTransaction()?.remove(this)?.commitAllowingStateLoss()
       }
     }
   }
@@ -107,7 +107,7 @@ class FinancialConnectionsSheetFragment : Fragment() {
       stripeAccountId = stripeAccountId,
     )
 
-    (context.currentActivity as? AppCompatActivity)?.let {
+    (context.currentActivity as? FragmentActivity)?.let {
       attemptToCleanupPreviousFragment(it)
       commitFragmentAndStartFlow(it)
     } ?: run {
@@ -116,13 +116,13 @@ class FinancialConnectionsSheetFragment : Fragment() {
     }
   }
 
-  private fun attemptToCleanupPreviousFragment(currentActivity: AppCompatActivity) {
+  private fun attemptToCleanupPreviousFragment(currentActivity: FragmentActivity) {
     currentActivity.supportFragmentManager.beginTransaction()
       .remove(this)
       .commitAllowingStateLoss()
   }
 
-  private fun commitFragmentAndStartFlow(currentActivity: AppCompatActivity) {
+  private fun commitFragmentAndStartFlow(currentActivity: FragmentActivity) {
     try {
       currentActivity.supportFragmentManager.beginTransaction()
         .add(this, TAG)

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

@@ -5,8 +5,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.*
 import com.reactnativestripesdk.utils.*
 import com.reactnativestripesdk.utils.createError
@@ -57,7 +57,7 @@ class GooglePayLauncherFragment : Fragment() {
       allowCreditCards = googlePayParams.getBooleanOr("allowCreditCards", true),
     )
 
-    (context.currentActivity as? AppCompatActivity)?.let {
+    (context.currentActivity as? FragmentActivity)?.let {
       attemptToCleanupPreviousFragment(it)
       commitFragmentAndStartFlow(it)
     } ?: run {
@@ -66,13 +66,13 @@ class GooglePayLauncherFragment : Fragment() {
     }
   }
 
-  private fun attemptToCleanupPreviousFragment(currentActivity: AppCompatActivity) {
+  private fun attemptToCleanupPreviousFragment(currentActivity: FragmentActivity) {
     currentActivity.supportFragmentManager.beginTransaction()
       .remove(this)
       .commitAllowingStateLoss()
   }
 
-  private fun commitFragmentAndStartFlow(currentActivity: AppCompatActivity) {
+  private fun commitFragmentAndStartFlow(currentActivity: FragmentActivity) {
     try {
       currentActivity.supportFragmentManager.beginTransaction()
         .add(this, TAG)

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

@@ -2,7 +2,7 @@ package com.reactnativestripesdk
 
 import android.app.Activity
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableNativeMap
@@ -25,7 +25,7 @@ class GooglePayRequestHelper {
   companion object {
     internal const val LOAD_PAYMENT_DATA_REQUEST_CODE = 414243
 
-    internal fun createPaymentRequest(activity: AppCompatActivity, factory: GooglePayJsonFactory, googlePayParams: ReadableMap): Task<PaymentData> {
+    internal fun createPaymentRequest(activity: FragmentActivity, factory: GooglePayJsonFactory, googlePayParams: ReadableMap): Task<PaymentData> {
       val transactionInfo = buildTransactionInfo(googlePayParams)
       val merchantInfo = GooglePayJsonFactory.MerchantInfo(googlePayParams.getString("merchantName").orEmpty())
       val billingAddressParameters = buildBillingAddressParameters(googlePayParams.getMap("billingAddressConfig"))
@@ -90,7 +90,7 @@ class GooglePayRequestHelper {
       )
     }
 
-    internal fun createPaymentMethod(request: Task<PaymentData>, activity: AppCompatActivity) {
+    internal fun createPaymentMethod(request: Task<PaymentData>, activity: FragmentActivity) {
       AutoResolveHelper.resolveTask(
         request,
         activity,

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

@@ -5,8 +5,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.reactnativestripesdk.utils.*
@@ -107,7 +107,7 @@ class PaymentLauncherFragment(
     }
 
     private fun addFragment(fragment: PaymentLauncherFragment, context: ReactApplicationContext, promise: Promise) {
-      (context.currentActivity as? AppCompatActivity)?.let {
+      (context.currentActivity as? FragmentActivity)?.let {
         try {
           it.supportFragmentManager.beginTransaction()
             .add(fragment, TAG)
@@ -167,7 +167,7 @@ class PaymentLauncherFragment(
   }
 
   private fun retrieveSetupIntent(clientSecret: String, stripeAccountId: String?) {
-    stripe.retrieveSetupIntent(clientSecret, stripeAccountId, object : ApiResultCallback<SetupIntent> {
+    stripe.retrieveSetupIntent(clientSecret, stripeAccountId, expand = listOf("payment_method"), object : ApiResultCallback<SetupIntent> {
       override fun onError(e: Exception) {
         promise.resolve(createError(ConfirmSetupIntentErrorType.Failed.toString(), e))
         removeFragment(context)
@@ -208,7 +208,7 @@ class PaymentLauncherFragment(
   }
 
   private fun retrievePaymentIntent(clientSecret: String, stripeAccountId: String?) {
-    stripe.retrievePaymentIntent(clientSecret, stripeAccountId, object : ApiResultCallback<PaymentIntent> {
+    stripe.retrievePaymentIntent(clientSecret, stripeAccountId, expand = listOf("payment_method"), object : ApiResultCallback<PaymentIntent> {
       override fun onError(e: Exception) {
         promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), e))
         removeFragment(context)

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

@@ -1,12 +1,13 @@
 package com.reactnativestripesdk
 
+import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import com.facebook.react.bridge.ReactContext
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
 import com.stripe.android.paymentsheet.PaymentSheet
 
-fun buildPaymentSheetAppearance(userParams: Bundle?, context: ReactContext): PaymentSheet.Appearance {
+fun buildPaymentSheetAppearance(userParams: Bundle?, context: Context): PaymentSheet.Appearance {
   val colorParams = userParams?.getBundle(PaymentSheetAppearanceKeys.COLORS)
   val lightColorParams = colorParams?.getBundle(PaymentSheetAppearanceKeys.LIGHT) ?: colorParams
   val darkColorParams = colorParams?.getBundle(PaymentSheetAppearanceKeys.DARK) ?: colorParams
@@ -20,7 +21,7 @@ fun buildPaymentSheetAppearance(userParams: Bundle?, context: ReactContext): Pay
   )
 }
 
-private fun buildTypography(fontParams: Bundle?, context: ReactContext): PaymentSheet.Typography {
+private fun buildTypography(fontParams: Bundle?, context: Context): PaymentSheet.Typography {
   return PaymentSheet.Typography.default.copy(
     sizeScaleFactor = getFloatOr(fontParams, PaymentSheetAppearanceKeys.SCALE, PaymentSheet.Typography.default.sizeScaleFactor),
     fontResId = getFontResId(fontParams, PaymentSheetAppearanceKeys.FAMILY, PaymentSheet.Typography.default.fontResId, context)
@@ -65,7 +66,7 @@ private fun buildShapes(shapeParams: Bundle?): PaymentSheet.Shapes {
   )
 }
 
-private fun buildPrimaryButton(params: Bundle?, context: ReactContext): PaymentSheet.PrimaryButton {
+private fun buildPrimaryButton(params: Bundle?, context: Context): PaymentSheet.PrimaryButton {
   if (params == null) {
     return PaymentSheet.PrimaryButton()
   }
@@ -121,7 +122,7 @@ private fun getFloatOrNull(bundle: Bundle?, key: String): Float? {
 }
 
 @Throws(PaymentSheetAppearanceException::class)
-private fun getFontResId(bundle: Bundle?, key: String, defaultValue: Int?, context: ReactContext): Int? {
+private fun getFontResId(bundle: Bundle?, key: String, defaultValue: Int?, context: Context): Int? {
   val fontErrorPrefix = "Encountered an error when setting a custom font:"
   if (bundle?.containsKey(key) != true) {
     return defaultValue

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

@@ -4,7 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Parcelable
 import android.util.Log
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.*
 import com.facebook.react.module.annotations.ReactModule
 import com.reactnativestripesdk.addresssheet.AddressLauncherFragment
@@ -610,7 +610,7 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
           when (launcherResult) {
             GooglePayLauncher.Result.Completed -> {
               if (isPaymentIntent) {
-                stripe.retrievePaymentIntent(clientSecret, stripeAccountId,  object : ApiResultCallback<PaymentIntent> {
+                stripe.retrievePaymentIntent(clientSecret, stripeAccountId, expand = listOf("payment_method"), object : ApiResultCallback<PaymentIntent> {
                   override fun onError(e: Exception) {
                     promise.resolve(createResult("paymentIntent", WritableNativeMap()))
                   }
@@ -619,7 +619,7 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
                   }
                 })
               } else {
-                stripe.retrieveSetupIntent(clientSecret, stripeAccountId,  object : ApiResultCallback<SetupIntent> {
+                stripe.retrieveSetupIntent(clientSecret, stripeAccountId, expand = listOf("payment_method"),  object : ApiResultCallback<SetupIntent> {
                   override fun onError(e: Exception) {
                     promise.resolve(createResult("setupIntent", WritableNativeMap()))
                   }
@@ -861,8 +861,8 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
    * 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 {
+  private fun getCurrentActivityOrResolveWithError(promise: Promise?): FragmentActivity? {
+    (currentActivity as? FragmentActivity)?.let {
       return it
     }
     promise?.resolve(createMissingActivityError())

package/android/src/main/java/com/reactnativestripesdk/addresssheet/AddressLauncherFragment.kt

@@ -5,8 +5,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.reactnativestripesdk.utils.ErrorType
@@ -89,19 +89,19 @@ class AddressLauncherFragment : Fragment() {
       autocompleteCountries = autocompleteCountries,
     )
     this.callback = callback
-    (context.currentActivity as? AppCompatActivity)?.let {
+    (context.currentActivity as? FragmentActivity)?.let {
       attemptToCleanupPreviousFragment(it)
       commitFragmentAndStartFlow(it)
     }
   }
 
-  private fun attemptToCleanupPreviousFragment(currentActivity: AppCompatActivity) {
+  private fun attemptToCleanupPreviousFragment(currentActivity: FragmentActivity) {
     currentActivity.supportFragmentManager.beginTransaction()
       .remove(this)
       .commitAllowingStateLoss()
   }
 
-  private fun commitFragmentAndStartFlow(currentActivity: AppCompatActivity) {
+  private fun commitFragmentAndStartFlow(currentActivity: FragmentActivity) {
     try {
       currentActivity.supportFragmentManager.beginTransaction()
         .add(this, TAG)

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

@@ -1,15 +1,15 @@
 package com.reactnativestripesdk.pushprovisioning
 
+import android.content.Context
 import com.bumptech.glide.Glide
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.bridge.ReactApplicationContext
 
 
-class AddToWalletButtonManager(applicationContext: ReactApplicationContext) : SimpleViewManager<AddToWalletButtonView?>() {
+class AddToWalletButtonManager(applicationContext: Context) : SimpleViewManager<AddToWalletButtonView?>() {
   private val requestManager = Glide.with(applicationContext)
   override fun getName() = "AddToWalletButton"
 

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

@@ -83,34 +83,33 @@ object TapAndPayProxy {
     }
   }
 
-  private fun mapFromTokenInfo(token: Any?): WritableMap? {
-    if (token == null) {
-      return null
-    }
+  private fun mapFromTokenInfo(token: Any?): WritableMap {
     val result = WritableNativeMap()
-    try {
-      val tokenInfoClass = Class.forName("com.google.android.gms.tapandpay.issuer.TokenInfo")
-      result.putString(
-        "id",
-        tokenInfoClass.getMethod("getIssuerTokenId").invoke(token) as String)
-      result.putString(
-        "cardLastFour",
-        tokenInfoClass.getMethod("getFpanLastFour").invoke(token) as String)
-      result.putString(
-        "issuer",
-        tokenInfoClass.getMethod("getIssuerName").invoke(token) as String)
-      result.putString(
-        "status",
-        mapFromTokenState(tokenInfoClass.getMethod("getTokenState").invoke(token) as Int))
-      result.putInt(
-        "network",
-        tokenInfoClass.getMethod("getNetwork").invoke(token) as Int)
-      result.putInt(
-        "serviceProvider",
-        tokenInfoClass.getMethod("getTokenServiceProvider").invoke(token) as Int)
-    } 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.")
+    token?.let {
+      try {
+        val tokenInfoClass = Class.forName("com.google.android.gms.tapandpay.issuer.TokenInfo")
+        result.putString(
+          "id",
+          tokenInfoClass.getMethod("getIssuerTokenId").invoke(it) as String)
+        result.putString(
+          "cardLastFour",
+          tokenInfoClass.getMethod("getFpanLastFour").invoke(it) as String)
+        result.putString(
+          "issuer",
+          tokenInfoClass.getMethod("getIssuerName").invoke(it) as String)
+        result.putString(
+          "status",
+          mapFromTokenState(tokenInfoClass.getMethod("getTokenState").invoke(it) as Int))
+        result.putInt(
+          "network",
+          tokenInfoClass.getMethod("getNetwork").invoke(it) as Int)
+        result.putInt(
+          "serviceProvider",
+          tokenInfoClass.getMethod("getTokenServiceProvider").invoke(it) as Int)
+      } 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.")
+      }
     }
     return result
   }

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

@@ -3,8 +3,8 @@ package com.reactnativestripesdk.utils
 import android.content.Context
 import android.view.View
 import android.view.inputmethod.InputMethodManager
-import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 
@@ -25,7 +25,7 @@ fun View.hideSoftKeyboard() {
 }
 
 fun Fragment.removeFragment(context: ReactApplicationContext) {
-  (context.currentActivity as? AppCompatActivity)?.supportFragmentManager?.let {
+  (context.currentActivity as? FragmentActivity)?.supportFragmentManager?.let {
     if (it.findFragmentByTag(this.tag) != null) {
       it.beginTransaction().remove(this).commitAllowingStateLoss()
     }

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

@@ -17,14 +17,12 @@ internal fun createResult(key: String, value: WritableMap): WritableMap {
 internal fun createCanAddCardResult(canAddCard: Boolean, status: String? = null, token: WritableMap? = null): WritableNativeMap {
   val result = WritableNativeMap()
   val details = WritableNativeMap()
+  result.putBoolean("canAddCard", canAddCard)
   if (status != null) {
-    result.putBoolean("canAddCard", false)
     details.putString("status", status)
-  } else {
-    result.putBoolean("canAddCard", canAddCard)
-    if (token != null) {
-      details.putMap("token", token)
-    }
+  }
+  if (token != null) {
+    details.putMap("token", token)
   }
   result.putMap("details", details)
   return result
@@ -326,77 +324,69 @@ internal fun mapFromToken(token: Token): WritableMap {
 
 internal fun mapFromPaymentMethod(paymentMethod: PaymentMethod): WritableMap {
   val pm: WritableMap = WritableNativeMap()
-  val card: WritableMap = WritableNativeMap()
-  val sepaDebit: WritableMap = WritableNativeMap()
-  val bacsDebit: WritableMap = WritableNativeMap()
-  val auBECSDebit: WritableMap = WritableNativeMap()
-  val sofort: WritableMap = WritableNativeMap()
-  val ideal: WritableMap = WritableNativeMap()
-  val fpx: WritableMap = WritableNativeMap()
-  val upi: WritableMap = WritableNativeMap()
-  val usBankAccount: WritableMap = WritableNativeMap()
-
-  card.putString("brand", mapCardBrand(paymentMethod.card?.brand))
-  card.putString("country", paymentMethod.card?.country)
-  paymentMethod.card?.expiryYear?.let {
-    card.putInt("expYear", it)
-  }
-  paymentMethod.card?.expiryMonth?.let {
-    card.putInt("expMonth", it)
-  }
-  card.putString("funding", paymentMethod.card?.funding)
-  card.putString("last4", paymentMethod.card?.last4)
-  card.putString("fingerprint", paymentMethod.card?.fingerprint)
-  card.putString("preferredNetwork", paymentMethod.card?.networks?.preferred)
-  card.putArray("availableNetworks", paymentMethod.card?.networks?.available?.toList() as? ReadableArray)
-
-  sepaDebit.putString("bankCode", paymentMethod.sepaDebit?.bankCode)
-  sepaDebit.putString("country", paymentMethod.sepaDebit?.country)
-  sepaDebit.putString("fingerprint", paymentMethod.sepaDebit?.fingerprint)
-  sepaDebit.putString("last4", paymentMethod.sepaDebit?.branchCode)
-
-  bacsDebit.putString("fingerprint", paymentMethod.bacsDebit?.fingerprint)
-  bacsDebit.putString("last4", paymentMethod.bacsDebit?.last4)
-  bacsDebit.putString("sortCode", paymentMethod.bacsDebit?.sortCode)
-
-  auBECSDebit.putString("bsbNumber", paymentMethod.bacsDebit?.sortCode)
-  auBECSDebit.putString("fingerprint", paymentMethod.bacsDebit?.fingerprint)
-  auBECSDebit.putString("last4", paymentMethod.bacsDebit?.last4)
-
-  sofort.putString("country", paymentMethod.sofort?.country)
-
-  ideal.putString("bankName", paymentMethod.ideal?.bank)
-  ideal.putString("bankIdentifierCode", paymentMethod.ideal?.bankIdentifierCode)
-
-  fpx.putString("accountHolderType", paymentMethod.fpx?.accountHolderType)
-  fpx.putString("bank", paymentMethod.fpx?.bank)
-
-  upi.putString("vpa", paymentMethod.upi?.vpa)
-
-  usBankAccount.putString("routingNumber", paymentMethod.usBankAccount?.routingNumber)
-  usBankAccount.putString("accountType", mapFromUSBankAccountType(paymentMethod.usBankAccount?.accountType))
-  usBankAccount.putString("accountHolderType", mapFromUSBankAccountHolderType(paymentMethod.usBankAccount?.accountHolderType))
-  usBankAccount.putString("last4", paymentMethod.usBankAccount?.last4)
-  usBankAccount.putString("bankName", paymentMethod.usBankAccount?.bankName)
-  usBankAccount.putString("linkedAccount", paymentMethod.usBankAccount?.linkedAccount)
-  usBankAccount.putString("fingerprint", paymentMethod.usBankAccount?.fingerprint)
-  usBankAccount.putString("preferredNetworks", paymentMethod.usBankAccount?.networks?.preferred)
-  usBankAccount.putArray("supportedNetworks", paymentMethod.usBankAccount?.networks?.supported as? ReadableArray)
 
   pm.putString("id", paymentMethod.id)
   pm.putString("paymentMethodType", mapPaymentMethodType(paymentMethod.type))
   pm.putBoolean("livemode", paymentMethod.liveMode)
   pm.putString("customerId", paymentMethod.customerId)
   pm.putMap("billingDetails", mapFromBillingDetails(paymentMethod.billingDetails))
-  pm.putMap("Card", card)
-  pm.putMap("SepaDebit", sepaDebit)
-  pm.putMap("BacsDebit", bacsDebit)
-  pm.putMap("AuBecsDebit", auBECSDebit)
-  pm.putMap("Sofort", sofort)
-  pm.putMap("Ideal", ideal)
-  pm.putMap("Fpx", fpx)
-  pm.putMap("Upi", upi)
-  pm.putMap("USBankAccount", usBankAccount)
+  pm.putMap("Card", WritableNativeMap().also {
+    it.putString("brand", mapCardBrand(paymentMethod.card?.brand))
+    it.putString("country", paymentMethod.card?.country)
+    paymentMethod.card?.expiryYear?.let { year ->
+      it.putInt("expYear", year)
+    }
+    paymentMethod.card?.expiryMonth?.let { month ->
+      it.putInt("expMonth", month)
+    }
+    it.putString("funding", paymentMethod.card?.funding)
+    it.putString("last4", paymentMethod.card?.last4)
+    it.putString("fingerprint", paymentMethod.card?.fingerprint)
+    it.putString("preferredNetwork", paymentMethod.card?.networks?.preferred)
+    it.putArray("availableNetworks", paymentMethod.card?.networks?.available?.toList() as? ReadableArray)
+  })
+  pm.putMap("SepaDebit", WritableNativeMap().also {
+    it.putString("bankCode", paymentMethod.sepaDebit?.bankCode)
+    it.putString("country", paymentMethod.sepaDebit?.country)
+    it.putString("fingerprint", paymentMethod.sepaDebit?.fingerprint)
+    it.putString("last4", paymentMethod.sepaDebit?.branchCode)
+  })
+  pm.putMap("BacsDebit", WritableNativeMap().also {
+    it.putString("fingerprint", paymentMethod.bacsDebit?.fingerprint)
+    it.putString("last4", paymentMethod.bacsDebit?.last4)
+    it.putString("sortCode", paymentMethod.bacsDebit?.sortCode)
+  })
+  pm.putMap("AuBecsDebit",
+    WritableNativeMap().also {
+      it.putString("bsbNumber", paymentMethod.bacsDebit?.sortCode)
+      it.putString("fingerprint", paymentMethod.bacsDebit?.fingerprint)
+      it.putString("last4", paymentMethod.bacsDebit?.last4)
+    })
+  pm.putMap("Sofort", WritableNativeMap().also {
+    it.putString("country", paymentMethod.sofort?.country)
+  })
+  pm.putMap("Ideal", WritableNativeMap().also {
+    it.putString("bankName", paymentMethod.ideal?.bank)
+    it.putString("bankIdentifierCode", paymentMethod.ideal?.bankIdentifierCode)
+  })
+  pm.putMap("Fpx", WritableNativeMap().also {
+    it.putString("accountHolderType", paymentMethod.fpx?.accountHolderType)
+    it.putString("bank", paymentMethod.fpx?.bank)
+  })
+  pm.putMap("Upi", WritableNativeMap().also {
+    it.putString("vpa", paymentMethod.upi?.vpa)
+  })
+  pm.putMap("USBankAccount", WritableNativeMap().also {
+    it.putString("routingNumber", paymentMethod.usBankAccount?.routingNumber)
+    it.putString("accountType", mapFromUSBankAccountType(paymentMethod.usBankAccount?.accountType))
+    it.putString("accountHolderType", mapFromUSBankAccountHolderType(paymentMethod.usBankAccount?.accountHolderType))
+    it.putString("last4", paymentMethod.usBankAccount?.last4)
+    it.putString("bankName", paymentMethod.usBankAccount?.bankName)
+    it.putString("linkedAccount", paymentMethod.usBankAccount?.linkedAccount)
+    it.putString("fingerprint", paymentMethod.usBankAccount?.fingerprint)
+    it.putString("preferredNetworks", paymentMethod.usBankAccount?.networks?.preferred)
+    it.putArray("supportedNetworks", paymentMethod.usBankAccount?.networks?.supported as? ReadableArray)
+  })
 
   return pm
 }
@@ -407,6 +397,11 @@ internal fun mapFromPaymentIntentResult(paymentIntent: PaymentIntent): WritableM
   map.putString("clientSecret", paymentIntent.clientSecret)
   map.putBoolean("livemode", paymentIntent.isLiveMode)
   map.putString("paymentMethodId", paymentIntent.paymentMethodId)
+  map.putMap("paymentMethod", paymentIntent.paymentMethod?.let {
+    mapFromPaymentMethod(it)
+  } ?: run {
+    null
+  })
   map.putString("receiptEmail", paymentIntent.receiptEmail)
   map.putString("currency", paymentIntent.currency)
   map.putString("status", mapIntentStatus(paymentIntent.status))
@@ -786,6 +781,11 @@ internal fun mapFromSetupIntentResult(setupIntent: SetupIntent): WritableMap {
   map.putBoolean("livemode", setupIntent.isLiveMode)
   map.putString("clientSecret", setupIntent.clientSecret)
   map.putString("paymentMethodId", setupIntent.paymentMethodId)
+  map.putMap("paymentMethod", setupIntent.paymentMethod?.let {
+    mapFromPaymentMethod(it)
+  } ?: run {
+    null
+  })
   map.putString("usage", mapSetupIntentUsage(setupIntent.usage))
   map.putString("created", convertToUnixTimestamp(setupIntent.created))
   map.putMap("nextAction", mapNextAction(setupIntent.nextActionType, setupIntent.nextActionData))

package/ios/ApplePayViewController.swift

@@ -167,6 +167,8 @@ extension StripeSdk : PKPaymentAuthorizationViewControllerDelegate, STPApplePayC
     ) {
         if let clientSecret = self.confirmApplePayPaymentClientSecret {
             completion(clientSecret, nil)
+        } else if let clientSecret = self.confirmApplePaySetupClientSecret {
+            completion(clientSecret, nil)
         } else {
             self.applePayCompletionCallback = completion
             let method = Mappers.mapFromPaymentMethod(paymentMethod.splitApplePayAddressByNewline())

package/ios/Mappers.swift

@@ -381,6 +381,7 @@ class Mappers {
             "receiptEmail": paymentIntent.receiptEmail ?? NSNull(),
             "livemode": paymentIntent.livemode,
             "paymentMethodId": paymentIntent.paymentMethodId ?? NSNull(),
+            "paymentMethod": mapFromPaymentMethod(paymentIntent.paymentMethod) ?? NSNull(),
             "captureMethod": mapCaptureMethod(paymentIntent.captureMethod),
             "confirmationMethod": mapConfirmationMethod(paymentIntent.confirmationMethod),
             "created": convertDateToUnixTimestampMilliseconds(date: paymentIntent.created) ?? NSNull(),
@@ -718,6 +719,7 @@ class Mappers {
             "paymentMethodTypes": NSArray(),
             "usage": mapFromSetupIntentUsage(usage: setupIntent.usage),
             "paymentMethodId": setupIntent.paymentMethodID ?? NSNull(),
+            "paymentMethod": mapFromPaymentMethod(setupIntent.paymentMethod) ?? NSNull(),
             "created": NSNull(),
             "lastSetupError": NSNull(),
             "nextAction": mapNextAction(nextAction: setupIntent.nextAction) ?? NSNull(),

package/lib/commonjs/components/AddToWalletButton.js.map

@@ -1 +1 @@
-{"version":3,"names":["AddToWalletButtonNative","requireNativeComponent","AddToWalletButton","onComplete","props","value","nativeEvent"],"sources":["AddToWalletButton.tsx"],"sourcesContent":["import React from 'react';\nimport {\n  AccessibilityProps,\n  StyleProp,\n  ViewStyle,\n  requireNativeComponent,\n  NativeSyntheticEvent,\n  ImageSourcePropType,\n} from 'react-native';\nimport type {\n  Token,\n  CardActionError,\n  StripeError,\n  GooglePayCardToken,\n} from '../types';\n\nconst AddToWalletButtonNative =\n  requireNativeComponent<any>('AddToWalletButton');\n\n/**\n *  Add to wallet button component props\n */\nexport interface Props extends AccessibilityProps {\n  style?: StyleProp<ViewStyle>;\n  /** Sets the Apple Wallet/Google Pay button style. If the button is placed over a dark background, set this to 'onDarkBackground', otherwise set to 'onLightBackground'. */\n  iOSButtonStyle?: 'onDarkBackground' | 'onLightBackground';\n  /** The image asset to use as the Google Pay button. Downloadable from https://developers.google.com/pay/issuers/apis/push-provisioning/android/downloads/flutter/googlepay_flutter_buttons.zip */\n  androidAssetSource: ImageSourcePropType;\n  testID?: string;\n  /** iOS only. Set this to `true` until shipping through TestFlight || App Store. If false, you must be using live cards, and have the proper iOS entitlement set up. See https://stripe.com/docs/issuing/cards/digital-wallets?platform=react-native#requesting-access-for-ios */\n  testEnv?: boolean;\n  /** Details of the Issued Card you'd like added to the device's wallet */\n  cardDetails: {\n    /** The `primary_account_identifier` value from the issued card. */\n    primaryAccountIdentifier: string | null;\n    /** The card holder name (used only on iOS) */\n    name: string;\n    /** A user-facing description of the card. Required on Android.*/\n    description: string;\n    /** Last 4 digits of the card, only used on iOS */\n    lastFour?: string;\n    /** Optional, only used on iOS */\n    brand?: Token.CardBrand;\n  };\n  // Optional, only for Android and only for cards that are in the \"yellow path\" (as defined by Google- https://developers.google.com/pay/issuers/apis/push-provisioning/android/wallet-operations#resolving_yellow_path). Obtain this value via the `isCardInWallet` method.\n  token?: GooglePayCardToken | null;\n  /** Used by stripe to securely obtain card info of the card being provisioned. */\n  ephemeralKey: object;\n  /** Called when the flow completes. If the `error` field is `null`, then the card was successfully added to the user's native wallet. */\n  onComplete(result: { error: StripeError<CardActionError> | null }): void;\n}\n\n/**\n *  Add to wallet button\n *\n * @example\n * ```ts\n *  <AddToWalletButton\n *    testEnv={true}\n *    style={styles.myButtonStyle}\n *    iOSButtonStyle=\"onLightBackground\"\n *    cardDetails={{\n *      primaryAccountIdentifier: \"V-123\",\n *      name: \"David Wallace\",\n *      lastFour: \"4242\",\n *    }}\n *    ephemeralKey={myEphemeralKey} // This object is retrieved from your server. See https://stripe.com/docs/issuing/cards/digital-wallets?platform=react-native#update-your-backend\n *    onComplete={(error) => {\n *      Alert.alert(\n *        error ? error.code : 'Success',\n *        error\n *          ? error.message\n *          : 'Card was successfully added to the wallet.'\n *      );\n *    }}\n *  />\n * ```\n * @param __namedParameters Props\n * @returns JSX.Element\n * @category ReactComponents\n */\nexport function AddToWalletButton({ onComplete, ...props }: Props) {\n  return (\n    <AddToWalletButtonNative\n      {...props}\n      onCompleteAction={(\n        value: NativeSyntheticEvent<{\n          error: StripeError<CardActionError> | null;\n        }>\n      ) => onComplete(value.nativeEvent)}\n    />\n  );\n}\n"],"mappings":"wXAAA,oDACA,yCAOsB,qIAQtB,GAAMA,wBAAuB,CAC3B,GAAAC,mCAAsB,EAAM,mBAAmB,CAAC,CAgE3C,QAASC,kBAAiB,MAAkC,IAA/BC,WAAU,MAAVA,UAAU,CAAKC,KAAK,uDACtD,MACE,8BAAC,uBAAuB,0BAClBA,KAAK,EACT,gBAAgB,CAAE,0BAChBC,KAEE,QACCF,WAAU,CAACE,KAAK,CAACC,WAAW,CAAC,EAAC,6EACnC,CAEN"}
+{"version":3,"names":["AddToWalletButtonNative","requireNativeComponent","AddToWalletButton","onComplete","props","value","nativeEvent"],"sources":["AddToWalletButton.tsx"],"sourcesContent":["import React from 'react';\nimport {\n  AccessibilityProps,\n  StyleProp,\n  ViewStyle,\n  requireNativeComponent,\n  NativeSyntheticEvent,\n  ImageSourcePropType,\n} from 'react-native';\nimport type {\n  Token,\n  CardActionError,\n  StripeError,\n  GooglePayCardToken,\n} from '../types';\n\nconst AddToWalletButtonNative =\n  requireNativeComponent<any>('AddToWalletButton');\n\n/**\n *  Add to wallet button component props\n */\nexport interface Props extends AccessibilityProps {\n  style?: StyleProp<ViewStyle>;\n  /** Sets the Apple Wallet/Google Pay button style. If the button is placed over a dark background, set this to 'onDarkBackground', otherwise set to 'onLightBackground'. */\n  iOSButtonStyle?: 'onDarkBackground' | 'onLightBackground';\n  /** The image asset to use as the Google Pay button. Downloadable from https://developers.google.com/static/pay/issuers/apis/push-provisioning/android/downloads/flutter/2022_googlepay_flutter_buttons.zip  */\n  androidAssetSource: ImageSourcePropType;\n  testID?: string;\n  /** iOS only. Set this to `true` until shipping through TestFlight || App Store. If false, you must be using live cards, and have the proper iOS entitlement set up. See https://stripe.com/docs/issuing/cards/digital-wallets?platform=react-native#requesting-access-for-ios */\n  testEnv?: boolean;\n  /** Details of the Issued Card you'd like added to the device's wallet */\n  cardDetails: {\n    /** The `primary_account_identifier` value from the issued card. */\n    primaryAccountIdentifier: string | null;\n    /** The card holder name (used only on iOS) */\n    name: string;\n    /** A user-facing description of the card. Required on Android.*/\n    description: string;\n    /** Last 4 digits of the card, only used on iOS */\n    lastFour?: string;\n    /** Optional, only used on iOS */\n    brand?: Token.CardBrand;\n  };\n  // Optional, only for Android and only for cards that are in the \"yellow path\" (as defined by Google- https://developers.google.com/pay/issuers/apis/push-provisioning/android/wallet-operations#resolving_yellow_path). Obtain this value via the `isCardInWallet` method.\n  token?: GooglePayCardToken | null;\n  /** Used by stripe to securely obtain card info of the card being provisioned. */\n  ephemeralKey: object;\n  /** Called when the flow completes. If the `error` field is `null`, then the card was successfully added to the user's native wallet. */\n  onComplete(result: { error: StripeError<CardActionError> | null }): void;\n}\n\n/**\n *  Add to wallet button\n *\n * @example\n * ```ts\n *  <AddToWalletButton\n *    testEnv={true}\n *    style={styles.myButtonStyle}\n *    iOSButtonStyle=\"onLightBackground\"\n *    cardDetails={{\n *      primaryAccountIdentifier: \"V-123\",\n *      name: \"David Wallace\",\n *      lastFour: \"4242\",\n *    }}\n *    ephemeralKey={myEphemeralKey} // This object is retrieved from your server. See https://stripe.com/docs/issuing/cards/digital-wallets?platform=react-native#update-your-backend\n *    onComplete={(error) => {\n *      Alert.alert(\n *        error ? error.code : 'Success',\n *        error\n *          ? error.message\n *          : 'Card was successfully added to the wallet.'\n *      );\n *    }}\n *  />\n * ```\n * @param __namedParameters Props\n * @returns JSX.Element\n * @category ReactComponents\n */\nexport function AddToWalletButton({ onComplete, ...props }: Props) {\n  return (\n    <AddToWalletButtonNative\n      {...props}\n      onCompleteAction={(\n        value: NativeSyntheticEvent<{\n          error: StripeError<CardActionError> | null;\n        }>\n      ) => onComplete(value.nativeEvent)}\n    />\n  );\n}\n"],"mappings":"wXAAA,oDACA,yCAOsB,qIAQtB,GAAMA,wBAAuB,CAC3B,GAAAC,mCAAsB,EAAM,mBAAmB,CAAC,CAgE3C,QAASC,kBAAiB,MAAkC,IAA/BC,WAAU,MAAVA,UAAU,CAAKC,KAAK,uDACtD,MACE,8BAAC,uBAAuB,0BAClBA,KAAK,EACT,gBAAgB,CAAE,0BAChBC,KAEE,QACCF,WAAU,CAACE,KAAK,CAACC,WAAW,CAAC,EAAC,6EACnC,CAEN"}

package/lib/commonjs/types/PaymentIntent.js.map

@@ -1 +1 @@
-{"version":3,"names":["Status"],"sources":["PaymentIntent.ts"],"sourcesContent":["import type { StripeError } from '.';\nimport type { Address } from './Common';\nimport type { Result as PaymentMethodResult } from './PaymentMethod';\nimport type { NextAction } from './NextAction';\nimport type * as PaymentMethod from './PaymentMethod';\n\nexport interface Result {\n  id: string;\n  amount: number;\n  /** The UNIX timestamp (in milliseconds) of the date this PaymentIntent was created. */\n  created: string;\n  currency: string;\n  status: Status;\n  description: string | null;\n  receiptEmail: string | null;\n  canceledAt: string | null;\n  clientSecret: string;\n  livemode: boolean;\n  paymentMethodId: string;\n  captureMethod: 'Automatic' | 'Manual';\n  confirmationMethod: 'Automatic' | 'Manual';\n  lastPaymentError: LastPaymentError | null;\n  shipping: ShippingDetails | null;\n  nextAction: NextAction | null;\n}\n\nexport type ConfirmParams = PaymentMethod.CreateParams;\n\nexport type ConfirmOptions = PaymentMethod.ConfirmOptions;\n\nexport type LastPaymentError = StripeError<string> & {\n  paymentMethod: PaymentMethodResult;\n};\n\nexport type FutureUsage = 'OffSession' | 'OnSession';\n\nexport interface ShippingDetails {\n  address: Required<Address>;\n  name: string;\n  carrier: string;\n  phone: string;\n  trackingNumber: string;\n}\n\nexport enum Status {\n  Succeeded = 'Succeeded',\n  RequiresPaymentMethod = 'RequiresPaymentMethod',\n  RequiresConfirmation = 'RequiresConfirmation',\n  Canceled = 'Canceled',\n  Processing = 'Processing',\n  RequiresAction = 'RequiresAction',\n  RequiresCapture = 'RequiresCapture',\n  Unknown = 'Unknown',\n}\n"],"mappings":"kFA4CYA,OAAM,iCAANA,MAAM,EAANA,MAAM,0BAANA,MAAM,kDAANA,MAAM,gDAANA,MAAM,wBAANA,MAAM,4BAANA,MAAM,oCAANA,MAAM,sCAANA,MAAM,yBAANA,MAAM,kBAANA,MAAM"}
+{"version":3,"names":["Status"],"sources":["PaymentIntent.ts"],"sourcesContent":["import type { StripeError } from '.';\nimport type { Address } from './Common';\nimport type { Result as PaymentMethodResult } from './PaymentMethod';\nimport type { NextAction } from './NextAction';\nimport type * as PaymentMethod from './PaymentMethod';\n\nexport interface Result {\n  id: string;\n  amount: number;\n  /** The UNIX timestamp (in milliseconds) of the date this PaymentIntent was created. */\n  created: string;\n  currency: string;\n  status: Status;\n  description: string | null;\n  receiptEmail: string | null;\n  canceledAt: string | null;\n  clientSecret: string;\n  livemode: boolean;\n  /** @deprecated Use paymentMethod.id instead. */\n  paymentMethodId: string;\n  paymentMethod: PaymentMethodResult | null;\n  captureMethod: 'Automatic' | 'Manual';\n  confirmationMethod: 'Automatic' | 'Manual';\n  lastPaymentError: LastPaymentError | null;\n  shipping: ShippingDetails | null;\n  nextAction: NextAction | null;\n}\n\nexport type ConfirmParams = PaymentMethod.CreateParams;\n\nexport type ConfirmOptions = PaymentMethod.ConfirmOptions;\n\nexport type LastPaymentError = StripeError<string> & {\n  paymentMethod: PaymentMethodResult;\n};\n\nexport type FutureUsage = 'OffSession' | 'OnSession';\n\nexport interface ShippingDetails {\n  address: Required<Address>;\n  name: string;\n  carrier: string;\n  phone: string;\n  trackingNumber: string;\n}\n\nexport enum Status {\n  Succeeded = 'Succeeded',\n  RequiresPaymentMethod = 'RequiresPaymentMethod',\n  RequiresConfirmation = 'RequiresConfirmation',\n  Canceled = 'Canceled',\n  Processing = 'Processing',\n  RequiresAction = 'RequiresAction',\n  RequiresCapture = 'RequiresCapture',\n  Unknown = 'Unknown',\n}\n"],"mappings":"kFA8CYA,OAAM,iCAANA,MAAM,EAANA,MAAM,0BAANA,MAAM,kDAANA,MAAM,gDAANA,MAAM,wBAANA,MAAM,4BAANA,MAAM,oCAANA,MAAM,sCAANA,MAAM,yBAANA,MAAM,kBAANA,MAAM"}