@stripe/stripe-react-native 0.65.1 → 0.66.0

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

@@ -4,12 +4,17 @@ package com.reactnativestripesdk.mappers
 
 import android.annotation.SuppressLint
 import androidx.compose.ui.graphics.toArgb
+import com.reactnativestripesdk.ComplianceIdentifierFieldException
+import com.reactnativestripesdk.InvalidIdentifiersArrayException
 import com.reactnativestripesdk.mapAppearance
 import com.reactnativestripesdk.mapConfig
 import com.reactnativestripesdk.mapFromKycInfo
 import com.reactnativestripesdk.mapGooglePayConfig
 import com.reactnativestripesdk.mapPaymentDetailsType
+import com.reactnativestripesdk.mapToComplianceIdentifiers
+import com.reactnativestripesdk.utils.readableArrayOf
 import com.reactnativestripesdk.utils.readableMapOf
+import com.stripe.android.core.model.CountryCode
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.PaymentMethodDisplayData
@@ -22,12 +27,14 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
+import org.junit.Assert.assertThrows
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
 @SuppressLint("RestrictedApi")
+@Suppress("LargeClass")
 @RunWith(RobolectricTestRunner::class)
 class OnrampMappersTest {
   @Test
@@ -460,6 +467,13 @@ class OnrampMappersTest {
             state = "CA",
           ),
         dateOfBirth = DateOfBirth(day = 15, month = 6, year = 1990),
+        birthCountry = CountryCode.create("FR"),
+        birthCity = "Paris",
+        nationalities =
+          listOf(
+            CountryCode.create("FR"),
+            CountryCode.create("DE"),
+          ),
       )
     val result = mapFromKycInfo(kycInfo)
 
@@ -481,6 +495,14 @@ class OnrampMappersTest {
     assertEquals(15, dob!!.getInt("day"))
     assertEquals(6, dob.getInt("month"))
     assertEquals(1990, dob.getInt("year"))
+
+    assertEquals("FR", result.getString("birthCountry"))
+    assertEquals("Paris", result.getString("birthCity"))
+
+    val nationalities = result.getArray("nationalities")
+    assertNotNull(nationalities)
+    assertEquals("FR", nationalities!!.getString(0))
+    assertEquals("DE", nationalities.getString(1))
   }
 
   @Test
@@ -492,6 +514,9 @@ class OnrampMappersTest {
         idNumber = null,
         address = null,
         dateOfBirth = null,
+        birthCountry = null,
+        birthCity = null,
+        nationalities = null,
       )
     val result = mapFromKycInfo(kycInfo)
 
@@ -500,6 +525,9 @@ class OnrampMappersTest {
     assertFalse(result.hasKey("idNumber"))
     assertFalse(result.hasKey("address"))
     assertFalse(result.hasKey("dateOfBirth"))
+    assertFalse(result.hasKey("birthCountry"))
+    assertFalse(result.hasKey("birthCity"))
+    assertFalse(result.hasKey("nationalities"))
   }
 
   @Test
@@ -511,6 +539,9 @@ class OnrampMappersTest {
         idNumber = null,
         address = null,
         dateOfBirth = DateOfBirth(day = 1, month = 1, year = 2000),
+        birthCountry = CountryCode.create("IT"),
+        birthCity = "Rome",
+        nationalities = listOf(CountryCode.create("IT")),
       )
     val result = mapFromKycInfo(kycInfo)
 
@@ -524,6 +555,9 @@ class OnrampMappersTest {
     assertEquals(1, dob!!.getInt("day"))
     assertEquals(1, dob.getInt("month"))
     assertEquals(2000, dob.getInt("year"))
+    assertEquals("IT", result.getString("birthCountry"))
+    assertEquals("Rome", result.getString("birthCity"))
+    assertEquals("IT", result.getArray("nationalities")!!.getString(0))
   }
 
   @Test
@@ -543,6 +577,9 @@ class OnrampMappersTest {
             state = null,
           ),
         dateOfBirth = null,
+        birthCountry = null,
+        birthCity = null,
+        nationalities = null,
       )
     val result = mapFromKycInfo(kycInfo)
 
@@ -555,4 +592,74 @@ class OnrampMappersTest {
     assertFalse(address.hasKey("postalCode"))
     assertFalse(address.hasKey("state"))
   }
+
+  @Test
+  fun mapToComplianceIdentifiers_ValidIdentifiers_ReturnsIdentifiers() {
+    val identifiers =
+      readableArrayOf(
+        readableMapOf(
+          "type" to " AT_STN ",
+          "value" to " 123456789 ",
+        ),
+        readableMapOf(
+          "type" to "DE_STN",
+          "value" to "987654321",
+        ),
+      )
+
+    val result = mapToComplianceIdentifiers(identifiers)
+
+    assertEquals(2, result.size)
+  }
+
+  @Test
+  fun mapToComplianceIdentifiers_BlankType_ThrowsFieldException() {
+    val identifiers =
+      readableArrayOf(
+        readableMapOf(
+          "type" to "   ",
+          "value" to "123456789",
+        ),
+      )
+
+    val error =
+      assertThrows(ComplianceIdentifierFieldException::class.java) {
+        mapToComplianceIdentifiers(identifiers)
+      }
+
+    assertEquals("Invalid format for field: type", error.message)
+  }
+
+  @Test
+  fun mapToComplianceIdentifiers_BlankValue_ThrowsFieldException() {
+    val identifiers =
+      readableArrayOf(
+        readableMapOf(
+          "type" to "AT_STN",
+          "value" to "   ",
+        ),
+      )
+
+    val error =
+      assertThrows(ComplianceIdentifierFieldException::class.java) {
+        mapToComplianceIdentifiers(identifiers)
+      }
+
+    assertEquals("Invalid format for field: value", error.message)
+  }
+
+  @Test
+  fun mapToComplianceIdentifiers_NonMapEntry_ThrowsInvalidArrayException() {
+    val identifiers = readableArrayOf("AT_STN")
+
+    val error =
+      assertThrows(InvalidIdentifiersArrayException::class.java) {
+        mapToComplianceIdentifiers(identifiers)
+      }
+
+    assertEquals(
+      "Unexpected format of identifiers array. Expected dictionaries with String keys.",
+      error.message,
+    )
+  }
 }

package/android/src/test/java/com/reactnativestripesdk/utils/CheckoutMappersTest.kt

@@ -4,6 +4,7 @@ import com.stripe.android.paymentelement.CheckoutSessionPreview
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -12,7 +13,7 @@ import org.robolectric.RobolectricTestRunner
 @OptIn(CheckoutSessionPreview::class)
 class CheckoutMappersTest {
   @Test
-  fun mapFromCheckoutState_mapsLoadedSessionAndCurrentAndroidPlaceholders() {
+  fun mapFromCheckoutState_mapsLoadedSession() {
     val mapped =
       mapFromCheckoutState(
         isLoading = false,
@@ -24,27 +25,27 @@ class CheckoutMappersTest {
     val session = mapped.getMap("session")
     assertNotNull(session)
     assertEquals("cs_test_123", session!!.getString("id"))
-    assertEquals("unknown", session.getString("status"))
-    assertEquals("unknown", session.getString("paymentStatus"))
     assertFalse(session.getBoolean("livemode"))
     assertEquals("usd", session.getString("currency"))
-    assertFalse(session.hasKey("customerId"))
-    assertFalse(session.hasKey("customerEmail"))
-    assertFalse(session.hasKey("billingAddress"))
-    assertFalse(session.hasKey("shippingAddress"))
-
-    val totals = session.getMap("totals")
-    assertNotNull(totals)
-    assertEquals(5000.0, totals!!.getDouble("subtotal"), 0.0)
-    assertEquals(4044.0, totals.getDouble("total"), 0.0)
-    assertEquals(4044.0, totals.getDouble("due"), 0.0)
-    assertEquals(0.0, totals.getDouble("discount"), 0.0)
-    assertEquals(500.0, totals.getDouble("shipping"), 0.0)
-    assertEquals(294.0, totals.getDouble("tax"), 0.0)
-
-    val discounts = session.getArray("discounts")
-    assertNotNull(discounts)
-    assertEquals(0, discounts!!.size())
+
+    val status = session.getMap("status")
+    assertNotNull(status)
+    assertEquals("open", status!!.getString("type"))
+
+    val tax = session.getMap("tax")
+    assertNotNull(tax)
+    assertEquals("ready", tax!!.getString("status"))
+
+    val total = session.getMap("total")
+    assertNotNull(total)
+    val subtotal = total!!.getMap("subtotal")
+    assertNotNull(subtotal)
+    assertEquals(5000.0, subtotal!!.getDouble("minorUnitsAmount"), 0.0)
+    assertEquals("", subtotal.getString("amount"))
+
+    val grandTotal = total.getMap("total")
+    assertNotNull(grandTotal)
+    assertEquals(4044.0, grandTotal!!.getDouble("minorUnitsAmount"), 0.0)
 
     val lineItems = session.getArray("lineItems")
     assertNotNull(lineItems)
@@ -52,19 +53,27 @@ class CheckoutMappersTest {
     assertEquals("li_item1", lineItems.getMap(0)?.getString("id"))
     assertEquals("Llama Figure", lineItems.getMap(0)?.getString("name"))
     assertEquals(2, lineItems.getMap(0)?.getInt("quantity"))
-    assertEquals(0.0, lineItems.getMap(0)?.getDouble("unitAmount") ?: -1.0, 0.0)
-    assertEquals("usd", lineItems.getMap(0)?.getString("currency"))
-    assertEquals(2499.0, lineItems.getMap(1)?.getDouble("unitAmount") ?: -1.0, 0.0)
+    assertFalse(lineItems.getMap(0)!!.hasKey("unitAmount"))
+
+    val item2UnitAmount = lineItems.getMap(1)?.getMap("unitAmount")
+    assertNotNull(item2UnitAmount)
+    assertEquals(2499.0, item2UnitAmount!!.getDouble("minorUnitsAmount"), 0.0)
 
     val shippingOptions = session.getArray("shippingOptions")
     assertNotNull(shippingOptions)
     assertEquals(2, shippingOptions!!.size())
     assertEquals("shr_standard", shippingOptions.getMap(0)?.getString("id"))
-    assertEquals("Standard Shipping", shippingOptions.getMap(0)?.getString("displayName"))
-    assertEquals(500.0, shippingOptions.getMap(0)?.getDouble("amount") ?: -1.0, 0.0)
-    assertEquals("usd", shippingOptions.getMap(0)?.getString("currency"))
-    assertFalse(shippingOptions.getMap(0)?.hasKey("deliveryEstimate") ?: true)
-    assertEquals("1-2 business days", shippingOptions.getMap(1)?.getString("deliveryEstimate"))
+    val shippingAmount = shippingOptions.getMap(0)?.getMap("amount")
+    assertNotNull(shippingAmount)
+    assertEquals(500.0, shippingAmount!!.getDouble("minorUnitsAmount"), 0.0)
+
+    val discountAmounts = session.getArray("discountAmounts")
+    assertNotNull(discountAmounts)
+    assertEquals(0, discountAmounts!!.size())
+
+    val currencyOptions = session.getArray("currencyOptions")
+    assertNotNull(currencyOptions)
+    assertEquals(0, currencyOptions!!.size())
   }
 
   @Test
@@ -81,9 +90,9 @@ class CheckoutMappersTest {
     assertNotNull(session)
     assertEquals("cs_test_blank_currency", session!!.getString("id"))
     assertFalse(session.hasKey("currency"))
-    assertFalse(session.hasKey("totals"))
+    assertNull(session.getMap("total"))
     assertEquals(0, session.getArray("lineItems")!!.size())
     assertEquals(0, session.getArray("shippingOptions")!!.size())
-    assertEquals(0, session.getArray("discounts")!!.size())
+    assertEquals(0, session.getArray("discountAmounts")!!.size())
   }
 }

package/android/src/test/java/com/reactnativestripesdk/utils/CheckoutTestFixtures.java

@@ -25,7 +25,11 @@ public final class CheckoutTestFixtures {
 
     return new CheckoutSession(
         "cs_test_123",
+        CheckoutSession.Status.Open,
+        false,
         "usd",
+        null,
+        new CheckoutSession.Tax(CheckoutSession.Tax.Status.Ready),
         totals,
         Arrays.asList(
             new CheckoutSession.LineItem("li_item1", "Llama Figure", 2, null, 1998L, 1998L),
@@ -40,8 +44,12 @@ public final class CheckoutTestFixtures {
   public static CheckoutSession blankCurrencySession() {
     return new CheckoutSession(
         "cs_test_blank_currency",
+        CheckoutSession.Status.Open,
+        false,
         "",
         null,
+        new CheckoutSession.Tax(CheckoutSession.Tax.Status.Ready),
+        null,
         Collections.<CheckoutSession.LineItem>emptyList(),
         Collections.<CheckoutSession.ShippingRate>emptyList(),
         (CurrencySelectorOptions) null);

package/ios/CurrencySelectorElementManager.m

@@ -1,3 +1,10 @@
+//
+//  CurrencySelectorElementManager.m
+//  stripe-react-native
+//
+//  Created by Nick Porter on 5/7/26.
+//
+
 #import <Foundation/Foundation.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>

package/ios/CurrencySelectorElementView.swift

@@ -1,24 +1,159 @@
+//
+//  CurrencySelectorElementView.swift
+//  stripe-react-native
+//
+//  Created by Nick Porter on 5/7/26.
+//
+
+import Combine
 import Foundation
+@_spi(ReactNativeSDK) import StripePaymentSheet
 import UIKit
 
-/// Minimal stub so the JS-side `CurrencySelectorElement` codegen mapping
-/// resolves at app launch. The real implementation (hosting
-/// `Checkout.CurrencySelectorView`, height reporting, session observation)
-/// lives on the full-feature branch and will replace this once that lands.
+@objc(StripeCurrencySelectorElementManager)
+class StripeCurrencySelectorElementManager: RCTViewManager {
+    override static func requiresMainQueueSetup() -> Bool {
+        return true
+    }
+
+    override func view() -> UIView! {
+        return StripeCurrencySelectorElementContainerView(frame: .zero)
+    }
+}
+
 @objc(StripeCurrencySelectorElementContainerView)
 public class StripeCurrencySelectorElementContainerView: UIView {
-    @objc public var sessionKey: String?
 
-    @objc public var disabled: Bool = false
+    // MARK: - Bridge-exposed Props
+
+    @objc public var sessionKey: String? {
+        didSet {
+            guard sessionKey != oldValue else { return }
+            attachToSessionIfPossible()
+        }
+    }
 
+    @objc public var disabled: Bool = false {
+        didSet {
+            selectorView?.isEnabled = !disabled
+        }
+    }
+
+    /// Fired whenever the inner selector's intrinsic height changes so RN
+    /// can match it. Session-state changes flow through the central
+    /// `checkoutSessionDidChangeState` event on `StripeSdk` (see
+    /// `CheckoutStateBridge`), so this view does not need to push state.
     @objc public var onHeightChange: RCTDirectEventBlock?
 
-    public override init(frame: CGRect) {
+    // MARK: - Private Properties
+
+    private var selectorView: Checkout.CurrencySelectorView?
+    private var sessionCancellable: AnyCancellable?
+    private var lastReportedHeight: CGFloat = -1
+
+    // MARK: - Init
+
+    override public init(frame: CGRect) {
         super.init(frame: frame)
+        backgroundColor = .clear
+        clipsToBounds = true
     }
 
     @available(*, unavailable)
     required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+
+    // MARK: - Layout
+
+    public override func layoutSubviews() {
+        super.layoutSubviews()
+        reportHeightIfNeeded()
+    }
+
+    // MARK: - Setup
+
+    private func attachToSessionIfPossible() {
+        Task { @MainActor in
+            guard let key = self.sessionKey,
+                  let checkout = StripeSdkImpl.shared.checkoutInstances[key] else {
+                self.detach()
+                return
+            }
+
+            // Already showing a selector — leave it in place. Re-creating
+            // would interrupt the inner view's loading animation and reset
+            // its enabled state mid-API-call.
+            if self.selectorView != nil {
+                return
+            }
+
+            self.installSelectorView(for: checkout)
+            self.subscribeForLayoutUpdates(on: checkout)
+        }
+    }
+
+    /// We don't push state to JS here — `CheckoutStateBridge` already does
+    /// that for the whole session. This subscription only nudges Auto Layout
+    /// so the caption-text changes after a currency selection are reflected
+    /// in our reported height back to RN.
+    private func subscribeForLayoutUpdates(on checkout: Checkout) {
+        sessionCancellable = checkout.$state
+            .dropFirst()
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                guard let self else { return }
+                self.setNeedsLayout()
+                self.layoutIfNeeded()
+                self.reportHeightIfNeeded()
+            }
+    }
+
+    private func installSelectorView(for checkout: Checkout) {
+        let view = Checkout.CurrencySelectorView(checkout: checkout)
+        view.translatesAutoresizingMaskIntoConstraints = false
+        view.isEnabled = !disabled
+        addSubview(view)
+
+        NSLayoutConstraint.activate([
+            view.topAnchor.constraint(equalTo: topAnchor),
+            view.leadingAnchor.constraint(equalTo: leadingAnchor),
+            view.trailingAnchor.constraint(equalTo: trailingAnchor),
+            view.bottomAnchor.constraint(equalTo: bottomAnchor),
+        ])
+
+        selectorView = view
+
+        // Force an initial height report so RN can lay us out at zero
+        // when Adaptive Pricing is unavailable.
+        setNeedsLayout()
+        layoutIfNeeded()
+    }
+
+    private func detach() {
+        sessionCancellable?.cancel()
+        sessionCancellable = nil
+        selectorView?.removeFromSuperview()
+        selectorView = nil
+        lastReportedHeight = -1
+    }
+
+    // MARK: - Events
+
+    private func reportHeightIfNeeded() {
+        let desiredHeight: CGFloat
+        if let selectorView, !selectorView.isHidden {
+            desiredHeight = selectorView.systemLayoutSizeFitting(
+                CGSize(width: bounds.width, height: UIView.layoutFittingCompressedSize.height),
+                withHorizontalFittingPriority: .required,
+                verticalFittingPriority: .fittingSizeLevel
+            ).height
+        } else {
+            desiredHeight = 0
+        }
+
+        guard desiredHeight != lastReportedHeight else { return }
+        lastReportedHeight = desiredHeight
+        onHeightChange?(["height": desiredHeight])
+    }
 }

package/ios/EmbeddedPaymentElementView.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-@_spi(EmbeddedPaymentElementPrivateBeta) import StripePaymentSheet
+import StripePaymentSheet
 import UIKit
 
 @objc(EmbeddedPaymentElementView)