Filter SPMs lacking automatic-tax-required billing fields on Checkout Session (MOBILESDK-4697)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Committed-By-Agent: claude

Author: cttsai-stripe

paymentsheet/src/main/java/com/stripe/android/paymentsheet/state/CustomerState.kt

@@ -70,6 +70,7 @@ internal class CreateCustomerState @Inject constructor(
                         cardFundingFilter = metadata.cardFundingFilter,
                         remoteDefaultPaymentMethodId = state.defaultPaymentMethodId,
                         localSavedSelection = savedSelection,
+                        requiresBillingAddressForAutomaticTax = metadata.requiresBillingAddressForAutomaticTax,
                     )
                 )
             )

paymentsheet/src/main/java/com/stripe/android/paymentsheet/state/PaymentMethodFilter.kt

@@ -2,6 +2,7 @@ package com.stripe.android.paymentsheet.state
 
 import com.stripe.android.CardBrandFilter
 import com.stripe.android.CardFundingFilter
+import com.stripe.android.common.validation.hasSufficientBillingDetailsForAutomaticTax
 import com.stripe.android.common.validation.isSupportedWithBillingConfig
 import com.stripe.android.lpmfoundations.paymentmethod.CustomerMetadata
 import com.stripe.android.lpmfoundations.paymentmethod.IS_PAYMENT_METHOD_SET_AS_DEFAULT_ENABLED_DEFAULT_VALUE
@@ -26,6 +27,7 @@ internal interface PaymentMethodFilter {
         val cardBrandFilter: CardBrandFilter,
         val cardFundingFilter: CardFundingFilter,
         val localSavedSelection: Deferred<SavedSelection>,
+        val requiresBillingAddressForAutomaticTax: Boolean,
     )
 }
 
@@ -45,7 +47,11 @@ internal class DefaultPaymentMethodFilter @Inject constructor() : PaymentMethodF
             } ?: true
             params.cardBrandFilter.isAccepted(paymentMethod) &&
                 fundingAccepted &&
-                paymentMethod.isSupportedWithBillingConfig(params.billingDetailsCollectionConfiguration)
+                paymentMethod.isSupportedWithBillingConfig(params.billingDetailsCollectionConfiguration) &&
+                (
+                    !params.requiresBillingAddressForAutomaticTax ||
+                        paymentMethod.hasSufficientBillingDetailsForAutomaticTax()
+                    )
         }
     }
 }

paymentsheet/src/test/java/com/stripe/android/paymentsheet/state/DefaultPaymentMethodFilterTest.kt

@@ -190,13 +190,94 @@ class DefaultPaymentMethodFilterTest {
         assertThat(observedElements).containsExactlyElementsIn(expectedElements).inOrder()
     }
 
+    private fun usCard(id: String, state: String?): PaymentMethod = PaymentMethodFactory.card(id = id).update(
+        last4 = "1000",
+        addCbcNetworks = false,
+        brand = CardBrand.Visa,
+    ).copy(
+        billingDetails = PaymentMethod.BillingDetails(
+            address = Address(
+                line1 = "123 Main St",
+                city = "San Francisco",
+                state = state,
+                postalCode = "94111",
+                country = "US",
+            ),
+        ),
+    )
+
+    @Test
+    fun `Drops SPM lacking automatic-tax-required fields when automatic tax requires a billing address`() = runTest {
+        val complete = usCard(id = "pm_complete", state = "CA")
+        val incomplete = usCard(id = "pm_incomplete", state = null)
+
+        val observed = filter(
+            paymentMethods = listOf(complete, incomplete),
+            requiresBillingAddressForAutomaticTax = true,
+        )
+
+        assertThat(observed).containsExactly(complete)
+    }
+
+    @Test
+    fun `Does not filter by automatic-tax fields when automatic tax does not require a billing address`() = runTest {
+        val complete = usCard(id = "pm_complete", state = "CA")
+        val incomplete = usCard(id = "pm_incomplete", state = null)
+
+        val observed = filter(
+            paymentMethods = listOf(complete, incomplete),
+            requiresBillingAddressForAutomaticTax = false,
+        )
+
+        assertThat(observed).containsExactly(complete, incomplete)
+    }
+
+    @Test
+    fun `Keeps a country-only-sufficient SPM when automatic tax requires a billing address`() = runTest {
+        // FR has no additional automatic-tax fields, so country alone is sufficient. Proves the
+        // clause does not over-drop valid cards.
+        val frCard = PaymentMethodFactory.card(id = "pm_fr").update(
+            last4 = "1000",
+            addCbcNetworks = false,
+            brand = CardBrand.Visa,
+        ).copy(
+            billingDetails = PaymentMethod.BillingDetails(
+                address = Address(country = "FR"),
+            ),
+        )
+
+        val observed = filter(
+            paymentMethods = listOf(frCard),
+            requiresBillingAddressForAutomaticTax = true,
+        )
+
+        assertThat(observed).containsExactly(frCard)
+    }
+
+    @Test
+    fun `Drops SPM with null billing address when automatic tax requires a billing address`() = runTest {
+        val noAddress = PaymentMethodFactory.card(id = "pm_no_addr").update(
+            last4 = "1000",
+            addCbcNetworks = false,
+            brand = CardBrand.Visa,
+        ).copy(billingDetails = PaymentMethod.BillingDetails(address = null))
+
+        val observed = filter(
+            paymentMethods = listOf(noAddress),
+            requiresBillingAddressForAutomaticTax = true,
+        )
+
+        assertThat(observed).isEmpty()
+    }
+
     private suspend fun filter(
         paymentMethods: List<PaymentMethod>,
         billingDetailsCollectionConfiguration: PaymentSheet.BillingDetailsCollectionConfiguration =
             PaymentSheet.BillingDetailsCollectionConfiguration(),
         isPaymentMethodSetAsDefaultEnabled: Boolean = false,
         remoteDefaultPaymentMethodId: String? = null,
         localSavedSelection: SavedSelection = SavedSelection.None,
+        requiresBillingAddressForAutomaticTax: Boolean = false,
         cardBrandFilter: PaymentSheetCardBrandFilter = PaymentSheetCardBrandFilter(
             cardBrandAcceptance = PaymentSheet.CardBrandAcceptance.all(),
         ),
@@ -222,6 +303,7 @@ class DefaultPaymentMethodFilterTest {
                 localSavedSelection = CompletableDeferred(localSavedSelection),
                 cardBrandFilter = cardBrandFilter,
                 cardFundingFilter = cardFundingFilter,
+                requiresBillingAddressForAutomaticTax = requiresBillingAddressForAutomaticTax,
             )
         )
     }