Add Form Header if there is only one PaymentMethod

Author: tjclawson-stripe

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityUI.kt

@@ -60,8 +60,7 @@ internal fun FormActivityUI(
             },
             content = {
                 VerticalModeFormUI(
-                    interactor = interactor,
-                    showsWalletHeader = false
+                    interactor = interactor
                 )
                 USBankAccountMandate(state)
                 FormActivityError(state)

paymentsheet/src/main/java/com/stripe/android/paymentsheet/navigation/PaymentSheetScreen.kt

@@ -253,7 +253,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.size == 1) {
                     null
                 } else if (isCompleteFlow) {
                     R.string.stripe_paymentsheet_add_payment_method_title.resolvableString
@@ -359,7 +359,7 @@ internal sealed interface PaymentSheetScreen {
 
         @Composable
         override fun Content(modifier: Modifier) {
-            VerticalModeFormUI(interactor, showsWalletHeader, modifier)
+            VerticalModeFormUI(interactor, modifier)
         }
 
         override fun close() {

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

@@ -29,6 +29,7 @@ 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.verticalmode.VerticalModeFormHeaderUI
 import com.stripe.android.uicore.StripeTheme
 import com.stripe.android.uicore.elements.FormElement
 import com.stripe.android.uicore.getOuterFormInsets
@@ -76,6 +77,8 @@ internal fun PaymentElement(
                 modifier = Modifier.padding(bottom = 12.dp),
                 updatePaymentMethodVisibility = updatePaymentMethodVisibility,
             )
+        } else if (supportedPaymentMethods.size == 1) {
+            VerticalModeFormHeaderUI(enabled, supportedPaymentMethods.first().asFormHeaderInformation(incentive))
         }
 
         FormElement(

paymentsheet/src/main/java/com/stripe/android/paymentsheet/verticalmode/VerticalModeFormUI.kt

@@ -34,7 +34,6 @@ const val TEST_TAG_HEADER_TITLE = "TEST_TAG_HEADER_TITLE"
 @Composable
 internal fun VerticalModeFormUI(
     interactor: VerticalModeFormInteractor,
-    showsWalletHeader: Boolean,
     modifier: Modifier = Modifier
 ) {
     val horizontalPadding = StripeTheme.getOuterFormInsets()
@@ -45,7 +44,7 @@ internal fun VerticalModeFormUI(
     Column(modifier) {
         val headerInformation = state.headerInformation
         val enabled = !state.isProcessing
-        if (headerInformation != null && !showsWalletHeader) {
+        if (headerInformation != null) {
             VerticalModeFormHeaderUI(isEnabled = enabled, formHeaderInformation = headerInformation)
         }
 

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)
             }
     }
 

paymentsheet/src/test/java/com/stripe/android/paymentsheet/verticalmode/VerticalModeFormUIScreenshotTest.kt

@@ -456,7 +456,6 @@ internal class VerticalModeFormUIScreenshotTest {
         paymentMethodCode: PaymentMethodCode,
         metadata: PaymentMethodMetadata,
         isProcessing: Boolean = false,
-        showsWalletHeader: Boolean = false,
     ) {
         ViewModelStoreOwnerContext {
             VerticalModeFormUI(
@@ -465,7 +464,6 @@ internal class VerticalModeFormUIScreenshotTest {
                     metadata = metadata,
                     isProcessing = isProcessing,
                 ),
-                showsWalletHeader = showsWalletHeader,
             )
         }
     }

paymentsheet/src/test/java/com/stripe/android/paymentsheet/verticalmode/VerticalModeFormUITest.kt

@@ -130,7 +130,7 @@ internal class VerticalModeFormUITest {
                 LocalCardNumberCompletedEventReporter provides { },
                 LocalCardBrandDisallowedReporter provides { }
             ) {
-                VerticalModeFormUI(interactor, showsWalletHeader = false)
+                VerticalModeFormUI(interactor)
             }
         }