@stripe/stripe-react-native 0.57.0 → 0.57.1

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

@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -22,7 +21,6 @@ import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.uimanager.ThemedReactContext
-import com.reactnativestripesdk.toWritableMap
 import com.reactnativestripesdk.utils.KeepJsAwakeTask
 import com.reactnativestripesdk.utils.mapFromConfirmationToken
 import com.reactnativestripesdk.utils.mapFromCustomPaymentMethod
@@ -196,7 +194,7 @@ class EmbeddedPaymentElementView(
                 val stripeSdkModule =
                   try {
                     requireStripeSdkModule()
-                  } catch (ex: IllegalArgumentException) {
+                  } catch (_: IllegalArgumentException) {
                     return@Builder CreateIntentResult.Failure(
                       cause =
                         Exception(
@@ -242,7 +240,7 @@ class EmbeddedPaymentElementView(
                 val stripeSdkModule =
                   try {
                     requireStripeSdkModule()
-                  } catch (ex: IllegalArgumentException) {
+                  } catch (_: IllegalArgumentException) {
                     return@Builder CreateIntentResult.Failure(
                       cause =
                         Exception(
@@ -295,9 +293,6 @@ class EmbeddedPaymentElementView(
       }
 
     val embedded = rememberEmbeddedPaymentElement(builder)
-    var height by remember {
-      mutableIntStateOf(0)
-    }
 
     // collect events: configure, confirm, clear
     LaunchedEffect(Unit) {
@@ -348,10 +343,8 @@ class EmbeddedPaymentElementView(
       }
     }
 
-    val density = LocalDensity.current
-
     Box {
-      measuredEmbeddedElement(
+      MeasuredEmbeddedElement(
         reportHeightChange = { h -> reportHeightChange(h) },
       ) {
         embedded.Content()
@@ -360,7 +353,7 @@ class EmbeddedPaymentElementView(
   }
 
   @Composable
-  private fun measuredEmbeddedElement(
+  private fun MeasuredEmbeddedElement(
     reportHeightChange: (Float) -> Unit,
     content: @Composable () -> Unit,
   ) {

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

@@ -3,21 +3,20 @@ package com.reactnativestripesdk
 import android.annotation.SuppressLint
 import android.content.Context
 import com.facebook.react.bridge.Dynamic
-import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.ReadableType
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.EmbeddedPaymentElementViewManagerDelegate
 import com.facebook.react.viewmanagers.EmbeddedPaymentElementViewManagerInterface
-import com.reactnativestripesdk.PaymentSheetManager.Companion.buildCustomerConfiguration
-import com.reactnativestripesdk.PaymentSheetManager.Companion.buildGooglePayConfig
 import com.reactnativestripesdk.addresssheet.AddressSheetView
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
 import com.reactnativestripesdk.utils.PaymentSheetException
+import com.reactnativestripesdk.utils.asMapOrNull
 import com.reactnativestripesdk.utils.getBooleanOr
+import com.reactnativestripesdk.utils.getIntegerList
+import com.reactnativestripesdk.utils.getStringList
 import com.reactnativestripesdk.utils.mapToPreferredNetworks
 import com.reactnativestripesdk.utils.parseCustomPaymentMethods
 import com.stripe.android.ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi
@@ -54,10 +53,10 @@ class EmbeddedPaymentElementViewManager :
     view: EmbeddedPaymentElementView,
     cfg: Dynamic,
   ) {
-    val readableMap = cfg.asMap()
+    val readableMap = cfg.asMapOrNull()
     if (readableMap == null) return
 
-    val rowSelectionBehaviorType = parseRowSelectionBehavior(readableMap)
+    val rowSelectionBehaviorType = mapToRowSelectionBehaviorType(readableMap)
     view.rowSelectionBehaviorType.value = rowSelectionBehaviorType
 
     val elementConfig = parseElementConfiguration(readableMap, view.context)
@@ -77,7 +76,7 @@ class EmbeddedPaymentElementViewManager :
     view: EmbeddedPaymentElementView,
     cfg: Dynamic,
   ) {
-    val readableMap = cfg.asMap()
+    val readableMap = cfg.asMapOrNull()
     if (readableMap == null) return
 
     // Detect which callback type to use based on the presence of the confirmation token handler
@@ -101,45 +100,18 @@ class EmbeddedPaymentElementViewManager :
     context: Context,
   ): EmbeddedPaymentElement.Configuration {
     val merchantDisplayName = map.getString("merchantDisplayName").orEmpty()
-    val allowsDelayedPaymentMethods: Boolean =
-      if (map.hasKey("allowsDelayedPaymentMethods") &&
-        map.getType("allowsDelayedPaymentMethods") == ReadableType.Boolean
-      ) {
-        map.getBoolean("allowsDelayedPaymentMethods")
-      } else {
-        false // default
-      }
-    var defaultBillingDetails: PaymentSheet.BillingDetails? = null
-    val billingDetailsMap = map.getMap("defaultBillingDetails")
-    if (billingDetailsMap != null) {
-      val addressMap = billingDetailsMap.getMap("address")
-      val address =
-        PaymentSheet.Address(
-          addressMap?.getString("city"),
-          addressMap?.getString("country"),
-          addressMap?.getString("line1"),
-          addressMap?.getString("line2"),
-          addressMap?.getString("postalCode"),
-          addressMap?.getString("state"),
-        )
-      defaultBillingDetails =
-        PaymentSheet.BillingDetails(
-          address,
-          billingDetailsMap.getString("email"),
-          billingDetailsMap.getString("name"),
-          billingDetailsMap.getString("phone"),
-        )
-    }
+    val allowsDelayedPaymentMethods = map.getBooleanOr("allowsDelayedPaymentMethods", false)
+    val defaultBillingDetails = buildBillingDetails(map.getMap("defaultBillingDetails"))
 
     val customerConfiguration =
       try {
         buildCustomerConfiguration(map)
-      } catch (error: PaymentSheetException) {
+      } catch (_: PaymentSheetException) {
         throw Error() // TODO handle error
       }
 
     val googlePayConfig = buildGooglePayConfig(map.getMap("googlePay"))
-    val linkConfig = PaymentSheetManager.buildLinkConfig(map.getMap("link"))
+    val linkConfig = buildLinkConfig(map.getMap("link"))
     val shippingDetails =
       map.getMap("defaultShippingDetails")?.let {
         AddressSheetView.buildAddressDetails(it)
@@ -147,45 +119,24 @@ class EmbeddedPaymentElementViewManager :
     val appearance =
       try {
         buildPaymentSheetAppearance(map.getMap("appearance"), context)
-      } catch (error: PaymentSheetAppearanceException) {
+      } catch (_: PaymentSheetAppearanceException) {
         throw Error() // TODO handle error
       }
-    val billingConfigParams = map.getMap("billingDetailsCollectionConfiguration")
     val billingDetailsConfig =
-      PaymentSheet.BillingDetailsCollectionConfiguration(
-        name = mapToCollectionMode(billingConfigParams?.getString("name")),
-        phone = mapToCollectionMode(billingConfigParams?.getString("phone")),
-        email = mapToCollectionMode(billingConfigParams?.getString("email")),
-        address = mapToAddressCollectionMode(billingConfigParams?.getString("address")),
-        attachDefaultsToPaymentMethod =
-          billingConfigParams?.getBooleanOr("attachDefaultsToPaymentMethod", false) ?: false,
+      buildBillingDetailsCollectionConfiguration(
+        map.getMap("billingDetailsCollectionConfiguration"),
       )
-    val allowsRemovalOfLastSavedPaymentMethod =
-      if (map.hasKey("allowsRemovalOfLastSavedPaymentMethod")) {
-        map.getBoolean("allowsRemovalOfLastSavedPaymentMethod")
-      } else {
-        true
-      }
+    val allowsRemovalOfLastSavedPaymentMethod = map.getBooleanOr("allowsRemovalOfLastSavedPaymentMethod", true)
     val primaryButtonLabel = map.getString("primaryButtonLabel")
-    val paymentMethodOrder = map.getStringArrayList("paymentMethodOrder")
+    val paymentMethodOrder = map.getStringList("paymentMethodOrder")
 
-    val formSheetAction =
-      map
-        .getMap("formSheetAction")
-        ?.getString("type")
-        ?.let { type ->
-          when (type) {
-            "confirm" -> EmbeddedPaymentElement.FormSheetAction.Confirm
-            else -> EmbeddedPaymentElement.FormSheetAction.Continue
-          }
-        }
-        ?: EmbeddedPaymentElement.FormSheetAction.Continue
+    val formSheetAction = mapToFormSheetAction(map)
 
     val configurationBuilder =
       EmbeddedPaymentElement.Configuration
         .Builder(merchantDisplayName)
         .formSheetAction(formSheetAction)
-        .allowsDelayedPaymentMethods(allowsDelayedPaymentMethods ?: false)
+        .allowsDelayedPaymentMethods(allowsDelayedPaymentMethods)
         .defaultBillingDetails(defaultBillingDetails)
         .customer(customerConfiguration)
         .googlePay(googlePayConfig)
@@ -196,19 +147,13 @@ class EmbeddedPaymentElementViewManager :
         .preferredNetworks(
           mapToPreferredNetworks(
             map
-              .getIntegerArrayList("preferredNetworks")
+              .getIntegerList("preferredNetworks")
               ?.let { ArrayList(it) },
           ),
         ).allowsRemovalOfLastSavedPaymentMethod(allowsRemovalOfLastSavedPaymentMethod)
         .cardBrandAcceptance(mapToCardBrandAcceptance(map))
         .embeddedViewDisplaysMandateText(
-          if (map.hasKey("embeddedViewDisplaysMandateText") &&
-            map.getType("embeddedViewDisplaysMandateText") == ReadableType.Boolean
-          ) {
-            map.getBoolean("embeddedViewDisplaysMandateText")
-          } else {
-            true // default value
-          },
+          map.getBooleanOr("embeddedViewDisplaysMandateText", true),
         ).customPaymentMethods(
           parseCustomPaymentMethods(
             map.getMap("customPaymentMethodConfiguration"),
@@ -221,23 +166,8 @@ class EmbeddedPaymentElementViewManager :
     return configurationBuilder.build()
   }
 
-  private fun parseRowSelectionBehavior(map: ReadableMap): RowSelectionBehaviorType {
-    val rowSelectionBehavior =
-      map
-        .getMap("rowSelectionBehavior")
-        ?.getString("type")
-        ?.let { type ->
-          when (type) {
-            "immediateAction" -> RowSelectionBehaviorType.ImmediateAction
-            else -> RowSelectionBehaviorType.Default
-          }
-        }
-        ?: RowSelectionBehaviorType.Default
-    return rowSelectionBehavior
-  }
-
   private fun parseIntentConfiguration(map: ReadableMap): PaymentSheet.IntentConfiguration {
-    val intentConfig = PaymentSheetManager.buildIntentConfiguration(map)
+    val intentConfig = buildIntentConfiguration(map)
     return intentConfig ?: throw IllegalArgumentException("IntentConfiguration is null")
   }
 
@@ -250,35 +180,32 @@ class EmbeddedPaymentElementViewManager :
   }
 }
 
-/**
- * Returns a List of Strings if the key exists and points to an array of strings, or null otherwise.
- */
-fun ReadableMap.getStringArrayList(key: String): List<String>? {
-  if (!hasKey(key) || getType(key) != ReadableType.Array) return null
-  val array: ReadableArray = getArray(key) ?: return null
-
-  val result = mutableListOf<String>()
-  for (i in 0 until array.size()) {
-    // getString returns null if the element isn't actually a string
-    array.getString(i)?.let { result.add(it) }
-  }
-  return result
+internal fun mapToRowSelectionBehaviorType(map: ReadableMap?): RowSelectionBehaviorType {
+  val rowSelectionBehavior =
+    map
+      ?.getMap("rowSelectionBehavior")
+      ?.getString("type")
+      ?.let { type ->
+        when (type) {
+          "immediateAction" -> RowSelectionBehaviorType.ImmediateAction
+          else -> RowSelectionBehaviorType.Default
+        }
+      }
+      ?: RowSelectionBehaviorType.Default
+  return rowSelectionBehavior
 }
 
-/**
- * Returns a List of Ints if the key exists and points to an array of numbers, or null otherwise.
- */
-fun ReadableMap.getIntegerArrayList(key: String): List<Int>? {
-  if (!hasKey(key) || getType(key) != ReadableType.Array) return null
-  val array: ReadableArray = getArray(key) ?: return null
-
-  val result = mutableListOf<Int>()
-  for (i in 0 until array.size()) {
-    // getType check to skip non-number entries
-    if (array.getType(i) == ReadableType.Number) {
-      // if it's actually a float/double, this will truncate; adjust as needed
-      result.add(array.getInt(i))
-    }
-  }
-  return result
+internal fun mapToFormSheetAction(map: ReadableMap?): EmbeddedPaymentElement.FormSheetAction {
+  val formSheetAction =
+    map
+      ?.getMap("formSheetAction")
+      ?.getString("type")
+      ?.let { type ->
+        when (type) {
+          "confirm" -> EmbeddedPaymentElement.FormSheetAction.Confirm
+          else -> EmbeddedPaymentElement.FormSheetAction.Continue
+        }
+      }
+      ?: EmbeddedPaymentElement.FormSheetAction.Continue
+  return formSheetAction
 }

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

@@ -32,10 +32,6 @@ class EventEmitterCompat(
     invoke("onFinancialConnectionsEvent", value)
   }
 
-  fun emitOnOrderTrackingCallback() {
-    invoke("onOrderTrackingCallback")
-  }
-
   fun emitOnCustomerAdapterFetchPaymentMethodsCallback() {
     invoke("onCustomerAdapterFetchPaymentMethodsCallback")
   }
@@ -72,10 +68,6 @@ class EventEmitterCompat(
     invoke("embeddedPaymentElementDidUpdateHeight", value)
   }
 
-  fun emitEmbeddedPaymentElementWillPresent() {
-    invoke("embeddedPaymentElementWillPresent")
-  }
-
   fun emitEmbeddedPaymentElementDidUpdatePaymentOption(value: ReadableMap?) {
     invoke("embeddedPaymentElementDidUpdatePaymentOption", value)
   }

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

@@ -0,0 +1,154 @@
+package com.reactnativestripesdk
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.module.annotations.ReactModule
+import com.reactnativestripesdk.utils.createFailedError
+
+@ReactModule(name = NativeOnrampSdkModuleSpec.NAME)
+class FakeOnrampSdkModule(
+  reactContext: ReactApplicationContext,
+) : NativeOnrampSdkModuleSpec(reactContext) {
+  @ReactMethod
+  override fun initialise(
+    params: ReadableMap?,
+    promise: Promise?,
+  ) {
+    promise?.resolve(null)
+  }
+
+  @ReactMethod
+  override fun configureOnramp(
+    config: ReadableMap?,
+    promise: Promise?,
+  ) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun hasLinkAccount(
+    email: String?,
+    promise: Promise?,
+  ) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun registerLinkUser(
+    info: ReadableMap?,
+    promise: Promise?,
+  ) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun registerWalletAddress(
+    walletAddress: String?,
+    network: String?,
+    promise: Promise?,
+  ) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun attachKycInfo(
+    kycInfo: ReadableMap?,
+    promise: Promise?,
+  ) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun updatePhoneNumber(
+    phone: String?,
+    promise: Promise?,
+  ) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun authenticateUser(promise: Promise?) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun verifyIdentity(promise: Promise?) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun presentKycInfoVerification(
+    updatedAddress: ReadableMap?,
+    promise: Promise,
+  ) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun collectPaymentMethod(
+    paymentMethod: String?,
+    platformPayParams: ReadableMap?,
+    promise: Promise?,
+  ) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun provideCheckoutClientSecret(clientSecret: String?) {
+    // No-op
+  }
+
+  @ReactMethod
+  override fun createCryptoPaymentToken(promise: Promise?) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun performCheckout(
+    onrampSessionId: String?,
+    promise: Promise?,
+  ) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun onrampAuthorize(
+    linkAuthIntentId: String?,
+    promise: Promise?,
+  ) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun logout(promise: Promise?) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun getCryptoTokenDisplayData(
+    token: ReadableMap,
+    promise: Promise,
+  ) {
+    promise?.resolveNotImplemented()
+  }
+
+  @ReactMethod
+  override fun authenticateUserWithToken(
+    token: String,
+    promise: Promise,
+  ) {
+    promise.resolveNotImplemented()
+  }
+
+  private fun Promise.resolveNotImplemented() {
+    this.resolve(
+      createFailedError(
+        NotImplementedError(
+          "To enable Onramp, add 'StripeSdk_includeOnramp=true' to gradle.properties.",
+        ),
+      ),
+    )
+  }
+}

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

@@ -6,7 +6,6 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.StripeUIManager
 import com.reactnativestripesdk.utils.createError
@@ -105,7 +104,7 @@ class FinancialConnectionsSheetManager(
 
       is FinancialConnectionsSheetResult.Completed -> {
         promise?.resolve(
-          WritableNativeMap().also {
+          Arguments.createMap().also {
             it.putMap("session", mapFromSession(result.financialConnectionsSession))
           },
         )
@@ -115,13 +114,13 @@ class FinancialConnectionsSheetManager(
 
   companion object {
     private fun createTokenResult(result: FinancialConnectionsSheetForTokenResult.Completed): WritableMap =
-      WritableNativeMap().also {
+      Arguments.createMap().also {
         it.putMap("session", mapFromSession(result.financialConnectionsSession))
         it.putMap("token", mapFromToken(result.token))
       }
 
     private fun mapFromSession(financialConnectionsSession: FinancialConnectionsSession): WritableMap {
-      val session = WritableNativeMap()
+      val session = Arguments.createMap()
       session.putString("id", financialConnectionsSession.id)
       session.putString("clientSecret", financialConnectionsSession.clientSecret)
       session.putBoolean("livemode", financialConnectionsSession.livemode)
@@ -132,7 +131,7 @@ class FinancialConnectionsSheetManager(
     private fun mapFromAccountsList(accounts: FinancialConnectionsAccountList): ReadableArray {
       val results: WritableArray = Arguments.createArray()
       for (account in accounts.data) {
-        val map = WritableNativeMap()
+        val map = Arguments.createMap()
         map.putString("id", account.id)
         map.putBoolean("livemode", account.livemode)
         map.putString("displayName", account.displayName)
@@ -166,10 +165,10 @@ class FinancialConnectionsSheetManager(
       if (balance == null) {
         return null
       }
-      val map = WritableNativeMap()
+      val map = Arguments.createMap()
       map.putDouble("asOf", balance.asOf * 1000.0)
       map.putString("type", mapFromBalanceType(balance.type))
-      WritableNativeMap().also {
+      Arguments.createMap().also {
         for (entry in balance.current.entries) {
           it.putInt(entry.key, entry.value)
         }
@@ -181,9 +180,9 @@ class FinancialConnectionsSheetManager(
       return map
     }
 
-    private fun mapFromCashAvailable(balance: Balance): WritableNativeMap =
-      WritableNativeMap().also { cashMap ->
-        WritableNativeMap().also { availableMap ->
+    private fun mapFromCashAvailable(balance: Balance): WritableMap =
+      Arguments.createMap().also { cashMap ->
+        Arguments.createMap().also { availableMap ->
           balance.cash?.available?.entries?.let { entries ->
             for (entry in entries) {
               availableMap.putInt(entry.key, entry.value)
@@ -193,9 +192,9 @@ class FinancialConnectionsSheetManager(
         }
       }
 
-    private fun mapFromCreditUsed(balance: Balance): WritableNativeMap =
-      WritableNativeMap().also { creditMap ->
-        WritableNativeMap().also { usedMap ->
+    private fun mapFromCreditUsed(balance: Balance): WritableMap =
+      Arguments.createMap().also { creditMap ->
+        Arguments.createMap().also { usedMap ->
           balance.credit?.used?.entries?.let { entries ->
             for (entry in entries) {
               usedMap.putInt(entry.key, entry.value)
@@ -209,7 +208,7 @@ class FinancialConnectionsSheetManager(
       if (balanceRefresh == null) {
         return null
       }
-      val map = WritableNativeMap()
+      val map = Arguments.createMap()
       map.putString("status", mapFromBalanceRefreshStatus(balanceRefresh.status))
       map.putDouble("lastAttemptedAt", balanceRefresh.lastAttemptedAt * 1000.0)
       return map
@@ -251,7 +250,6 @@ class FinancialConnectionsSheetManager(
         FinancialConnectionsAccount.Permissions.TRANSACTIONS -> "transactions"
         FinancialConnectionsAccount.Permissions.ACCOUNT_NUMBERS -> "accountNumbers"
         FinancialConnectionsAccount.Permissions.UNKNOWN -> "unparsable"
-        FinancialConnectionsAccount.Permissions.ACCOUNT_NUMBERS -> "accountNumbers"
       }
 
     private fun mapFromSupportedPaymentMethodTypes(type: FinancialConnectionsAccount.SupportedPaymentMethodTypes): String =

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

@@ -108,7 +108,7 @@ class GooglePayButtonView(
         MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
         MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
       )
-      button?.layout(left, top, right, bottom)
+      layout(left, top, right, bottom)
     }
 
   fun setType(type: Int) {

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

@@ -30,7 +30,7 @@ class GooglePayLauncherManager(
   private var configuration =
     GooglePayLauncher.Config(
       environment =
-        if (googlePayParams.getBoolean("testEnv")) {
+        if (googlePayParams.getBooleanOr("testEnv", false)) {
           GooglePayEnvironment.Test
         } else {
           GooglePayEnvironment.Production

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

@@ -3,9 +3,9 @@ package com.reactnativestripesdk
 import android.app.Activity
 import android.content.Intent
 import androidx.fragment.app.FragmentActivity
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.google.android.gms.tasks.Task
 import com.google.android.gms.wallet.AutoResolveHelper
 import com.google.android.gms.wallet.PaymentData
@@ -15,6 +15,7 @@ import com.google.android.gms.wallet.WalletConstants
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.getBooleanOr
+import com.reactnativestripesdk.utils.getIntOr
 import com.reactnativestripesdk.utils.mapFromPaymentMethod
 import com.reactnativestripesdk.utils.mapFromShippingContact
 import com.reactnativestripesdk.utils.mapFromToken
@@ -58,7 +59,7 @@ class GooglePayRequestHelper {
         Wallet.WalletOptions
           .Builder()
           .setEnvironment(
-            if (googlePayParams.getBoolean("testEnv")) {
+            if (googlePayParams.getBooleanOr("testEnv", false)) {
               WalletConstants.ENVIRONMENT_TEST
             } else {
               WalletConstants.ENVIRONMENT_PRODUCTION
@@ -107,7 +108,7 @@ class GooglePayRequestHelper {
     private fun buildTransactionInfo(params: ReadableMap): GooglePayJsonFactory.TransactionInfo {
       val countryCode = params.getString("merchantCountryCode").orEmpty()
       val currencyCode = params.getString("currencyCode") ?: "USD"
-      val amount = params.getInt("amount")
+      val amount = params.getIntOr("amount", 0)
       val label = params.getString("label")
 
       return GooglePayJsonFactory.TransactionInfo(
@@ -124,6 +125,7 @@ class GooglePayRequestHelper {
       request: Task<PaymentData>,
       activity: FragmentActivity,
     ) {
+      @Suppress("DEPRECATION")
       AutoResolveHelper.resolveTask(request, activity, LOAD_PAYMENT_DATA_REQUEST_CODE)
     }
 
@@ -165,7 +167,7 @@ class GooglePayRequestHelper {
       promise: Promise,
     ) {
       val paymentInformation = JSONObject(paymentData.toJson())
-      val promiseResult = WritableNativeMap()
+      val promiseResult = Arguments.createMap()
       stripe.createPaymentMethod(
         PaymentMethodCreateParams.createFromGooglePay(paymentInformation),
         callback =
@@ -193,7 +195,7 @@ class GooglePayRequestHelper {
     ) {
       val paymentInformation = JSONObject(paymentData.toJson())
       val googlePayResult = GooglePayResult.fromJson(paymentInformation)
-      val promiseResult = WritableNativeMap()
+      val promiseResult = Arguments.createMap()
       googlePayResult.token?.let {
         promiseResult.putMap("token", mapFromToken(it))
         if (googlePayResult.shippingInformation != null) {