Show blocked brands as disabled in CBC drop down

payments-core/src/main/java/com/stripe/android/cards/CardAccountRangeService.kt

@@ -2,8 +2,6 @@ package com.stripe.android.cards
 
 import androidx.annotation.RestrictTo
 import androidx.annotation.VisibleForTesting
-import com.stripe.android.CardBrandFilter
-import com.stripe.android.DefaultCardBrandFilter
 import com.stripe.android.model.AccountRange
 import com.stripe.android.model.CardBrand
 import kotlinx.coroutines.CoroutineScope
@@ -22,8 +20,7 @@ class CardAccountRangeService(
     private val workContext: CoroutineContext,
     val staticCardAccountRanges: StaticCardAccountRanges,
     private val accountRangeResultListener: AccountRangeResultListener,
-    private val isCbcEligible: () -> Boolean,
-    private val cardBrandFilter: CardBrandFilter = DefaultCardBrandFilter
+    private val isCbcEligible: () -> Boolean
 ) {
 
     val isLoading: StateFlow<Boolean> = cardAccountRangeRepository.loading
@@ -104,7 +101,7 @@ class CardAccountRangeService(
     }
 
     fun updateAccountRangesResult(accountRanges: List<AccountRange>) {
-        this.accountRanges = accountRanges.filter { cardBrandFilter.isAccepted(it.brand) }
+        this.accountRanges = accountRanges
         accountRangeResultListener.onAccountRangesResult(this.accountRanges)
     }
 

payments-core/src/main/java/com/stripe/android/view/CardBrandChoice.kt

@@ -5,5 +5,6 @@ import com.stripe.android.uicore.elements.SingleChoiceDropdownItem
 
 internal data class CardBrandChoice(
     override val label: ResolvableString,
-    override val icon: Int?
+    override val icon: Int?,
+    override val enabled: Boolean
 ) : SingleChoiceDropdownItem

payments-core/src/main/java/com/stripe/android/view/CardNumberEditText.kt

@@ -194,8 +194,7 @@ class CardNumberEditText internal constructor(
                     possibleCardBrands = brands
                 }
             }
-        },
-        cardBrandFilter = cardBrandFilter
+        }
     )
 
     @JvmSynthetic

payments-core/src/test/java/com/stripe/android/cards/CardAccountRangeServiceTest.kt

@@ -5,8 +5,6 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.test.core.app.ApplicationProvider
 import com.google.common.truth.Truth.assertThat
 import com.stripe.android.ApiKeyFixtures
-import com.stripe.android.CardBrandFilter
-import com.stripe.android.DefaultCardBrandFilter
 import com.stripe.android.cards.DefaultStaticCardAccountRanges.Companion.ACCOUNTS
 import com.stripe.android.cards.DefaultStaticCardAccountRanges.Companion.CARTES_BANCAIRES_ACCOUNT_RANGES
 import com.stripe.android.cards.DefaultStaticCardAccountRanges.Companion.UNIONPAY16_ACCOUNTS
@@ -15,7 +13,6 @@ import com.stripe.android.core.networking.ApiRequest
 import com.stripe.android.core.networking.DefaultAnalyticsRequestExecutor
 import com.stripe.android.model.AccountRange
 import com.stripe.android.model.BinRange
-import com.stripe.android.model.CardBrand
 import com.stripe.android.networking.PaymentAnalyticsRequestFactory
 import com.stripe.android.networking.StripeApiRepository
 import com.stripe.android.uicore.utils.stateFlowOf
@@ -24,7 +21,6 @@ import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runTest
-import kotlinx.parcelize.Parcelize
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
@@ -178,8 +174,7 @@ class CardAccountRangeServiceTest {
     private suspend fun testBehavior(
         cardNumber: String,
         isCbcEligible: Boolean,
-        mockRemoteCardAccountRangeSource: CardAccountRangeSource? = null,
-        cardBrandFilter: CardBrandFilter = DefaultCardBrandFilter
+        mockRemoteCardAccountRangeSource: CardAccountRangeSource? = null
     ): List<AccountRange> {
         val completable = CompletableDeferred<List<AccountRange>>()
 
@@ -197,57 +192,14 @@ class CardAccountRangeServiceTest {
                     completable.complete(accountRanges)
                 }
             },
-            isCbcEligible = { isCbcEligible },
-            cardBrandFilter = cardBrandFilter
+            isCbcEligible = { isCbcEligible }
         )
 
         service.onCardNumberChanged(CardNumber.Unvalidated(cardNumber))
 
         return completable.await()
     }
 
-    @Test
-    fun `Brands that are disallowed by the card brand filter are filtered out`() =
-        runTest {
-            // Disallow Mastercard
-            val disallowedBrands = setOf(CardBrand.MasterCard)
-            val cardBrandFilter = FakeCardBrandFilter(disallowedBrands)
-
-            // Use a card number that matches Mastercard (starts with '2')
-            val cardNumber = "2"
-
-            // Call testBehavior with the custom CardBrandFilter
-            val accountRanges = testBehavior(
-                cardNumber = cardNumber,
-                isCbcEligible = false,
-                cardBrandFilter = cardBrandFilter
-            )
-
-            // Since Mastercard is disallowed, the accountRanges should be empty
-            assertThat(accountRanges).isEmpty()
-        }
-
-    @Test
-    fun `Brands that are not disallowed by the card brand filter are filtered out`() =
-        runTest {
-            // Disallow Visa
-            val disallowedBrands = setOf(CardBrand.Visa)
-            val cardBrandFilter = FakeCardBrandFilter(disallowedBrands)
-
-            // Use a card number that matches Mastercard (starts with '2')
-            val cardNumber = "2"
-
-            // Call testBehavior with the custom CardBrandFilter
-            val accountRanges = testBehavior(
-                cardNumber = cardNumber,
-                isCbcEligible = false,
-                cardBrandFilter = cardBrandFilter
-            )
-
-            // Since Mastercard is allow, the accountRanges should have contents
-            assertThat(accountRanges).isNotEmpty()
-        }
-
     private fun createMockRemoteDefaultCardAccountRangeRepository(
         mockRemoteCardAccountRangeSource: CardAccountRangeSource
     ): CardAccountRangeRepository {
@@ -311,12 +263,3 @@ class CardAccountRangeServiceTest {
         )
     }
 }
-
-@Parcelize
-private class FakeCardBrandFilter(
-    private val disallowedBrands: Set<CardBrand>
-) : CardBrandFilter {
-    override fun isAccepted(cardBrand: CardBrand): Boolean {
-        return !disallowedBrands.contains(cardBrand)
-    }
-}

payments-ui-core/res/values/strings.xml

@@ -105,4 +105,6 @@
   <string name="stripe_setup_button_label">Set up</string>
   <!-- Label for UPI ID number field on form -->
   <string name="stripe_upi_id_label">UPI ID</string>
+  <!-- Shown in a dropdown picker next to a card brand that is not accepted by a merchant. E.g. "Visa (not accepted)" -->
+  <string name="stripe_card_brand_not_accepted">(not accepted)</string>
 </resources>

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardNumberController.kt

@@ -20,10 +20,12 @@ import com.stripe.android.cards.CardAccountRangeService
 import com.stripe.android.cards.CardNumber
 import com.stripe.android.cards.DefaultStaticCardAccountRanges
 import com.stripe.android.cards.StaticCardAccountRanges
+import com.stripe.android.core.strings.plus
 import com.stripe.android.core.strings.resolvableString
 import com.stripe.android.model.AccountRange
 import com.stripe.android.model.CardBrand
 import com.stripe.android.stripecardscan.cardscan.CardScanSheetResult
+import com.stripe.android.ui.core.R
 import com.stripe.android.ui.core.asIndividualDigits
 import com.stripe.android.ui.core.elements.events.LocalCardBrandDisallowedReporter
 import com.stripe.android.ui.core.elements.events.LocalCardNumberCompletedEventReporter
@@ -178,8 +180,7 @@ internal class DefaultCardNumberController(
                 brandChoices.value = newBrandChoices
             }
         },
-        isCbcEligible = { isEligibleForCardBrandChoice },
-        cardBrandFilter = cardBrandFilter
+        isCbcEligible = { isEligibleForCardBrandChoice }
     )
 
     override val trailingIcon: StateFlow<TextFieldIcon?> = combineAsStateFlow(
@@ -214,10 +215,18 @@ internal class DefaultCardNumberController(
             }
 
             val items = brands.map { brand ->
+                val enabled = cardBrandFilter.isAccepted(brand)
                 TextFieldIcon.Dropdown.Item(
                     id = brand.code,
-                    label = brand.displayName.resolvableString,
-                    icon = brand.icon
+                    label = if (enabled) {
+                        brand.displayName.resolvableString
+                    } else {
+                        brand.displayName.resolvableString +
+                            " ".resolvableString +
+                            resolvableString(R.string.stripe_card_brand_not_accepted)
+                    },
+                    icon = brand.icon,
+                    enabled = enabled
                 )
             }
 

paymentsheet/res/values/strings.xml

@@ -222,4 +222,6 @@
   <!-- A text notice shown when the user selects an expired card. -->
   <string name="stripe_wallet_update_expired_card_error">This card has expired. Update your card info or choose a different payment method.</string>
   <string name="stripe_wallet_expand_accessibility">Change selection</string>
+  <!-- Shown in a dropdown picker next to a card brand that is not accepted by a merchant. E.g. "Visa (not accepted)" -->
+  <string name="stripe_card_brand_not_accepted">(not accepted)</string>
 </resources>

paymentsheet/src/main/java/com/stripe/android/paymentsheet/ui/CardBrandChoice.kt

@@ -1,16 +1,27 @@
 package com.stripe.android.paymentsheet.ui
 
 import com.stripe.android.core.strings.ResolvableString
+import com.stripe.android.core.strings.plus
 import com.stripe.android.core.strings.resolvableString
 import com.stripe.android.model.CardBrand
+import com.stripe.android.paymentsheet.R
 import com.stripe.android.uicore.elements.SingleChoiceDropdownItem
 
 internal data class CardBrandChoice(
-    val brand: CardBrand
+    val brand: CardBrand,
+    override val enabled: Boolean
 ) : SingleChoiceDropdownItem {
+
     override val icon: Int
         get() = brand.icon
 
     override val label: ResolvableString
-        get() = brand.displayName.resolvableString
+        get() = if (enabled) {
+            brand.displayName.resolvableString
+        } else {
+            // If it's disabled, append "not accepted" to the end of the brand display name
+            brand.displayName.resolvableString +
+                " ".resolvableString +
+                resolvableString(R.string.stripe_card_brand_not_accepted)
+        }
 }

paymentsheet/src/main/java/com/stripe/android/paymentsheet/ui/PaymentMethodCardKtx.kt

@@ -4,18 +4,18 @@ import com.stripe.android.CardBrandFilter
 import com.stripe.android.model.CardBrand
 import com.stripe.android.model.PaymentMethod
 
-internal fun PaymentMethod.Card.getPreferredChoice(): CardBrandChoice {
-    return CardBrand.fromCode(displayBrand).toChoice()
+internal fun PaymentMethod.Card.getPreferredChoice(cardBrandFilter: CardBrandFilter): CardBrandChoice {
+    return CardBrand.fromCode(displayBrand).toChoice(cardBrandFilter)
 }
 
 internal fun PaymentMethod.Card.getAvailableNetworks(cardBrandFilter: CardBrandFilter): List<CardBrandChoice> {
     return networks?.available?.let { brandCodes ->
         brandCodes.map { code ->
-            CardBrand.fromCode(code).toChoice()
-        }.filter { cardBrandFilter.isAccepted(it.brand) }
+            CardBrand.fromCode(code).toChoice(cardBrandFilter)
+        }
     } ?: listOf()
 }
 
-private fun CardBrand.toChoice(): CardBrandChoice {
-    return CardBrandChoice(brand = this)
+private fun CardBrand.toChoice(cardBrandFilter: CardBrandFilter): CardBrandChoice {
+    return CardBrandChoice(brand = this, enabled = cardBrandFilter.isAccepted(this))
 }

paymentsheet/src/main/java/com/stripe/android/paymentsheet/ui/UpdatePaymentMethodInteractor.kt

@@ -155,7 +155,7 @@ internal class DefaultUpdatePaymentMethodInteractor(
             val updateResult = updateExecutor(displayableSavedPaymentMethod.paymentMethod, newCardBrand)
 
             updateResult.onSuccess {
-                savedCardBrand.emit(CardBrandChoice(brand = newCardBrand))
+                savedCardBrand.emit(CardBrandChoice(brand = newCardBrand, enabled = true))
                 cardBrandHasBeenChanged.emit(false)
             }.onFailure {
                 error.emit(it.stripeErrorMessage())
@@ -173,8 +173,8 @@ internal class DefaultUpdatePaymentMethodInteractor(
 
     private fun getInitialCardBrandChoice(): CardBrandChoice {
         return when (val savedPaymentMethod = displayableSavedPaymentMethod.savedPaymentMethod) {
-            is SavedPaymentMethod.Card -> savedPaymentMethod.card.getPreferredChoice()
-            else -> CardBrandChoice(brand = CardBrand.Unknown)
+            is SavedPaymentMethod.Card -> savedPaymentMethod.card.getPreferredChoice(cardBrandFilter)
+            else -> CardBrandChoice(brand = CardBrand.Unknown, enabled = true)
         }
     }
 

paymentsheet/src/test/java/com/stripe/android/customersheet/CustomerSheetViewModelTest.kt

@@ -2592,7 +2592,8 @@ class CustomerSheetViewModelTest {
                 editViewState.updatePaymentMethodInteractor.handleViewAction(
                     UpdatePaymentMethodInteractor.ViewAction.BrandChoiceChanged(
                         CardBrandChoice(
-                            brand = CardBrand.Visa
+                            brand = CardBrand.Visa,
+                            enabled = true
                         )
                     )
                 )
@@ -2780,7 +2781,9 @@ class CustomerSheetViewModelTest {
             editViewState.updatePaymentMethodInteractor.handleViewAction(
                 UpdatePaymentMethodInteractor.ViewAction.BrandChoiceChanged(
                     CardBrandChoice(
-                        brand = CardBrand.Visa
+                        brand = CardBrand.Visa,
+                        enabled = true
+
                     )
                 )
             )
@@ -2875,7 +2878,10 @@ class CustomerSheetViewModelTest {
             val editViewState = awaitViewState<CustomerSheetViewState.UpdatePaymentMethod>()
             editViewState.updatePaymentMethodInteractor.handleViewAction(
                 UpdatePaymentMethodInteractor.ViewAction.BrandChoiceChanged(
-                    CardBrandChoice(brand = CardBrand.Visa)
+                    CardBrandChoice(
+                        brand = CardBrand.Visa,
+                        enabled = true
+                    )
                 )
             )
 
@@ -2906,7 +2912,10 @@ class CustomerSheetViewModelTest {
             val editViewState = awaitViewState<CustomerSheetViewState.UpdatePaymentMethod>()
             editViewState.updatePaymentMethodInteractor.handleViewAction(
                 UpdatePaymentMethodInteractor.ViewAction.BrandChoiceChanged(
-                    CardBrandChoice(brand = CardBrand.Visa)
+                    CardBrandChoice(
+                        brand = CardBrand.Visa,
+                        enabled = true
+                    )
                 )
             )
 
@@ -3457,7 +3466,8 @@ class CustomerSheetViewModelTest {
             editViewState.updatePaymentMethodInteractor.handleViewAction(
                 UpdatePaymentMethodInteractor.ViewAction.BrandChoiceChanged(
                     CardBrandChoice(
-                        brand = CardBrand.Visa
+                        brand = CardBrand.Visa,
+                        enabled = true
                     )
                 )
             )

paymentsheet/src/test/java/com/stripe/android/paymentsheet/EditPage.kt

@@ -1,6 +1,8 @@
 package com.stripe.android.paymentsheet
 
 import androidx.compose.ui.test.SemanticsNodeInteraction
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.junit4.ComposeTestRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
@@ -28,15 +30,16 @@ internal class EditPage(
             .performClick()
     }
 
-    fun assertNotInDropdown(cardBrand: String) {
+    fun assertInDropdownButDisabled(cardBrand: String) {
         // Click on the dropdown menu to expand it
         composeTestRule.onNodeWithTag(DROPDOWN_MENU_CLICKABLE_TEST_TAG)
             .performClick()
 
-        // Attempt to find the node with the specified cardBrand
-        // and assert that it does not exist
+        // Attempt to find the node with the specified cardBrand,
+        // assert that it is present (displayed) and disabled
         composeTestRule.onNodeWithTag("${TEST_TAG_DROP_DOWN_CHOICE}_$cardBrand")
-            .assertDoesNotExist()
+            .assertIsDisplayed()
+            .assertIsNotEnabled()
 
         // Optionally, close the dropdown menu if it's still open
         composeTestRule.onNodeWithTag(DROPDOWN_MENU_CLICKABLE_TEST_TAG)