In vertical mode, only open card brand choice screen if the saved PM …

…is modifiable (#9124)
stripe · Aug 26, 2024 · a871e94 · a871e94
1 parent fb2eb23
commit a871e94
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/...ava/com/stripe/android/paymentsheet/verticalmode/PaymentMethodVerticalLayoutInteractor.kt b/...ava/com/stripe/android/paymentsheet/verticalmode/PaymentMethodVerticalLayoutInteractor.kt
@@ -76,7 +76,6 @@ internal class DefaultPaymentMethodVerticalLayoutInteractor(
     private val mostRecentlySelectedSavedPaymentMethod: StateFlow<PaymentMethod?>,
     private val providePaymentMethodName: (PaymentMethodCode?) -> ResolvableString,
     private val canRemove: StateFlow<Boolean>,
-    private val canEdit: StateFlow<Boolean>,
     private val onEditPaymentMethod: (DisplayableSavedPaymentMethod) -> Unit,
     private val onSelectSavedPaymentMethod: (PaymentMethod) -> Unit,
     private val walletsState: StateFlow<WalletsState?>,
@@ -133,7 +132,6 @@ internal class DefaultPaymentMethodVerticalLayoutInteractor(
                 paymentMethods = customerStateHolder.paymentMethods,
                 mostRecentlySelectedSavedPaymentMethod = customerStateHolder.mostRecentlySelectedSavedPaymentMethod,
                 providePaymentMethodName = savedPaymentMethodMutator.providePaymentMethodName,
-                canEdit = viewModel.savedPaymentMethodMutator.canEdit,
                 canRemove = viewModel.savedPaymentMethodMutator.canRemove,
                 onEditPaymentMethod = { savedPaymentMethodMutator.modifyPaymentMethod(it.paymentMethod) },
                 onSelectSavedPaymentMethod = {
@@ -171,13 +169,11 @@ internal class DefaultPaymentMethodVerticalLayoutInteractor(
     private val availableSavedPaymentMethodAction = combineAsStateFlow(
         paymentMethods,
         displayedSavedPaymentMethod,
-        canEdit,
         canRemove,
-    ) { paymentMethods, displayedSavedPaymentMethod, canEdit, canRemove ->
+    ) { paymentMethods, displayedSavedPaymentMethod, canRemove ->
         getAvailableSavedPaymentMethodAction(
             paymentMethods = paymentMethods,
             savedPaymentMethod = displayedSavedPaymentMethod,
-            canEdit = canEdit,
             canRemove = canRemove
         )
     }
@@ -284,7 +280,6 @@ internal class DefaultPaymentMethodVerticalLayoutInteractor(
     private fun getAvailableSavedPaymentMethodAction(
         paymentMethods: List<PaymentMethod>?,
         savedPaymentMethod: DisplayableSavedPaymentMethod?,
-        canEdit: Boolean,
         canRemove: Boolean,
     ): PaymentMethodVerticalLayoutInteractor.SavedPaymentMethodAction {
         if (paymentMethods == null || savedPaymentMethod == null) {
@@ -296,7 +291,7 @@ internal class DefaultPaymentMethodVerticalLayoutInteractor(
             1 -> {
                 getSavedPaymentMethodActionForOnePaymentMethod(
                     canRemove = canRemove,
-                    canEdit = canEdit,
+                    savedPaymentMethod = savedPaymentMethod,
                 )
             }
             else ->
@@ -306,9 +301,9 @@ internal class DefaultPaymentMethodVerticalLayoutInteractor(
 
     private fun getSavedPaymentMethodActionForOnePaymentMethod(
         canRemove: Boolean,
-        canEdit: Boolean,
+        savedPaymentMethod: DisplayableSavedPaymentMethod?,
     ): PaymentMethodVerticalLayoutInteractor.SavedPaymentMethodAction {
-        return if (canEdit) {
+        return if (savedPaymentMethod?.isModifiable() == true) {
             // Edit screen handles both canRemove variants.
             PaymentMethodVerticalLayoutInteractor.SavedPaymentMethodAction.EDIT_CARD_BRAND
         } else if (canRemove) {

diff --git a/...ipe/android/paymentsheet/verticalmode/DefaultPaymentMethodVerticalLayoutInteractorTest.kt b/...ipe/android/paymentsheet/verticalmode/DefaultPaymentMethodVerticalLayoutInteractorTest.kt
@@ -111,7 +111,6 @@ class DefaultPaymentMethodVerticalLayoutInteractorTest {
             initialPaymentMethods = PaymentMethodFixtures.createCards(3),
         ) {
             canRemove.value = true
-            canEdit.value = true
 
             interactor.state.test {
                 awaitItem().run {
@@ -129,7 +128,6 @@ class DefaultPaymentMethodVerticalLayoutInteractorTest {
             initialPaymentMethods = PaymentMethodFixtures.createCards(3),
         ) {
             canRemove.value = false
-            canEdit.value = false
 
             interactor.state.test {
                 awaitItem().run {
@@ -144,10 +142,9 @@ class DefaultPaymentMethodVerticalLayoutInteractorTest {
     @Test
     fun `state has edit_card_brand saved PM action when one saved PM, can edit, and can remove`() {
         runScenario(
-            initialPaymentMethods = PaymentMethodFactory.cards(1),
+            initialPaymentMethods = listOf(PaymentMethodFixtures.CARD_WITH_NETWORKS_PAYMENT_METHOD),
         ) {
             canRemove.value = true
-            canEdit.value = true
 
             interactor.state.test {
                 awaitItem().run {
@@ -162,10 +159,9 @@ class DefaultPaymentMethodVerticalLayoutInteractorTest {
     @Test
     fun `state has edit card brand saved payment method action when one saved PM, can edit, and cannot remove`() {
         runScenario(
-            initialPaymentMethods = PaymentMethodFactory.cards(1),
+            initialPaymentMethods = listOf(PaymentMethodFixtures.CARD_WITH_NETWORKS_PAYMENT_METHOD),
         ) {
             canRemove.value = false
-            canEdit.value = true
 
             interactor.state.test {
                 awaitItem().run {
@@ -177,13 +173,29 @@ class DefaultPaymentMethodVerticalLayoutInteractorTest {
         }
     }
 
+    @Test
+    fun `state has manage one saved payment method action when one saved PM, cannot edit, and can remove`() {
+        runScenario(
+            initialPaymentMethods = PaymentMethodFactory.cards(1), // Creates a non-modifiable card
+        ) {
+            canRemove.value = true
+
+            interactor.state.test {
+                awaitItem().run {
+                    assertThat(availableSavedPaymentMethodAction).isEqualTo(
+                        PaymentMethodVerticalLayoutInteractor.SavedPaymentMethodAction.MANAGE_ONE
+                    )
+                }
+            }
+        }
+    }
+
     @Test
     fun `state has no saved payment method action when one saved PM, cannot edit, and cannot remove`() {
         runScenario(
-            initialPaymentMethods = PaymentMethodFactory.cards(1),
+            initialPaymentMethods = PaymentMethodFactory.cards(1), // Creates a non-modifiable card
         ) {
             canRemove.value = false
-            canEdit.value = false
 
             interactor.state.test {
                 awaitItem().run {
@@ -196,12 +208,11 @@ class DefaultPaymentMethodVerticalLayoutInteractorTest {
     }
 
     @Test
-    fun `state has no saved payment method action when multiple saved PMs, cannot edit, and cannot remove`() {
+    fun `state has no saved payment method action when multiple saved PMs and cannot remove`() {
         runScenario(
             initialPaymentMethods = PaymentMethodFactory.cards(1),
         ) {
             canRemove.value = false
-            canEdit.value = false
 
             interactor.state.test {
                 awaitItem().run {
@@ -972,7 +983,6 @@ class DefaultPaymentMethodVerticalLayoutInteractorTest {
         val mostRecentlySelectedSavedPaymentMethod: MutableStateFlow<PaymentMethod?> =
             MutableStateFlow(initialMostRecentlySelectedSavedPaymentMethod)
         val walletsState = MutableStateFlow<WalletsState?>(null)
-        val canEdit = MutableStateFlow(true)
         val canRemove = MutableStateFlow(true)
         val isCurrentScreen: MutableStateFlow<Boolean> = MutableStateFlow(initialIsCurrentScreen)
         val dispatcher = StandardTestDispatcher()
@@ -998,7 +1008,6 @@ class DefaultPaymentMethodVerticalLayoutInteractorTest {
             updateSelection = updateSelection,
             isCurrentScreen = isCurrentScreen,
             dispatcher = dispatcher,
-            canEdit = canEdit,
             canRemove = canRemove,
             isLiveMode = true,
         )
@@ -1012,7 +1021,6 @@ class DefaultPaymentMethodVerticalLayoutInteractorTest {
             walletsState = walletsState,
             interactor = interactor,
             canRemove = canRemove,
-            canEdit = canEdit,
             dispatcher = dispatcher,
         ).apply {
             runTest {
@@ -1029,7 +1037,6 @@ class DefaultPaymentMethodVerticalLayoutInteractorTest {
         val paymentMethodsSource: MutableStateFlow<List<PaymentMethod>>,
         val walletsState: MutableStateFlow<WalletsState?>,
         val canRemove: MutableStateFlow<Boolean>,
-        val canEdit: MutableStateFlow<Boolean>,
         val interactor: PaymentMethodVerticalLayoutInteractor,
         val dispatcher: TestDispatcher,
     )