@stripe/stripe-react-native 0.44.0 → 0.46.0

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

@@ -84,35 +84,35 @@ class AddressSheetView(
     }
   }
 
-  fun setAppearance(appearanceParams: ReadableMap) {
+  fun setAppearance(appearanceParams: ReadableMap?) {
     this.appearanceParams = appearanceParams
   }
 
-  fun setDefaultValues(defaults: ReadableMap) {
-    defaultAddress = buildAddressDetails(defaults)
+  fun setDefaultValues(defaults: ReadableMap?) {
+    defaultAddress = defaults?.let { buildAddressDetails(it) }
   }
 
-  fun setAdditionalFields(fields: ReadableMap) {
-    additionalFields = buildAdditionalFieldsConfiguration(fields)
+  fun setAdditionalFields(fields: ReadableMap?) {
+    additionalFields = fields?.let { buildAdditionalFieldsConfiguration(it) }
   }
 
-  fun setAllowedCountries(countries: List<String>) {
-    allowedCountries = countries.toSet()
+  fun setAllowedCountries(countries: List<String>?) {
+    allowedCountries = countries?.toSet() ?: emptySet()
   }
 
-  fun setAutocompleteCountries(countries: List<String>) {
-    autocompleteCountries = countries.toSet()
+  fun setAutocompleteCountries(countries: List<String>?) {
+    autocompleteCountries = countries?.toSet() ?: emptySet()
   }
 
-  fun setPrimaryButtonTitle(title: String) {
+  fun setPrimaryButtonTitle(title: String?) {
     buttonTitle = title
   }
 
-  fun setSheetTitle(title: String) {
+  fun setSheetTitle(title: String?) {
     sheetTitle = title
   }
 
-  fun setGooglePlacesApiKey(key: String) {
+  fun setGooglePlacesApiKey(key: String?) {
     googlePlacesApiKey = key
   }
 
@@ -158,21 +158,27 @@ class AddressSheetView(
       )
     }
 
-    internal fun buildResult(addressDetails: AddressDetails): WritableMap {
-      val result = WritableNativeMap()
-      result.putString("name", addressDetails.name)
-      WritableNativeMap().let {
-        it.putString("city", addressDetails.address?.city)
-        it.putString("country", addressDetails.address?.country)
-        it.putString("line1", addressDetails.address?.line1)
-        it.putString("line2", addressDetails.address?.line2)
-        it.putString("postalCode", addressDetails.address?.postalCode)
-        it.putString("state", addressDetails.address?.state)
-        result.putMap("address", it)
+    internal fun buildResult(addressDetails: AddressDetails): WritableMap =
+      WritableNativeMap().apply {
+        putMap(
+          "result",
+          WritableNativeMap().apply {
+            putString("name", addressDetails.name)
+            putMap(
+              "address",
+              WritableNativeMap().apply {
+                putString("city", addressDetails.address?.city)
+                putString("country", addressDetails.address?.country)
+                putString("line1", addressDetails.address?.line1)
+                putString("line2", addressDetails.address?.line2)
+                putString("postalCode", addressDetails.address?.postalCode)
+                putString("state", addressDetails.address?.state)
+              },
+            )
+            putString("phone", addressDetails.phoneNumber)
+            putBoolean("isCheckboxSelected", addressDetails.isCheckboxSelected ?: false)
+          },
+        )
       }
-      result.putString("phone", addressDetails.phoneNumber)
-      result.putBoolean("isCheckboxSelected", addressDetails.isCheckboxSelected ?: false)
-      return result
-    }
   }
 }

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

@@ -1,16 +1,25 @@
 package com.reactnativestripesdk.addresssheet
 
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.AddressSheetViewManagerDelegate
+import com.facebook.react.viewmanagers.AddressSheetViewManagerInterface
+import com.reactnativestripesdk.utils.asMapOrNull
 
 @ReactModule(name = AddressSheetViewManager.REACT_CLASS)
-class AddressSheetViewManager : SimpleViewManager<AddressSheetView>() {
+class AddressSheetViewManager :
+  SimpleViewManager<AddressSheetView>(),
+  AddressSheetViewManagerInterface<AddressSheetView> {
+  private val delegate = AddressSheetViewManagerDelegate(this)
+
   override fun getName() = REACT_CLASS
 
+  override fun getDelegate() = delegate
+
   override fun getExportedCustomDirectEventTypeConstants() =
     mutableMapOf(
       AddressSheetEvent.ON_SUBMIT to
@@ -20,7 +29,7 @@ class AddressSheetViewManager : SimpleViewManager<AddressSheetView>() {
     )
 
   @ReactProp(name = "visible")
-  fun setVisible(
+  override fun setVisible(
     view: AddressSheetView,
     visibility: Boolean,
   ) {
@@ -28,69 +37,85 @@ class AddressSheetViewManager : SimpleViewManager<AddressSheetView>() {
   }
 
   @ReactProp(name = "appearance")
-  fun setAppearance(
+  override fun setAppearance(
     view: AddressSheetView,
-    appearance: ReadableMap,
+    appearance: Dynamic,
   ) {
-    view.setAppearance(appearance)
+    view.setAppearance(appearance.asMap())
   }
 
   @ReactProp(name = "defaultValues")
-  fun setDefaultValues(
+  override fun setDefaultValues(
     view: AddressSheetView,
-    defaults: ReadableMap,
+    defaults: Dynamic,
   ) {
-    view.setDefaultValues(defaults)
+    view.setDefaultValues(defaults.asMap())
   }
 
   @ReactProp(name = "additionalFields")
-  fun setAdditionalFields(
+  override fun setAdditionalFields(
     view: AddressSheetView,
-    fields: ReadableMap,
+    fields: Dynamic,
   ) {
-    view.setAdditionalFields(fields)
+    view.setAdditionalFields(fields.asMapOrNull())
   }
 
   @ReactProp(name = "allowedCountries")
-  fun setAllowedCountries(
+  override fun setAllowedCountries(
     view: AddressSheetView,
-    countries: ReadableArray,
+    countries: ReadableArray?,
   ) {
-    view.setAllowedCountries(countries.toArrayList().filterIsInstance<String>())
+    view.setAllowedCountries(countries?.toArrayList()?.filterIsInstance<String>())
   }
 
   @ReactProp(name = "autocompleteCountries")
-  fun setAutocompleteCountries(
+  override fun setAutocompleteCountries(
     view: AddressSheetView,
-    countries: ReadableArray,
+    countries: ReadableArray?,
   ) {
-    view.setAutocompleteCountries(countries.toArrayList().filterIsInstance<String>())
+    view.setAutocompleteCountries(countries?.toArrayList()?.filterIsInstance<String>())
   }
 
   @ReactProp(name = "primaryButtonTitle")
-  fun setPrimaryButtonTitle(
+  override fun setPrimaryButtonTitle(
     view: AddressSheetView,
-    title: String,
+    title: String?,
   ) {
     view.setPrimaryButtonTitle(title)
   }
 
   @ReactProp(name = "sheetTitle")
-  fun setSheetTitle(
+  override fun setSheetTitle(
     view: AddressSheetView,
-    title: String,
+    title: String?,
   ) {
     view.setSheetTitle(title)
   }
 
   @ReactProp(name = "googlePlacesApiKey")
-  fun setGooglePlacesApiKey(
+  override fun setGooglePlacesApiKey(
     view: AddressSheetView,
-    key: String,
+    key: String?,
   ) {
     view.setGooglePlacesApiKey(key)
   }
 
+  @ReactProp(name = "presentationStyle")
+  override fun setPresentationStyle(
+    view: AddressSheetView,
+    value: String?,
+  ) {
+    // noop iOS only.
+  }
+
+  @ReactProp(name = "animationStyle")
+  override fun setAnimationStyle(
+    view: AddressSheetView,
+    value: String?,
+  ) {
+    // noop iOS only.
+  }
+
   override fun createViewInstance(reactContext: ThemedReactContext): AddressSheetView = AddressSheetView(reactContext)
 
   companion object {

package/android/src/main/java/com/reactnativestripesdk/customersheet/CustomerSheetFragment.kt

@@ -1,4 +1,4 @@
-package com.reactnativestripesdk
+package com.reactnativestripesdk.customersheet
 
 import android.app.Activity
 import android.app.Application
@@ -7,21 +7,23 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import androidx.fragment.app.Fragment
 import com.facebook.react.bridge.Arguments
 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.customersheet.ReactNativeCustomerAdapter
+import com.reactnativestripesdk.ReactNativeCustomerAdapter
+import com.reactnativestripesdk.buildPaymentSheetAppearance
+import com.reactnativestripesdk.getBase64FromBitmap
+import com.reactnativestripesdk.getBitmapFromDrawable
+import com.reactnativestripesdk.mapToAddressCollectionMode
+import com.reactnativestripesdk.mapToCardBrandAcceptance
+import com.reactnativestripesdk.mapToCollectionMode
 import com.reactnativestripesdk.utils.CreateTokenErrorType
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.KeepJsAwakeTask
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
+import com.reactnativestripesdk.utils.StripeFragment
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.mapFromPaymentMethod
 import com.reactnativestripesdk.utils.mapToPreferredNetworks
@@ -38,7 +40,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class)
-class CustomerSheetFragment : Fragment() {
+class CustomerSheetFragment : StripeFragment() {
   private var customerSheet: CustomerSheet? = null
   internal var customerAdapter: ReactNativeCustomerAdapter? = null
   internal var context: ReactApplicationContext? = null
@@ -46,18 +48,7 @@ class CustomerSheetFragment : Fragment() {
   private var presentPromise: Promise? = null
   private var keepJsAwake: KeepJsAwakeTask? = null
 
-  override fun onCreateView(
-    inflater: LayoutInflater,
-    container: ViewGroup?,
-    savedInstanceState: Bundle?,
-  ): View = FrameLayout(requireActivity()).also { it.visibility = View.GONE }
-
-  override fun onViewCreated(
-    view: View,
-    savedInstanceState: Bundle?,
-  ) {
-    super.onViewCreated(view, savedInstanceState)
-
+  override fun prepare() {
     val context =
       context
         ?: run {
@@ -161,9 +152,11 @@ class CustomerSheetFragment : Fragment() {
       is CustomerSheetResult.Failed -> {
         resolvePresentPromise(createError(ErrorType.Failed.toString(), result.exception))
       }
+
       is CustomerSheetResult.Selected -> {
         promiseResult = createPaymentOptionResult(result.selection)
       }
+
       is CustomerSheetResult.Canceled -> {
         promiseResult = createPaymentOptionResult(result.selection)
         promiseResult.putMap(
@@ -188,7 +181,6 @@ class CustomerSheetFragment : Fragment() {
   }
 
   private fun presentWithTimeout(timeout: Long) {
-    var customerSheetActivity: Activity? = null
     var activities: MutableList<Activity> = mutableListOf()
     val activityLifecycleCallbacks =
       object : Application.ActivityLifecycleCallbacks {
@@ -196,7 +188,6 @@ class CustomerSheetFragment : Fragment() {
           activity: Activity,
           savedInstanceState: Bundle?,
         ) {
-          customerSheetActivity = activity
           activities.add(activity)
         }
 
@@ -211,10 +202,10 @@ class CustomerSheetFragment : Fragment() {
         override fun onActivitySaveInstanceState(
           activity: Activity,
           outState: Bundle,
-        ) {}
+        ) {
+        }
 
         override fun onActivityDestroyed(activity: Activity) {
-          customerSheetActivity = null
           activities = mutableListOf()
           context?.currentActivity?.application?.unregisterActivityLifecycleCallbacks(this)
         }
@@ -253,9 +244,11 @@ class CustomerSheetFragment : Fragment() {
           is CustomerSheetResult.Failed -> {
             promise.resolve(createError(ErrorType.Failed.toString(), result.exception))
           }
+
           is CustomerSheetResult.Selected -> {
             promiseResult = createPaymentOptionResult(result.selection)
           }
+
           is CustomerSheetResult.Canceled -> {
             promiseResult = createPaymentOptionResult(result.selection)
             promiseResult.putMap(
@@ -380,6 +373,7 @@ class CustomerSheetFragment : Fragment() {
           paymentOptionResult =
             buildResult(selection.paymentOption.label, selection.paymentOption.icon(), null)
         }
+
         is PaymentOptionSelection.PaymentMethod -> {
           paymentOptionResult =
             buildResult(
@@ -388,6 +382,7 @@ class CustomerSheetFragment : Fragment() {
               selection.paymentMethod,
             )
         }
+
         null -> {}
       }
 

package/android/src/main/java/com/reactnativestripesdk/customersheet/ReactNativeCustomerAdapter.kt

@@ -1,16 +1,14 @@
-package com.reactnativestripesdk.customersheet
+// This needs to be in the same package as StripeSdkModule to access protected methods.
+package com.reactnativestripesdk
 
-import android.util.Log
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.WritableMap
-import com.reactnativestripesdk.StripeSdkModule
 import com.stripe.android.customersheet.CustomerAdapter
 import com.stripe.android.model.PaymentMethod
 import kotlinx.coroutines.CompletableDeferred
 
 class ReactNativeCustomerAdapter(
-  private val context: ReactApplicationContext,
+  val context: ReactApplicationContext,
   private val adapter: CustomerAdapter,
   private val overridesFetchPaymentMethods: Boolean,
   private val overridesAttachPaymentMethod: Boolean,
@@ -19,6 +17,8 @@ class ReactNativeCustomerAdapter(
   private val overridesFetchSelectedPaymentOption: Boolean,
   private val overridesSetupIntentClientSecretForCustomerAttach: Boolean,
 ) : CustomerAdapter by adapter {
+  private val stripeSdkModule = context.getNativeModule(StripeSdkModule::class.java)
+
   internal var fetchPaymentMethodsCallback: CompletableDeferred<List<PaymentMethod>>? = null
   internal var attachPaymentMethodCallback: CompletableDeferred<PaymentMethod>? = null
   internal var detachPaymentMethodCallback: CompletableDeferred<PaymentMethod>? = null
@@ -30,7 +30,7 @@ class ReactNativeCustomerAdapter(
     if (overridesFetchPaymentMethods) {
       CompletableDeferred<List<PaymentMethod>>().also {
         fetchPaymentMethodsCallback = it
-        emitEvent("onCustomerAdapterFetchPaymentMethodsCallback", Arguments.createMap())
+        stripeSdkModule?.emitOnCustomerAdapterFetchPaymentMethodsCallback()
         val resultFromJavascript = it.await()
         return CustomerAdapter.Result.success(resultFromJavascript)
       }
@@ -44,7 +44,7 @@ class ReactNativeCustomerAdapter(
       CompletableDeferred<PaymentMethod>().also {
         attachPaymentMethodCallback = it
         val params = Arguments.createMap().also { it.putString("paymentMethodId", paymentMethodId) }
-        emitEvent("onCustomerAdapterAttachPaymentMethodCallback", params)
+        stripeSdkModule?.emitOnCustomerAdapterAttachPaymentMethodCallback(params)
         val resultFromJavascript = it.await()
         return CustomerAdapter.Result.success(resultFromJavascript)
       }
@@ -58,7 +58,7 @@ class ReactNativeCustomerAdapter(
       CompletableDeferred<PaymentMethod>().also {
         detachPaymentMethodCallback = it
         val params = Arguments.createMap().also { it.putString("paymentMethodId", paymentMethodId) }
-        emitEvent("onCustomerAdapterDetachPaymentMethodCallback", params)
+        stripeSdkModule?.emitOnCustomerAdapterDetachPaymentMethodCallback(params)
         val resultFromJavascript = it.await()
         return CustomerAdapter.Result.success(resultFromJavascript)
       }
@@ -72,7 +72,7 @@ class ReactNativeCustomerAdapter(
       CompletableDeferred<Unit>().also {
         setSelectedPaymentOptionCallback = it
         val params = Arguments.createMap().also { it.putString("paymentOption", paymentOption?.id) }
-        emitEvent("onCustomerAdapterSetSelectedPaymentOptionCallback", params)
+        stripeSdkModule?.emitOnCustomerAdapterSetSelectedPaymentOptionCallback(params)
         val resultFromJavascript = it.await()
         return CustomerAdapter.Result.success(resultFromJavascript)
       }
@@ -85,7 +85,7 @@ class ReactNativeCustomerAdapter(
     if (overridesFetchSelectedPaymentOption) {
       CompletableDeferred<String?>().also {
         fetchSelectedPaymentOptionCallback = it
-        emitEvent("onCustomerAdapterFetchSelectedPaymentOptionCallback", Arguments.createMap())
+        stripeSdkModule?.emitOnCustomerAdapterFetchSelectedPaymentOptionCallback()
         val resultFromJavascript = it.await()
         return CustomerAdapter.Result.success(
           if (resultFromJavascript != null) {
@@ -104,10 +104,7 @@ class ReactNativeCustomerAdapter(
     if (overridesSetupIntentClientSecretForCustomerAttach) {
       CompletableDeferred<String>().also {
         setupIntentClientSecretForCustomerAttachCallback = it
-        emitEvent(
-          "onCustomerAdapterSetupIntentClientSecretForCustomerAttachCallback",
-          Arguments.createMap(),
-        )
+        stripeSdkModule?.emitOnCustomerAdapterSetupIntentClientSecretForCustomerAttachCallback()
         val resultFromJavascript = it.await()
         return CustomerAdapter.Result.success(resultFromJavascript)
       }
@@ -115,19 +112,4 @@ class ReactNativeCustomerAdapter(
 
     return adapter.setupIntentClientSecretForCustomerAttach()
   }
-
-  private fun emitEvent(
-    eventName: String,
-    params: WritableMap,
-  ) {
-    val stripeSdkModule: StripeSdkModule? = context.getNativeModule(StripeSdkModule::class.java)
-    if (stripeSdkModule == null || stripeSdkModule.eventListenerCount == 0) {
-      Log.e(
-        "StripeReactNative",
-        "Tried to call $eventName, but no callback was found. Please file an issue: https://github.com/stripe/stripe-react-native/issues",
-      )
-    }
-
-    stripeSdkModule?.sendEvent(context, eventName, params)
-  }
 }

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

@@ -2,20 +2,28 @@ package com.reactnativestripesdk.pushprovisioning
 
 import android.content.Context
 import com.bumptech.glide.Glide
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.AddToWalletButtonManagerDelegate
+import com.facebook.react.viewmanagers.AddToWalletButtonManagerInterface
+import com.reactnativestripesdk.utils.asMapOrNull
 
 @ReactModule(name = AddToWalletButtonManager.REACT_CLASS)
 class AddToWalletButtonManager(
   applicationContext: Context,
-) : SimpleViewManager<AddToWalletButtonView>() {
+) : SimpleViewManager<AddToWalletButtonView>(),
+  AddToWalletButtonManagerInterface<AddToWalletButtonView> {
+  private val delegate = AddToWalletButtonManagerDelegate(this)
   private val requestManager = Glide.with(applicationContext)
 
   override fun getName() = REACT_CLASS
 
+  override fun getDelegate() = delegate
+
   override fun onDropViewInstance(view: AddToWalletButtonView) {
     view.onDropViewInstance()
     super.onDropViewInstance(view)
@@ -36,35 +44,51 @@ class AddToWalletButtonManager(
     )
 
   @ReactProp(name = "androidAssetSource")
-  fun source(
+  override fun setAndroidAssetSource(
     view: AddToWalletButtonView,
-    source: ReadableMap,
+    source: ReadableMap?,
   ) {
     view.setSourceMap(source)
   }
 
   @ReactProp(name = "cardDetails")
-  fun cardDetails(
+  override fun setCardDetails(
     view: AddToWalletButtonView,
-    cardDetails: ReadableMap,
+    cardDetails: Dynamic,
   ) {
-    view.setCardDetails(cardDetails)
+    view.setCardDetails(cardDetails.asMapOrNull())
   }
 
   @ReactProp(name = "ephemeralKey")
-  fun ephemeralKey(
+  override fun setEphemeralKey(
     view: AddToWalletButtonView,
-    ephemeralKey: ReadableMap,
+    ephemeralKey: Dynamic,
   ) {
-    view.setEphemeralKey(ephemeralKey)
+    view.setEphemeralKey(ephemeralKey.asMap())
   }
 
   @ReactProp(name = "token")
-  fun token(
+  override fun setToken(
+    view: AddToWalletButtonView,
+    token: Dynamic,
+  ) {
+    view.setToken(token.asMap())
+  }
+
+  @ReactProp(name = "iOSButtonStyle")
+  override fun setIOSButtonStyle(
+    view: AddToWalletButtonView,
+    value: String?,
+  ) {
+    // noop, iOS only.
+  }
+
+  @ReactProp(name = "testEnv")
+  override fun setTestEnv(
     view: AddToWalletButtonView,
-    token: ReadableMap?,
+    value: Boolean,
   ) {
-    view.setToken(token)
+    // noop, iOS only.
   }
 
   companion object {

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

@@ -159,11 +159,11 @@ class AddToWalletButtonView(
     requestManager.clear(this)
   }
 
-  fun setSourceMap(map: ReadableMap) {
+  fun setSourceMap(map: ReadableMap?) {
     sourceMap = map
   }
 
-  fun setCardDetails(detailsMap: ReadableMap) {
+  fun setCardDetails(detailsMap: ReadableMap?) {
     cardDetails = detailsMap
   }
 
@@ -176,6 +176,8 @@ class AddToWalletButtonView(
   }
 
   fun dispatchEvent(error: WritableMap?) {
-    UIManagerHelper.getEventDispatcherForReactTag(context, id)?.dispatchEvent(AddToWalletCompleteEvent(context.surfaceId, id, error))
+    UIManagerHelper
+      .getEventDispatcherForReactTag(context, id)
+      ?.dispatchEvent(AddToWalletCompleteEvent(context.surfaceId, id, error))
   }
 }

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

@@ -5,8 +5,10 @@ import android.view.View
 import android.view.inputmethod.InputMethodManager
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
 
 fun View.showSoftKeyboard() {
   post {
@@ -36,3 +38,5 @@ fun ReadableMap.getBooleanOr(
   key: String,
   default: Boolean,
 ): Boolean = if (this.hasKey(key)) this.getBoolean(key) else default
+
+fun Dynamic.asMapOrNull(): ReadableMap? = if (this.type == ReadableType.Map) this.asMap() else null

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

@@ -1,7 +1,7 @@
 package com.reactnativestripesdk.utils
 
 import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReactContext
+import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.jstasks.HeadlessJsTaskConfig
 import com.facebook.react.jstasks.HeadlessJsTaskContext
@@ -12,7 +12,7 @@ import com.facebook.react.jstasks.HeadlessJsTaskContext
  * pausing timers.
  */
 internal class KeepJsAwakeTask(
-  private val context: ReactContext,
+  private val context: ReactApplicationContext,
 ) {
   private var taskId: Int? = null
 

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

@@ -199,6 +199,27 @@ internal fun mapFromBillingDetails(billingDatails: PaymentMethod.BillingDetails?
   return details
 }
 
+internal fun mapFromPaymentSheetBillingDetails(billing: com.stripe.android.paymentsheet.PaymentSheet.BillingDetails?): WritableMap {
+  val details = Arguments.createMap()
+  details.putString("name", billing?.name)
+  details.putString("email", billing?.email)
+  details.putString("phone", billing?.phone)
+
+  // map the nested address
+  val addrMap = Arguments.createMap()
+  billing?.address?.let { a ->
+    addrMap.putString("city", a.city)
+    addrMap.putString("country", a.country)
+    addrMap.putString("line1", a.line1)
+    addrMap.putString("line2", a.line2)
+    addrMap.putString("postalCode", a.postalCode)
+    addrMap.putString("state", a.state)
+  }
+  details.putMap("address", addrMap)
+
+  return details
+}
+
 internal fun mapTokenType(type: Token.Type): String =
   when (type) {
     Token.Type.Account -> "Account"