Fix Forms when only one PM Available

tjclawson-stripe · tjclawson-stripe · commit 78bc502e9a48 · 2025-11-09T19:49:51.000-05:00
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/navigation/PaymentSheetScreen.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/navigation/PaymentSheetScreen.kt
@@ -22,6 +22,7 @@ import com.stripe.android.paymentsheet.ui.SavedPaymentMethodsTopContentPadding
 import com.stripe.android.paymentsheet.ui.SelectSavedPaymentMethodsInteractor
 import com.stripe.android.paymentsheet.ui.UpdatePaymentMethodInteractor
 import com.stripe.android.paymentsheet.ui.UpdatePaymentMethodUI
+import com.stripe.android.paymentsheet.utils.isOnlyOneNonCardPaymentMethod
 import com.stripe.android.paymentsheet.verticalmode.ManageScreenInteractor
 import com.stripe.android.paymentsheet.verticalmode.ManageScreenUI
 import com.stripe.android.paymentsheet.verticalmode.PaymentMethodVerticalLayoutInteractor
@@ -253,7 +254,7 @@ internal sealed interface PaymentSheetScreen {
 
         override fun title(isCompleteFlow: Boolean, isWalletEnabled: Boolean): StateFlow<ResolvableString?> {
             return interactor.state.mapAsStateFlow { state ->
-                if (isWalletEnabled) {
+                if (isWalletEnabled || state.supportedPaymentMethods.isOnlyOneNonCardPaymentMethod()) {
                     null
                 } else if (isCompleteFlow) {
                     R.string.stripe_paymentsheet_add_payment_method_title.resolvableString
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/ui/PaymentElement.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/ui/PaymentElement.kt
@@ -29,6 +29,8 @@ import com.stripe.android.paymentsheet.model.PaymentMethodIncentive
 import com.stripe.android.paymentsheet.paymentdatacollection.FormArguments
 import com.stripe.android.paymentsheet.paymentdatacollection.ach.USBankAccountForm
 import com.stripe.android.paymentsheet.paymentdatacollection.ach.USBankAccountFormArguments
+import com.stripe.android.paymentsheet.utils.isOnlyOneNonCardPaymentMethod
+import com.stripe.android.paymentsheet.verticalmode.VerticalModeFormHeaderUI
 import com.stripe.android.uicore.StripeTheme
 import com.stripe.android.uicore.elements.FormElement
 import com.stripe.android.uicore.getOuterFormInsets
@@ -76,6 +78,8 @@ internal fun PaymentElement(
                 modifier = Modifier.padding(bottom = 12.dp),
                 updatePaymentMethodVisibility = updatePaymentMethodVisibility,
             )
+        } else if (supportedPaymentMethods.isOnlyOneNonCardPaymentMethod()) {
+            VerticalModeFormHeaderUI(enabled, supportedPaymentMethods.first().asFormHeaderInformation(incentive))
         }
 
         FormElement(
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/utils/SupportedPaymentMethodsUtils.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/utils/SupportedPaymentMethodsUtils.kt
@@ -0,0 +1,7 @@
+package com.stripe.android.paymentsheet.utils
+
+import com.stripe.android.lpmfoundations.luxe.SupportedPaymentMethod
+import com.stripe.android.model.PaymentMethod
+
+internal fun List<SupportedPaymentMethod>.isOnlyOneNonCardPaymentMethod() =
+    this.size == 1 && this.first().code != PaymentMethod.Type.Card.code
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/verticalmode/VerticalModeFormUI.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/verticalmode/VerticalModeFormUI.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.stripe.android.lpmfoundations.FormHeaderInformation
+import com.stripe.android.model.PaymentMethod
 import com.stripe.android.paymentsheet.ui.FormElement
 import com.stripe.android.paymentsheet.ui.PaymentMethodIcon
 import com.stripe.android.paymentsheet.ui.PromoBadge
@@ -45,7 +46,7 @@ internal fun VerticalModeFormUI(
     Column(modifier) {
         val headerInformation = state.headerInformation
         val enabled = !state.isProcessing
-        if (headerInformation != null && !showsWalletHeader) {
+        if (headerInformation != null && shouldShowHeader(state.selectedPaymentMethodCode, showsWalletHeader)) {
             VerticalModeFormHeaderUI(isEnabled = enabled, formHeaderInformation = headerInformation)
         }
 
@@ -71,6 +72,10 @@ internal fun VerticalModeFormUI(
     }
 }
 
+private fun shouldShowHeader(selectedCode: String, showsWalletHeader: Boolean): Boolean {
+    return if (selectedCode == PaymentMethod.Type.Card.code) !showsWalletHeader else true
+}
+
 @Composable
 internal fun VerticalModeFormHeaderUI(
     isEnabled: Boolean,
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/verticalmode/VerticalModeInitialScreenFactory.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/verticalmode/VerticalModeInitialScreenFactory.kt
@@ -27,7 +27,7 @@ internal object VerticalModeInitialScreenFactory {
                         customerStateHolder = customerStateHolder,
                         bankFormInteractor = bankFormInteractor,
                     ),
-                    showsWalletHeader = true,
+                    showsWalletHeader = paymentMethodMetadata.availableWallets.isNotEmpty(),
                 )
             )
         }
diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/navigation/PaymentSheetScreenAddFirstPaymentMethodTest.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/navigation/PaymentSheetScreenAddFirstPaymentMethodTest.kt
@@ -12,7 +12,6 @@ import com.stripe.android.testing.CoroutineTestRule
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
-import com.stripe.android.R as PaymentsCoreR
 
 internal class PaymentSheetScreenAddFirstPaymentMethodTest {
     @get:Rule
@@ -49,7 +48,7 @@ internal class PaymentSheetScreenAddFirstPaymentMethodTest {
         val interactor = FakeAddPaymentMethodInteractor(state)
         PaymentSheetScreen.AddFirstPaymentMethod(interactor)
             .title(isCompleteFlow = false, isWalletEnabled = false).test {
-                assertThat(awaitItem()).isEqualTo(PaymentsCoreR.string.stripe_title_add_a_card.resolvableString)
+                assertThat(awaitItem()).isEqualTo(null)
             }
     }
 
@@ -66,7 +65,7 @@ internal class PaymentSheetScreenAddFirstPaymentMethodTest {
         val interactor = FakeAddPaymentMethodInteractor(state)
         PaymentSheetScreen.AddFirstPaymentMethod(interactor)
             .title(isCompleteFlow = false, isWalletEnabled = false).test {
-                assertThat(awaitItem()).isEqualTo(R.string.stripe_paymentsheet_choose_payment_method.resolvableString)
+                assertThat(awaitItem()).isEqualTo(null)
             }
     }
 
diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/verticalmode/VerticalModeFormUITest.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/verticalmode/VerticalModeFormUITest.kt
@@ -82,6 +82,15 @@ internal class VerticalModeFormUITest {
         formPage.title.assert(hasText("Add new card"))
     }
 
+    @Test
+    fun testCardDoesNotShowHeaderWhenShowWalletIsTrue() = runScenario(
+        initialState = createCardState(customerHasSavedPaymentMethods = true),
+        showsWalletHeader = true
+    ) {
+        formPage.headerIcon.assertDoesNotExist()
+        formPage.title.assertDoesNotExist()
+    }
+
     @Test
     fun testCardShowsAddCardHeader_whenCustomerHasNoSavedPMs() = runScenario(
         createCardState(customerHasSavedPaymentMethods = false)
@@ -98,6 +107,16 @@ internal class VerticalModeFormUITest {
         formPage.title.assert(hasText("Klarna"))
     }
 
+    @Test
+    fun testLpmShowsHeaderWhenShowsWalletHeaderIsTrue() = runScenario(
+        initialState = createKlarnaState(),
+        showsWalletHeader = true
+    ) {
+        formPage.headerIcon.assertExists()
+        formPage.title.assertExists()
+        formPage.title.assert(hasText("Klarna"))
+    }
+
     @Test
     fun testCardNumberErrorMessage() = runScenario(createCardState(customerHasSavedPaymentMethods = true)) {
         formPage.cardNumber.assertHasNoErrorMessage()
@@ -118,6 +137,7 @@ internal class VerticalModeFormUITest {
 
     private fun runScenario(
         initialState: VerticalModeFormInteractor.State,
+        showsWalletHeader: Boolean = false,
         block: Scenario.() -> Unit
     ) {
         val stateFlow = MutableStateFlow(initialState)
@@ -130,7 +150,7 @@ internal class VerticalModeFormUITest {
                 LocalCardNumberCompletedEventReporter provides { },
                 LocalCardBrandDisallowedReporter provides { }
             ) {
-                VerticalModeFormUI(interactor, showsWalletHeader = false)
+                VerticalModeFormUI(interactor, showsWalletHeader = showsWalletHeader)
             }
         }
 
diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/verticalmode/VerticalModeInitialScreenFactoryTest.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/verticalmode/VerticalModeInitialScreenFactoryTest.kt
@@ -6,6 +6,7 @@ import com.stripe.android.isInstanceOf
 import com.stripe.android.link.TestFactory
 import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodMetadata
 import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodMetadataFactory
+import com.stripe.android.lpmfoundations.paymentmethod.WalletType
 import com.stripe.android.model.PaymentIntentFixtures
 import com.stripe.android.model.PaymentMethodFixtures
 import com.stripe.android.paymentsheet.CustomerStateHolder
@@ -35,6 +36,34 @@ class VerticalModeInitialScreenFactoryTest {
         assertThat(screens[0]).isInstanceOf<PaymentSheetScreen.VerticalModeForm>()
     }
 
+    @Test
+    fun `showsWalletHeader is false for VerticalModeForm if no available wallets`() = runScenario(
+        paymentMethodMetadata = PaymentMethodMetadataFactory.create(
+            stripeIntent = PaymentIntentFixtures.PI_REQUIRES_PAYMENT_METHOD.copy(
+                paymentMethodTypes = listOf("cashapp"),
+            ),
+            availableWallets = listOf()
+        )
+    ) {
+        assertThat(screens).hasSize(1)
+        assertThat(screens[0]).isInstanceOf<PaymentSheetScreen.VerticalModeForm>()
+        assertThat(screens[0].showsWalletsHeader(false).value).isFalse()
+    }
+
+    @Test
+    fun `showsWalletHeader is true for VerticalModeForm if available wallets exist`() = runScenario(
+        paymentMethodMetadata = PaymentMethodMetadataFactory.create(
+            stripeIntent = PaymentIntentFixtures.PI_REQUIRES_PAYMENT_METHOD.copy(
+                paymentMethodTypes = listOf("cashapp"),
+            ),
+            availableWallets = listOf(WalletType.Link)
+        )
+    ) {
+        assertThat(screens).hasSize(1)
+        assertThat(screens[0]).isInstanceOf<PaymentSheetScreen.VerticalModeForm>()
+        assertThat(screens[0].showsWalletsHeader(false).value).isTrue()
+    }
+
     @Test
     fun `returns list screen when only one payment method available with saved payment methods`() = runScenario(
         paymentMethodMetadata = PaymentMethodMetadataFactory.create(

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ internal object VerticalModeInitialScreenFactory {`
`27`	`27`	`customerStateHolder = customerStateHolder,`
`28`	`28`	`bankFormInteractor = bankFormInteractor,`
`29`	`29`	`),`
`30`		`- showsWalletHeader = true,`
	`30`	`+ showsWalletHeader = paymentMethodMetadata.availableWallets.isNotEmpty(),`
`31`	`31`	`)`
`32`	`32`	`)`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ import com.stripe.android.testing.CoroutineTestRule`
`12`	`12`	`import kotlinx.coroutines.test.runTest`
`13`	`13`	`import org.junit.Rule`
`14`	`14`	`import org.junit.Test`
`15`		`-import com.stripe.android.R as PaymentsCoreR`
`16`	`15`
`17`	`16`	`internal class PaymentSheetScreenAddFirstPaymentMethodTest {`
`18`	`17`	`@get:Rule`
`@@ -49,7 +48,7 @@ internal class PaymentSheetScreenAddFirstPaymentMethodTest {`
`49`	`48`	`val interactor = FakeAddPaymentMethodInteractor(state)`
`50`	`49`	`PaymentSheetScreen.AddFirstPaymentMethod(interactor)`
`51`	`50`	`.title(isCompleteFlow = false, isWalletEnabled = false).test {`
`52`		`- assertThat(awaitItem()).isEqualTo(PaymentsCoreR.string.stripe_title_add_a_card.resolvableString)`
	`51`	`+ assertThat(awaitItem()).isEqualTo(null)`
`53`	`52`	`}`
`54`	`53`	`}`
`55`	`54`
`@@ -66,7 +65,7 @@ internal class PaymentSheetScreenAddFirstPaymentMethodTest {`
`66`	`65`	`val interactor = FakeAddPaymentMethodInteractor(state)`
`67`	`66`	`PaymentSheetScreen.AddFirstPaymentMethod(interactor)`
`68`	`67`	`.title(isCompleteFlow = false, isWalletEnabled = false).test {`
`69`		`- assertThat(awaitItem()).isEqualTo(R.string.stripe_paymentsheet_choose_payment_method.resolvableString)`
	`68`	`+ assertThat(awaitItem()).isEqualTo(null)`
`70`	`69`	`}`
`71`	`70`	`}`
`72`	`71`