Merge branch 'master' into porter/mandate-text

Author: porter-stripe

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.50.3 - 2025-08-07
+
+**Fixed**
+- Fixed Android crash when using `RowSelectionBehavior.ImmediateAction` with `FormSheetAction.Confirm` in EmbeddedPaymentElement.
+
 ## 0.50.2 - 2025-08-06
 
 **Changes**

android/src/androidTest/java/com/reactnativestripesdk/PaymentSheetFragmentTest.kt

@@ -44,16 +44,8 @@ class PaymentSheetFragmentTest {
   }
 
   @Test
-  fun buildGooglePayConfig_defaultsToCorrectValues() {
+  fun buildGooglePayConfig_returnsNullForEmptyBundle() {
     val config = PaymentSheetFragment.buildGooglePayConfig(Bundle.EMPTY)
-    Assert.assertEquals(
-      config,
-      PaymentSheet.GooglePayConfiguration(
-        environment = PaymentSheet.GooglePayConfiguration.Environment.Production,
-        countryCode = "",
-        currencyCode = "",
-        buttonType = PaymentSheet.GooglePayConfiguration.ButtonType.Pay,
-      ),
-    )
+    Assert.assertNull(config)
   }
 }

android/src/main/java/com/reactnativestripesdk/PaymentSheetFragment.kt

@@ -550,7 +550,7 @@ class PaymentSheetFragment :
       )
 
     internal fun buildGooglePayConfig(params: Bundle?): PaymentSheet.GooglePayConfiguration? {
-      if (params == null) {
+      if (params == null || params.isEmpty) {
         return null
       }
 

jest/mock.js

@@ -1,5 +1,7 @@
 /* eslint-disable no-undef */
 
+const React = require('react');
+
 const mockFunctions = {
   initStripe: jest.fn(async () => ({})),
   createPaymentMethod: jest.fn(async () => ({
@@ -172,11 +174,191 @@ const mockHooks = {
       ...mockFunctions.collectFinancialConnectionsAccounts(),
     })),
   })),
+  useEmbeddedPaymentElement: jest.fn((intentConfig, configuration) => ({
+    embeddedPaymentElementView: React.createElement('View', {
+      testID: 'embedded-payment-element-view',
+      style: { width: '100%', height: 200 },
+    }),
+    paymentOption: {
+      label: 'Card ending in 4242',
+      paymentMethodType: 'card',
+      billingDetails: {
+        name: 'John Doe',
+        email: 'john.doe@example.com',
+        address: {
+          country: 'US',
+          postalCode: '12345',
+          line1: '123 Main St',
+          city: 'Anytown',
+          state: 'CA',
+        },
+      },
+    },
+    confirm: jest.fn(async () => ({
+      status: 'completed',
+    })),
+    update: jest.fn(async () => ({ status: 'completed', error: null })),
+    clearPaymentOption: jest.fn(() => {}),
+    loadingError: null,
+  })),
+};
+
+// Stripe constants and enums for testing - matches runtime exports
+const StripeConstants = {
+  // PlatformPay enums
+  PlatformPay: {
+    PaymentType: {
+      Immediate: 'Immediate',
+      Deferred: 'Deferred',
+      Recurring: 'Recurring',
+    },
+    BillingAddressFormat: {
+      Full: 'FULL',
+      Min: 'MIN',
+    },
+    ContactField: {
+      EmailAddress: 'emailAddress',
+      Name: 'name',
+      PhoneNumber: 'phoneNumber',
+      PhoneticName: 'phoneticName',
+      PostalAddress: 'postalAddress',
+    },
+  },
+
+  // Error enums
+  PlatformPayError: {
+    Canceled: 'Canceled',
+    Failed: 'Failed',
+    Unknown: 'Unknown',
+  },
+
+  // PaymentSheet enums
+  PaymentSheet: {
+    CollectionMode: {
+      AUTOMATIC: 'automatic',
+      NEVER: 'never',
+      ALWAYS: 'always',
+    },
+    AddressCollectionMode: {
+      AUTOMATIC: 'automatic',
+      NEVER: 'never',
+      FULL: 'full',
+    },
+    CardBrandCategory: {
+      Visa: 'visa',
+      Mastercard: 'mastercard',
+      Amex: 'amex',
+      Discover: 'discover',
+    },
+    CardBrandAcceptanceFilter: {
+      All: 'all',
+      Allowed: 'allowed',
+      Disallowed: 'disallowed',
+    },
+    CustomPaymentMethodResultStatus: {
+      Completed: 'completed',
+      Canceled: 'canceled',
+      Failed: 'failed',
+    },
+  },
+};
+
+// EmbeddedPaymentElement constants and enums for testing
+const EmbeddedPaymentElementMocks = {
+  // Result status constants (from EmbeddedPaymentElementResult)
+  EmbeddedPaymentElementStatus: {
+    COMPLETED: 'completed',
+    CANCELED: 'canceled',
+    FAILED: 'failed',
+  },
+
+  // Form sheet action types (from EmbeddedFormSheetAction)
+  EmbeddedFormSheetActionType: {
+    CONFIRM: 'confirm',
+    CONTINUE: 'continue',
+  },
+
+  // Row selection behavior types (from EmbeddedRowSelectionBehavior)
+  EmbeddedRowSelectionBehaviorType: {
+    DEFAULT: 'default',
+    IMMEDIATE_ACTION: 'immediateAction',
+  },
+
+  // Row display styles for Embedded Payment Element (from PaymentSheet.RowStyle)
+  RowStyle: {
+    FlatWithRadio: 'flatWithRadio',
+    FloatingButton: 'floatingButton',
+    FlatWithCheckmark: 'flatWithCheckmark',
+    FlatWithDisclosure: 'flatWithDisclosure',
+  },
+
+  // Mock payment method types commonly used with EmbeddedPaymentElement
+  PaymentMethodTypes: {
+    CARD: 'card',
+    APPLE_PAY: 'apple_pay',
+    GOOGLE_PAY: 'google_pay',
+    LINK: 'link',
+    KLARNA: 'klarna',
+    AFTERPAY: 'afterpay_clearpay',
+    US_BANK_ACCOUNT: 'us_bank_account',
+    SEPA_DEBIT: 'sepa_debit',
+  },
+
+  // Mock test helpers for different payment option states
+  mockPaymentOptions: {
+    card: {
+      label: 'Card ending in 4242',
+      paymentMethodType: 'card',
+      billingDetails: {
+        name: 'John Doe',
+        email: 'john.doe@example.com',
+        address: {
+          country: 'US',
+          postalCode: '12345',
+          line1: '123 Main St',
+          city: 'Anytown',
+          state: 'CA',
+        },
+      },
+    },
+    applePay: {
+      label: 'Apple Pay',
+      paymentMethodType: 'apple_pay',
+      billingDetails: {
+        name: 'John Doe',
+      },
+    },
+    googlePay: {
+      label: 'Google Pay',
+      paymentMethodType: 'google_pay',
+      billingDetails: {
+        name: 'John Doe',
+      },
+    },
+    link: {
+      label: 'Link',
+      paymentMethodType: 'link',
+      billingDetails: {
+        email: 'john.doe@example.com',
+      },
+    },
+    null: null,
+  },
+
+  // Mock results for different scenarios
+  mockResults: {
+    completed: { status: 'completed' },
+    canceled: { status: 'canceled' },
+    failed: { status: 'failed', error: new Error('Payment failed') },
+    networkError: { status: 'failed', error: new Error('Network error') },
+  },
 };
 
 module.exports = {
   ...mockFunctions,
   ...mockHooks,
+  ...StripeConstants,
+  ...EmbeddedPaymentElementMocks,
   StripeContainer: () => 'StripeContainer',
   StripeProvider: () => 'StripeProvider',
   CardField: () => 'CardField',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stripe/stripe-react-native",
-  "version": "0.50.2",
+  "version": "0.50.3",
   "author": "Stripe",
   "description": "Stripe SDK for React Native",
   "main": "lib/commonjs/index",