Add more reliable bank label rendering

stripe · Nov 12, 2024 · 4876c86 · 4876c86
1 parent eeaa86a
commit 4876c86
Show file tree

Hide file tree

Showing 14 changed files with 95 additions and 4 deletions.
diff --git a/...ain/java/com/stripe/android/paymentsheet/paymentdatacollection/ach/BankFormScreenState.kt b/...ain/java/com/stripe/android/paymentsheet/paymentdatacollection/ach/BankFormScreenState.kt
@@ -28,7 +28,15 @@ internal data class BankFormScreenState(
         val financialConnectionsSessionId: String?,
         val mandateText: ResolvableString,
         val isVerifyingWithMicrodeposits: Boolean,
-    ) : Parcelable
+    ) : Parcelable {
+
+        val label: String
+            get() = buildString {
+                bankName?.let { append("$it ") }
+                append("••••")
+                last4?.let { append(" $it") }
+            }
+    }
 
     sealed interface ResultIdentifier : Parcelable {
         @Parcelize

diff --git a/.../main/java/com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountForm.kt b/.../main/java/com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountForm.kt
@@ -146,6 +146,7 @@ internal fun BankAccountForm(
                 isProcessing = state.isProcessing,
                 bankName = linkedBankAccount.bankName,
                 last4 = linkedBankAccount.last4,
+                label = linkedBankAccount.label,
                 saveForFutureUseElement = saveForFutureUseElement,
                 onRemoveAccount = onRemoveAccount,
             )
@@ -336,6 +337,7 @@ private fun AccountDetailsForm(
     isProcessing: Boolean,
     bankName: String?,
     last4: String?,
+    label: String,
     saveForFutureUseElement: SaveForFutureUseElement,
     onRemoveAccount: () -> Unit,
 ) {
@@ -375,7 +377,7 @@ private fun AccountDetailsForm(
                     )
 
                     Text(
-                        text = "$bankName •••• $last4",
+                        text = label,
                         modifier = Modifier.alpha(if (isProcessing) 0.5f else 1f),
                         color = MaterialTheme.stripeColors.onComponent,
                     )

diff --git a/...com/stripe/android/paymentsheet/paymentdatacollection/ach/AccountPreviewScreenshotTest.kt b/...com/stripe/android/paymentsheet/paymentdatacollection/ach/AccountPreviewScreenshotTest.kt
@@ -119,6 +119,79 @@ internal class AccountPreviewScreenshotTest {
         }
     }
 
+    @Test
+    fun testWithMissingLast4() {
+        paparazzi.snapshot {
+            BankAccountForm(
+                state = BankFormScreenStateFactory.createWithSession(
+                    sessionId = "session_1234",
+                    last4 = null,
+                ),
+                instantDebits = false,
+                isPaymentFlow = true,
+                formArgs = formArguments,
+                nameController = createNameController(),
+                emailController = createEmailController(),
+                phoneController = createPhoneNumberController(),
+                addressController = createAddressController(),
+                sameAsShippingElement = sameAsShippingElement,
+                saveForFutureUseElement = saveForFutureUseElement,
+                showCheckbox = false,
+                lastTextFieldIdentifier = null,
+                onRemoveAccount = {},
+            )
+        }
+    }
+
+    @Test
+    fun testWithMissingBankName() {
+        paparazzi.snapshot {
+            BankAccountForm(
+                state = BankFormScreenStateFactory.createWithSession(
+                    sessionId = "session_1234",
+                    bankName = null,
+                ),
+                instantDebits = false,
+                isPaymentFlow = true,
+                formArgs = formArguments,
+                nameController = createNameController(),
+                emailController = createEmailController(),
+                phoneController = createPhoneNumberController(),
+                addressController = createAddressController(),
+                sameAsShippingElement = sameAsShippingElement,
+                saveForFutureUseElement = saveForFutureUseElement,
+                showCheckbox = false,
+                lastTextFieldIdentifier = null,
+                onRemoveAccount = {},
+            )
+        }
+    }
+
+    @Test
+    fun testWithMissingBankNameAndLast4() {
+        paparazzi.snapshot {
+            BankAccountForm(
+                state = BankFormScreenStateFactory.createWithSession(
+                    sessionId = "session_1234",
+                    bankName = null,
+                    last4 = null,
+                ),
+                instantDebits = false,
+                isPaymentFlow = true,
+                formArgs = formArguments,
+                nameController = createNameController(),
+                emailController = createEmailController(),
+                phoneController = createPhoneNumberController(),
+                addressController = createAddressController(),
+                sameAsShippingElement = sameAsShippingElement,
+                saveForFutureUseElement = saveForFutureUseElement,
+                showCheckbox = false,
+                lastTextFieldIdentifier = null,
+                onRemoveAccount = {},
+            )
+        }
+    }
+
     private fun createNameController(): TextFieldController {
         return NameConfig.createController("John Doe")
     }

diff --git a/paymentsheet/src/test/java/com/stripe/android/utils/BankFormScreenStateFactory.kt b/paymentsheet/src/test/java/com/stripe/android/utils/BankFormScreenStateFactory.kt
@@ -11,11 +11,15 @@ internal object BankFormScreenStateFactory {
         sessionId: String,
         isVerifyingWithMicrodeposits: Boolean = false,
         mandateText: ResolvableString = "Some legal text".resolvableString,
+        bankName: String? = "Stripe Bank",
+        last4: String? = "6789",
     ): BankFormScreenState {
         return create(
             resultIdentifier = BankFormScreenState.ResultIdentifier.Session(sessionId),
             isVerifyingWithMicrodeposits = isVerifyingWithMicrodeposits,
             mandateText = mandateText,
+            bankName = bankName,
+            last4 = last4,
         )
     }
 
@@ -28,21 +32,25 @@ internal object BankFormScreenStateFactory {
             resultIdentifier = BankFormScreenState.ResultIdentifier.PaymentMethod(paymentMethod),
             isVerifyingWithMicrodeposits = isVerifyingWithMicrodeposits,
             mandateText = mandateText,
+            bankName = "Stripe Bank",
+            last4 = "6789",
         )
     }
 
     private fun create(
         resultIdentifier: BankFormScreenState.ResultIdentifier,
         isVerifyingWithMicrodeposits: Boolean,
         mandateText: ResolvableString,
+        bankName: String?,
+        last4: String?,
     ): BankFormScreenState {
         return BankFormScreenState(
             linkedBankAccount = BankFormScreenState.LinkedBankAccount(
                 resultIdentifier = resultIdentifier,
                 financialConnectionsSessionId = "session_1234",
                 intentId = "intent_1234",
-                bankName = "Stripe Bank",
-                last4 = "6789",
+                bankName = bankName,
+                last4 = last4,
                 mandateText = mandateText,
                 isVerifyingWithMicrodeposits = isVerifyingWithMicrodeposits,
             )

diff --git a/...tdatacollection.ach_AccountPreviewScreenshotTest_testPaymentFlow[DarkTheme].png b/...tdatacollection.ach_AccountPreviewScreenshotTest_testPaymentFlow[DarkTheme].png
diff --git a/...entdatacollection.ach_AccountPreviewScreenshotTest_testSetupFlow[DarkTheme].png b/...entdatacollection.ach_AccountPreviewScreenshotTest_testSetupFlow[DarkTheme].png
diff --git a/...llection.ach_AccountPreviewScreenshotTest_testWithBillingAddress[DarkTheme].png b/...llection.ach_AccountPreviewScreenshotTest_testWithBillingAddress[DarkTheme].png
diff --git a/...lection.ach_AccountPreviewScreenshotTest_testWithBillingAddress[LightTheme].png b/...lection.ach_AccountPreviewScreenshotTest_testWithBillingAddress[LightTheme].png
diff --git a/...ach_AccountPreviewScreenshotTest_testWithMissingBankNameAndLast4[DarkTheme].png b/...ach_AccountPreviewScreenshotTest_testWithMissingBankNameAndLast4[DarkTheme].png
diff --git a/...ch_AccountPreviewScreenshotTest_testWithMissingBankNameAndLast4[LightTheme].png b/...ch_AccountPreviewScreenshotTest_testWithMissingBankNameAndLast4[LightTheme].png
diff --git a/...lection.ach_AccountPreviewScreenshotTest_testWithMissingBankName[DarkTheme].png b/...lection.ach_AccountPreviewScreenshotTest_testWithMissingBankName[DarkTheme].png
diff --git a/...ection.ach_AccountPreviewScreenshotTest_testWithMissingBankName[LightTheme].png b/...ection.ach_AccountPreviewScreenshotTest_testWithMissingBankName[LightTheme].png
diff --git a/...collection.ach_AccountPreviewScreenshotTest_testWithMissingLast4[DarkTheme].png b/...collection.ach_AccountPreviewScreenshotTest_testWithMissingLast4[DarkTheme].png
diff --git a/...ollection.ach_AccountPreviewScreenshotTest_testWithMissingLast4[LightTheme].png b/...ollection.ach_AccountPreviewScreenshotTest_testWithMissingLast4[LightTheme].png