Fix billing details fields bug & add flow controller tests for Bacs.

stripe · Nov 30, 2023 · 0212a8f · 0212a8f
1 parent c3a734a
commit 0212a8f
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 4 deletions.
diff --git a/payments-ui-core/src/main/java/com/stripe/android/ui/core/forms/resources/LpmRepository.kt b/payments-ui-core/src/main/java/com/stripe/android/ui/core/forms/resources/LpmRepository.kt
@@ -473,9 +473,9 @@ class LpmRepository constructor(
             formSpec = LayoutSpec(sharedDataSpec.fields)
         )
         PaymentMethod.Type.BacsDebit.code -> {
-            val localFields = listOf(
+            val localFields = listOfNotNull(
                 ContactInformationSpec(
-                    collectPhone = false,
+                    collectPhone = billingDetailsCollectionConfiguration.collectPhone,
                     nameLabel = R.string.stripe_bacs_full_name
                 ),
                 BacsDebitBankAccountSpec(),

diff --git a/paymentsheet-example/src/androidTest/java/com/stripe/android/lpm/TestBacs.kt b/paymentsheet-example/src/androidTest/java/com/stripe/android/lpm/TestBacs.kt
@@ -29,6 +29,20 @@ internal class TestBacs : BasePlaygroundTest() {
         )
     }
 
+    @Test
+    fun testBacsWhenConfirmedInCustomFlow() {
+        testDriver.confirmCustomAndBuy(
+            testParameters = createTestParameters(AuthorizeAction.Bacs.Confirm)
+        )
+    }
+
+    @Test
+    fun testBacsWhenCancelledInCustomFlow() {
+        testDriver.confirmCustomAndBuy(
+            testParameters = createTestParameters(AuthorizeAction.Bacs.ModifyDetails)
+        )
+    }
+
     private fun createTestParameters(
         bacsAuthAction: AuthorizeAction.Bacs
     ): TestParameters {

diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/forms/FormViewModel.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/forms/FormViewModel.kt
@@ -69,8 +69,11 @@ internal class FormViewModel @Inject internal constructor(
             lpmRepository.fromCode(formArguments.paymentMethodCode)
         ).formSpec.items
 
-        // Cards are a special case and already contain specs based on the configuration.
-        if (formArguments.paymentMethodCode != PaymentMethod.Type.Card.code) {
+        // Cards & Bacs debit are a special case and already contain specs based on the configuration.
+        if (
+            formArguments.paymentMethodCode != PaymentMethod.Type.Card.code &&
+            formArguments.paymentMethodCode != PaymentMethod.Type.BacsDebit.code
+        ) {
             specs = specsForConfiguration(
                 configuration = formArguments.billingDetailsCollectionConfiguration,
                 placeholderOverrideList = formArguments.requiredFields,

diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/forms/FormViewModelTest.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/forms/FormViewModelTest.kt
@@ -19,6 +19,7 @@ import com.stripe.android.ui.core.elements.CardDetailsSectionElement
 import com.stripe.android.ui.core.elements.CountrySpec
 import com.stripe.android.ui.core.elements.EmailElement
 import com.stripe.android.ui.core.elements.EmailSpec
+import com.stripe.android.ui.core.elements.EmptyFormElement
 import com.stripe.android.ui.core.elements.IbanSpec
 import com.stripe.android.ui.core.elements.LayoutSpec
 import com.stripe.android.ui.core.elements.MandateTextSpec
@@ -861,6 +862,30 @@ internal class FormViewModelTest {
         }
     }
 
+    @Test
+    fun `Test Bacs with billing configuration does not billing field placeholders`() = runTest {
+        val formViewModel = createViewModel(
+            COMPOSE_FRAGMENT_ARGS.copy(
+                paymentMethodCode = PaymentMethod.Type.BacsDebit.code,
+                billingDetailsCollectionConfiguration = PaymentSheet.BillingDetailsCollectionConfiguration(
+                    name = PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode.Always,
+                    email = PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode.Always,
+                    phone = PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode.Always,
+                )
+            ),
+            createLpmRepositorySupportedPaymentMethod(
+                PaymentMethod.Type.BacsDebit,
+                LayoutSpec.create(),
+            ),
+        )
+
+        formViewModel.elementsFlow.test {
+            assertThat(awaitItem()).containsExactly(EmptyFormElement())
+
+            awaitComplete()
+        }
+    }
+
     private suspend fun getSectionFieldTextControllerWithLabel(
         formViewModel: FormViewModel,
         @StringRes label: Int