@stripe/stripe-react-native 0.63.0 → 0.65.0

package/android/src/test/java/com/reactnativestripesdk/mappers/OnrampMappersTest.kt

@@ -6,12 +6,21 @@ import android.annotation.SuppressLint
 import androidx.compose.ui.graphics.toArgb
 import com.reactnativestripesdk.mapAppearance
 import com.reactnativestripesdk.mapConfig
+import com.reactnativestripesdk.mapFromKycInfo
+import com.reactnativestripesdk.mapGooglePayConfig
 import com.reactnativestripesdk.utils.readableMapOf
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import com.stripe.android.crypto.onramp.model.KycInfo
+import com.stripe.android.googlepaylauncher.GooglePayEnvironment
+import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
 import com.stripe.android.link.LinkAppearance.Style
+import com.stripe.android.model.DateOfBirth
+import com.stripe.android.paymentsheet.PaymentSheet
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -19,6 +28,182 @@ import org.robolectric.RobolectricTestRunner
 @SuppressLint("RestrictedApi")
 @RunWith(RobolectricTestRunner::class)
 class OnrampMappersTest {
+  @Test
+  fun mapGooglePayConfig_NullMap_ReturnsNull() {
+    val result = mapGooglePayConfig(null)
+    assertNull(result)
+  }
+
+  @Test
+  fun mapGooglePayConfig_MissingMerchantCountryCode_ReturnsNull() {
+    val params =
+      readableMapOf(
+        "merchantName" to "Test Merchant",
+      )
+    val result = mapGooglePayConfig(params)
+    assertNull(result)
+  }
+
+  @Test
+  fun mapGooglePayConfig_Defaults() {
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertEquals(GooglePayEnvironment.Production, result!!.environment)
+    assertFalse(result.isEmailRequired)
+    assertTrue(result.allowCreditCards)
+    assertFalse(result.existingPaymentMethodRequired)
+  }
+
+  @Test
+  fun mapGooglePayConfig_TestEnv() {
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "testEnv" to true,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertEquals(GooglePayEnvironment.Test, result!!.environment)
+  }
+
+  @Test
+  fun mapGooglePayConfig_IsEmailRequired_True() {
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "isEmailRequired" to true,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertTrue(result!!.isEmailRequired)
+  }
+
+  @Test
+  fun mapGooglePayConfig_AllowCreditCards_False() {
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "allowCreditCards" to false,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertFalse(result!!.allowCreditCards)
+  }
+
+  @Test
+  fun mapGooglePayConfig_MissingMerchantName_ReturnsNull() {
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+      )
+    val result = mapGooglePayConfig(params)
+    assertNull(result)
+  }
+
+  @Test
+  fun mapGooglePayConfig_ExistingPaymentMethodRequired_False() {
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "existingPaymentMethodRequired" to false,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertFalse(result!!.existingPaymentMethodRequired)
+  }
+
+  @Test
+  fun mapGooglePayConfig_WithBillingAddressConfig_IsRequired() {
+    val billingAddressConfig =
+      readableMapOf(
+        "isRequired" to true,
+      )
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "billingAddressConfig" to billingAddressConfig,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertTrue(result!!.billingAddressConfig.isRequired)
+  }
+
+  @Test
+  fun mapGooglePayConfig_WithBillingAddressConfig_FullFormat() {
+    val billingAddressConfig =
+      readableMapOf(
+        "format" to "Full",
+      )
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "billingAddressConfig" to billingAddressConfig,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertEquals(
+      GooglePayPaymentMethodLauncher.BillingAddressConfig.Format.Full,
+      result!!.billingAddressConfig.format,
+    )
+  }
+
+  @Test
+  fun mapGooglePayConfig_WithBillingAddressConfig_UnknownFormat_DefaultsToMin() {
+    val billingAddressConfig =
+      readableMapOf(
+        "format" to "Unknown",
+      )
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "billingAddressConfig" to billingAddressConfig,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertEquals(
+      GooglePayPaymentMethodLauncher.BillingAddressConfig.Format.Min,
+      result!!.billingAddressConfig.format,
+    )
+  }
+
+  @Test
+  fun mapGooglePayConfig_WithBillingAddressConfig_IsPhoneNumberRequired() {
+    val billingAddressConfig =
+      readableMapOf(
+        "isPhoneNumberRequired" to true,
+      )
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "billingAddressConfig" to billingAddressConfig,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertTrue(result!!.billingAddressConfig.isPhoneNumberRequired)
+  }
+
   @Test
   fun mapConfig_WithAppearance() {
     val appearance =
@@ -219,4 +404,117 @@ class OnrampMappersTest {
     assertEquals(8f, state.primaryButton.cornerRadiusDp)
     assertEquals(48f, state.primaryButton.heightDp)
   }
+
+  @Test
+  fun mapFromKycInfo_AllFields() {
+    val kycInfo =
+      KycInfo(
+        firstName = "Jane",
+        lastName = "Doe",
+        idNumber = "123456789",
+        address =
+          PaymentSheet.Address(
+            city = "San Francisco",
+            country = "US",
+            line1 = "123 Main St",
+            line2 = "Apt 4",
+            postalCode = "94105",
+            state = "CA",
+          ),
+        dateOfBirth = DateOfBirth(day = 15, month = 6, year = 1990),
+      )
+    val result = mapFromKycInfo(kycInfo)
+
+    assertEquals("Jane", result.getString("firstName"))
+    assertEquals("Doe", result.getString("lastName"))
+    assertEquals("123456789", result.getString("idNumber"))
+
+    val address = result.getMap("address")
+    assertNotNull(address)
+    assertEquals("San Francisco", address!!.getString("city"))
+    assertEquals("US", address.getString("country"))
+    assertEquals("123 Main St", address.getString("line1"))
+    assertEquals("Apt 4", address.getString("line2"))
+    assertEquals("94105", address.getString("postalCode"))
+    assertEquals("CA", address.getString("state"))
+
+    val dob = result.getMap("dateOfBirth")
+    assertNotNull(dob)
+    assertEquals(15, dob!!.getInt("day"))
+    assertEquals(6, dob.getInt("month"))
+    assertEquals(1990, dob.getInt("year"))
+  }
+
+  @Test
+  fun mapFromKycInfo_AllNullFields() {
+    val kycInfo =
+      KycInfo(
+        firstName = null,
+        lastName = null,
+        idNumber = null,
+        address = null,
+        dateOfBirth = null,
+      )
+    val result = mapFromKycInfo(kycInfo)
+
+    assertFalse(result.hasKey("firstName"))
+    assertFalse(result.hasKey("lastName"))
+    assertFalse(result.hasKey("idNumber"))
+    assertFalse(result.hasKey("address"))
+    assertFalse(result.hasKey("dateOfBirth"))
+  }
+
+  @Test
+  fun mapFromKycInfo_PartialFields() {
+    val kycInfo =
+      KycInfo(
+        firstName = "Jane",
+        lastName = null,
+        idNumber = null,
+        address = null,
+        dateOfBirth = DateOfBirth(day = 1, month = 1, year = 2000),
+      )
+    val result = mapFromKycInfo(kycInfo)
+
+    assertEquals("Jane", result.getString("firstName"))
+    assertFalse(result.hasKey("lastName"))
+    assertFalse(result.hasKey("idNumber"))
+    assertFalse(result.hasKey("address"))
+
+    val dob = result.getMap("dateOfBirth")
+    assertNotNull(dob)
+    assertEquals(1, dob!!.getInt("day"))
+    assertEquals(1, dob.getInt("month"))
+    assertEquals(2000, dob.getInt("year"))
+  }
+
+  @Test
+  fun mapFromKycInfo_AddressWithPartialFields() {
+    val kycInfo =
+      KycInfo(
+        firstName = null,
+        lastName = null,
+        idNumber = null,
+        address =
+          PaymentSheet.Address(
+            city = "New York",
+            country = "US",
+            line1 = null,
+            line2 = null,
+            postalCode = null,
+            state = null,
+          ),
+        dateOfBirth = null,
+      )
+    val result = mapFromKycInfo(kycInfo)
+
+    val address = result.getMap("address")
+    assertNotNull(address)
+    assertEquals("New York", address!!.getString("city"))
+    assertEquals("US", address.getString("country"))
+    assertFalse(address.hasKey("line1"))
+    assertFalse(address.hasKey("line2"))
+    assertFalse(address.hasKey("postalCode"))
+    assertFalse(address.hasKey("state"))
+  }
 }

package/ios/AddressSheet/AddressSheetUtils.swift

@@ -79,6 +79,29 @@ class AddressSheetUtils {
         }
     }
 
+    internal class func buildConfiguration(
+        appearance: NSDictionary?,
+        defaultValues: NSDictionary?,
+        additionalFields: NSDictionary?,
+        allowedCountries: [String],
+        autocompleteCountries: [String],
+        buttonTitle: String?,
+        sheetTitle: String?
+    ) throws -> AddressViewController.Configuration {
+        let appearanceConfiguration = try PaymentSheetAppearance.buildAppearanceFromParams(userParams: appearance)
+
+        var config = AddressViewController.Configuration(
+            defaultValues: buildDefaultValues(params: defaultValues),
+            additionalFields: buildAdditionalFieldsConfiguration(params: additionalFields),
+            allowedCountries: allowedCountries,
+            appearance: appearanceConfiguration,
+            buttonTitle: buttonTitle,
+            title: sheetTitle
+        )
+        config.autocompleteCountries = autocompleteCountries
+        return config
+    }
+
     internal class func buildResult(address: AddressViewController.AddressDetails) -> [AnyHashable: Any] {
         return [
             "result": [

package/ios/AddressSheet/AddressSheetView.swift

@@ -60,7 +60,15 @@ public class AddressSheetView: UIView {
         }
         var config: AddressViewController.Configuration
         do {
-            config = try buildAddressSheetConfiguration()
+            config = try AddressSheetUtils.buildConfiguration(
+                appearance: appearance,
+                defaultValues: defaultValues,
+                additionalFields: additionalFields,
+                allowedCountries: allowedCountries,
+                autocompleteCountries: autocompleteCountries,
+                buttonTitle: primaryButtonTitle,
+                sheetTitle: sheetTitle
+            )
         } catch {
             onErrorAction!(
                 Errors.createError(ErrorType.Failed, error.localizedDescription) as? [AnyHashable: Any]
@@ -80,19 +88,6 @@ public class AddressSheetView: UIView {
         vc.present(navigationController, animated: true)
     }
 
-    private func buildAddressSheetConfiguration() throws -> AddressViewController.Configuration {
-        let appearanceConfiguration = try PaymentSheetAppearance.buildAppearanceFromParams(userParams: appearance)
-
-        return AddressViewController.Configuration(
-            defaultValues: AddressSheetUtils.buildDefaultValues(params: defaultValues),
-            additionalFields: AddressSheetUtils.buildAdditionalFieldsConfiguration(params: additionalFields),
-            allowedCountries: allowedCountries,
-            appearance: appearanceConfiguration,
-            buttonTitle: primaryButtonTitle,
-            title: sheetTitle
-        )
-    }
-
     private func getModalPresentationStyle() -> UIModalPresentationStyle {
         switch presentationStyle {
         case "fullscreen":

package/ios/Mappers.swift

@@ -295,8 +295,8 @@ class Mappers {
         case STPPaymentMethodType.EPS: return "Eps"
         case STPPaymentMethodType.bancontact: return "Bancontact"
         case STPPaymentMethodType.billie: return "Billie"
+        case STPPaymentMethodType.multibanco: return "Multibanco"
         case STPPaymentMethodType.OXXO: return "Oxxo"
-        case STPPaymentMethodType.UPI: return "Upi"
         case STPPaymentMethodType.afterpayClearpay: return "AfterpayClearpay"
         case STPPaymentMethodType.klarna: return "Klarna"
         case STPPaymentMethodType.USBankAccount: return "USBankAccount"
@@ -327,8 +327,8 @@ class Mappers {
             case "Eps": return STPPaymentMethodType.EPS
             case "Bancontact": return STPPaymentMethodType.bancontact
             case "Billie": return STPPaymentMethodType.billie
+            case "Multibanco": return STPPaymentMethodType.multibanco
             case "Oxxo": return STPPaymentMethodType.OXXO
-            case "Upi": return STPPaymentMethodType.UPI
             case "AfterpayClearpay": return STPPaymentMethodType.afterpayClearpay
             case "Klarna": return STPPaymentMethodType.klarna
             case "WeChatPay": return STPPaymentMethodType.weChatPay
@@ -475,6 +475,14 @@ class Mappers {
                     "type": "konbiniVoucher",
                     "voucherURL": it.konbiniDisplayDetails?.hostedVoucherURL.absoluteString ?? NSNull(),
                 ]
+            case .multibancoDisplayDetails:
+                return [
+                    "type": "multibanco",
+                    "entity": it.multibancoDisplayDetails?.entity ?? NSNull(),
+                    "reference": it.multibancoDisplayDetails?.reference ?? NSNull(),
+                    "expiresAt": it.multibancoDisplayDetails?.expiresAt.timeIntervalSince1970 ?? NSNull(),
+                    "voucherURL": it.multibancoDisplayDetails?.hostedVoucherURL.absoluteString ?? NSNull(),
+                ]
             default: // .useStripeSDK, .BLIKAuthorize, .unknown
                 return nil
             }
@@ -691,9 +699,6 @@ class Mappers {
             "SepaDebit": sepaDebit,
             "BacsDebit": bacsDebit,
             "AuBecsDebit": auBECSDebit,
-            "Upi": [
-                "vpa": paymentMethod.upi?.vpa
-            ],
             "USBankAccount": USBankAccount,
         ]
         return method
@@ -1267,6 +1272,70 @@ class Mappers {
         )
     }
 
+    class func mapFromKycInfo(_ kycInfo: KycInfo) -> [String: Any] {
+        var result: [String: Any] = [:]
+
+        if let firstName = kycInfo.firstName {
+            result["firstName"] = firstName
+        }
+
+        if let lastName = kycInfo.lastName {
+            result["lastName"] = lastName
+        }
+
+        if let idNumber = kycInfo.idNumber {
+            result["idNumber"] = idNumber
+        }
+
+        if let address = kycInfo.address {
+            result["address"] = mapFromKycAddress(address)
+        }
+
+        if let dateOfBirth = kycInfo.dateOfBirth {
+            result["dateOfBirth"] = mapFromDateOfBirth(dateOfBirth)
+        }
+
+        return result
+    }
+
+    class func mapFromKycAddress(_ address: Address) -> [String: Any] {
+        var result: [String: Any] = [:]
+
+        if let city = address.city {
+            result["city"] = city
+        }
+
+        if let country = address.country {
+            result["country"] = country
+        }
+
+        if let line1 = address.line1 {
+            result["line1"] = line1
+        }
+
+        if let line2 = address.line2 {
+            result["line2"] = line2
+        }
+
+        if let postalCode = address.postalCode {
+            result["postalCode"] = postalCode
+        }
+
+        if let state = address.state {
+            result["state"] = state
+        }
+
+        return result
+    }
+
+    class func mapFromDateOfBirth(_ dateOfBirth: KycInfo.DateOfBirth) -> [String: Int] {
+        [
+            "day": dateOfBirth.day,
+            "month": dateOfBirth.month,
+            "year": dateOfBirth.year,
+        ]
+    }
+
     private class func mapOptionalKycAddress(_ value: Any?) throws -> Address? {
         guard let value else {
             return nil

package/ios/PaymentMethodFactory.swift

@@ -37,6 +37,8 @@ class PaymentMethodFactory {
                 return try createBancontactPaymentMethodParams()
             case STPPaymentMethodType.billie:
                 return try createBilliePaymentMethodParams()
+            case STPPaymentMethodType.multibanco:
+                return try createMultibancoPaymentMethodParams()
             case STPPaymentMethodType.SEPADebit:
                 return try createSepaPaymentMethodParams()
             case STPPaymentMethodType.EPS:
@@ -90,6 +92,8 @@ class PaymentMethodFactory {
                 return nil
             case STPPaymentMethodType.billie:
                 return nil
+            case STPPaymentMethodType.multibanco:
+                return nil
             case STPPaymentMethodType.SEPADebit:
                 return nil
             case STPPaymentMethodType.OXXO:
@@ -297,6 +301,18 @@ class PaymentMethodFactory {
         return STPPaymentMethodParams(oxxo: params, billingDetails: billingDetails, metadata: metadata)
     }
 
+    private func createMultibancoPaymentMethodParams() throws -> STPPaymentMethodParams {
+        let params = STPPaymentMethodMultibancoParams()
+
+        guard let billingDetails = billingDetailsParams,
+              let email = billingDetails.email,
+              !email.isEmpty else {
+            throw PaymentMethodError.multibancoPaymentMissingParams
+        }
+
+        return STPPaymentMethodParams(multibanco: params, billingDetails: billingDetails, metadata: metadata)
+    }
+
     private func createEPSPaymentMethodParams() throws -> STPPaymentMethodParams {
         let params = STPPaymentMethodEPSParams()
 
@@ -406,6 +422,7 @@ enum PaymentMethodError: Error {
     case billiePaymentMissingParams
     case sepaPaymentMissingParams
     case p24PaymentMissingParams
+    case multibancoPaymentMissingParams
     case afterpayClearpayPaymentMissingParams
     // Klarna no longer requires email and country in billing details
     case weChatPayPaymentMissingParams
@@ -429,6 +446,8 @@ extension PaymentMethodError: LocalizedError {
             return NSLocalizedString("Billie requires that you provide the following billing details: email, country", comment: "Create payment error")
         case .sepaPaymentMissingParams:
             return NSLocalizedString("You must provide billing details and IBAN", comment: "Create payment error")
+        case .multibancoPaymentMissingParams:
+            return NSLocalizedString("Multibanco requires that you provide the following billing details: email", comment: "Create payment error")
         case .epsPaymentMissingParams:
             return NSLocalizedString("You must provide billing details", comment: "Create payment error")
         case .afterpayClearpayPaymentMissingParams:

package/ios/PaymentMethodMessagingElementConfig.swift

@@ -29,10 +29,13 @@ internal class PaymentMethodMessagingElementConfig {
 
         // Parse font
         if let fontParams = params["font"] as? NSDictionary {
-            let scale = fontParams["scale"] as? CGFloat ?? 1
-            if let fontFamily = fontParams["family"] as? String,
-               let customFont = UIFont(name: fontFamily, size: UIFont.systemFontSize * scale) {
+            let size = fontParams["size"] as? CGFloat
+            let family = fontParams["family"] as? String
+
+            if let family = family, let customFont = UIFont(name: family, size: size ?? UIFont.systemFontSize) {
                 appearance.font = customFont
+            } else if let size = size {
+                appearance.font = UIFont.systemFont(ofSize: size)
             }
         }
 

package/ios/PaymentMethodMessagingElementView.swift

@@ -21,6 +21,9 @@ public class PaymentMethodMessagingElementContainerView: UIView, UIGestureRecogn
     private var appearanceConfig: PaymentMethodMessagingElement.Appearance?
     private var lastConfig: NSDictionary?
 
+    // Used to track height updates
+    private var previousHeight: CGFloat?
+
     @objc var appearance: NSDictionary? {
         didSet {
             if let appearance = appearance {
@@ -67,6 +70,19 @@ public class PaymentMethodMessagingElementContainerView: UIView, UIGestureRecogn
         }
     }
 
+    public override func layoutSubviews() {
+        super.layoutSubviews()
+
+        // Calculate our natural height
+        let desiredHeight = systemLayoutSizeFitting(CGSize(width: frame.width, height: UIView.layoutFittingCompressedSize.height)).height
+
+        // Notify if changed
+        if desiredHeight != previousHeight {
+            StripeSdkImpl.shared.emitter?.emitPaymentMethodMessagingElementDidUpdateHeight(["height": desiredHeight])
+            self.previousHeight = desiredHeight
+        }
+    }
+
     private func attachPaymentElementIfAvailable() {
         removePaymentMethodMessagingElement()
         guard let messagingElement = messagingInstance else {
@@ -76,7 +92,10 @@ public class PaymentMethodMessagingElementContainerView: UIView, UIGestureRecogn
         let messagingElementView = messagingElement.view
         addSubview(messagingElementView)
         messagingElementView.translatesAutoresizingMaskIntoConstraints = false
+        let height = self.messagingInstance?.view.systemLayoutSizeFitting(CGSize(width: self.messagingInstance?.view.bounds.width ?? 0, height: UIView.layoutFittingCompressedSize.height)).height
+        self.previousHeight = height ?? 0
 
+        StripeSdkImpl.shared.emitter?.emitPaymentMethodMessagingElementDidUpdateHeight(["height": height ?? 0])
         NSLayoutConstraint.activate([
             messagingElementView.topAnchor.constraint(equalTo: topAnchor),
             messagingElementView.leadingAnchor.constraint(equalTo: leadingAnchor),

package/ios/StripeSdk-Bridging-Header.h

@@ -6,3 +6,4 @@
 #import <React/RCTUIManager.h>
 #import <PassKit/PassKit.h>
 #import <React/RCTEventEmitter.h>
+#import <React/RCTVersion.h>  

package/ios/StripeSdk.mm

@@ -92,7 +92,7 @@ RCT_EXPORT_METHOD(configureOrderTracking:(nonnull NSString *)orderTypeIdentifier
 }
 
 RCT_EXPORT_METHOD(confirmPayment:(nonnull NSString *)paymentIntentClientSecret
-                          params:(nonnull NSDictionary *)params
+                          params:(nullable NSDictionary *)params
                          options:(nonnull NSDictionary *)options
                          resolve:(nonnull RCTPromiseResolveBlock)resolve
                           reject:(nonnull RCTPromiseRejectBlock)reject)