Update PaymentSheet bottom paddings with error

stripe · Sep 9, 2024 · 6a11c5e · 6a11c5e
1 parent 2b7daa5
commit 6a11c5e
Show file tree

Hide file tree

Showing 21 changed files with 147 additions and 10 deletions.
diff --git a/...reenshot.TestPaymentSheetScreenshots_testPaymentSheetAlongsideSfuLinkSignUp.png b/...reenshot.TestPaymentSheetScreenshots_testPaymentSheetAlongsideSfuLinkSignUp.png
diff --git a/...reenshot.TestPaymentSheetScreenshots_testPaymentSheetInsteadOfSfuLinkSignUp.png b/...reenshot.TestPaymentSheetScreenshots_testPaymentSheetInsteadOfSfuLinkSignUp.png
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
@@ -37,7 +37,7 @@ import java.io.Closeable
 import com.stripe.android.R as PaymentsCoreR
 
 internal val verticalModeBottomContentPadding = 20.dp
-internal val horizontalModeBottomContentPadding = 8.dp
+internal val horizontalModeBottomContentPadding = 20.dp
 internal val horizontalModeWalletsDividerSpacing = 16.dp
 internal val verticalModeWalletsDividerSpacing = 24.dp
 
@@ -223,7 +223,7 @@ internal sealed interface PaymentSheetScreen {
 
         @Composable
         override fun Content(modifier: Modifier) {
-            AddPaymentMethod(interactor = interactor, modifier)
+            AddPaymentMethod(interactor = interactor)
         }
 
         override fun close() {
@@ -276,7 +276,7 @@ internal sealed interface PaymentSheetScreen {
 
         @Composable
         override fun Content(modifier: Modifier) {
-            AddPaymentMethod(interactor = interactor, modifier)
+            AddPaymentMethod(interactor = interactor)
         }
 
         override fun close() {

diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/ui/PaymentSheetScreen.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/ui/PaymentSheetScreen.kt
@@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.foundation.layout.requiredSize
@@ -288,7 +287,7 @@ private fun PaymentSheetContent(
 ) {
     val horizontalPadding = dimensionResource(R.dimen.stripe_paymentsheet_outer_spacing_horizontal)
 
-    Column(modifier = modifier) {
+    Column(modifier = modifier.padding(bottom = currentScreen.bottomContentPadding)) {
         headerText?.let { text ->
             H4Text(
                 text = text.resolve(),
@@ -328,13 +327,11 @@ private fun PaymentSheetContent(
             )
         }
 
-        Spacer(modifier = Modifier.height(currentScreen.bottomContentPadding))
-
         error?.let {
             ErrorMessage(
                 error = it.resolve(),
                 modifier = Modifier
-                    .padding(vertical = 2.dp, horizontal = horizontalPadding)
+                    .padding(vertical = 6.dp, horizontal = horizontalPadding)
                     .testTag(PAYMENT_SHEET_ERROR_TEXT_TEST_TAG),
             )
         }

diff --git a/...ndroid/paymentsheet/navigation/PaymentSheetScreenAddAnotherPaymentMethodScreenshotTest.kt b/...ndroid/paymentsheet/navigation/PaymentSheetScreenAddAnotherPaymentMethodScreenshotTest.kt
@@ -5,6 +5,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.stripe.android.core.strings.resolvableString
 import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodMetadataFactory
+import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodSaveConsentBehavior
+import com.stripe.android.model.SetupIntentFixtures
 import com.stripe.android.paymentsheet.navigation.PaymentSheetScreen.AddAnotherPaymentMethod
 import com.stripe.android.paymentsheet.ui.FakeAddPaymentMethodInteractor
 import com.stripe.android.paymentsheet.ui.FakeAddPaymentMethodInteractor.Companion.createState
@@ -41,6 +43,23 @@ internal class PaymentSheetScreenAddAnotherPaymentMethodScreenshotTest {
         }
     }
 
+    @Test
+    fun displaysCheckbox() {
+        val metadata = PaymentMethodMetadataFactory.create(
+            hasCustomerConfiguration = true,
+            paymentMethodSaveConsentBehavior = PaymentMethodSaveConsentBehavior.Enabled,
+        )
+        val interactor = FakeAddPaymentMethodInteractor(initialState = createState(metadata))
+        val initialScreen = AddAnotherPaymentMethod(interactor)
+        val viewModel = FakeBaseSheetViewModel.create(metadata, initialScreen)
+
+        paparazziRule.snapshot {
+            ViewModelStoreOwnerContext {
+                PaymentSheetScreen(viewModel = viewModel, type = PaymentSheetFlowType.Complete)
+            }
+        }
+    }
+
     @Test
     fun displaysError() {
         val metadata = PaymentMethodMetadataFactory.create()
@@ -55,4 +74,55 @@ internal class PaymentSheetScreenAddAnotherPaymentMethodScreenshotTest {
             }
         }
     }
+
+    @Test
+    fun displaysCardWithMandate() {
+        val metadata = PaymentMethodMetadataFactory.create(
+            stripeIntent = SetupIntentFixtures.SI_REQUIRES_PAYMENT_METHOD
+        )
+        val interactor = FakeAddPaymentMethodInteractor(initialState = createState(metadata))
+        val initialScreen = AddAnotherPaymentMethod(interactor)
+        val viewModel = FakeBaseSheetViewModel.create(metadata, initialScreen)
+
+        paparazziRule.snapshot {
+            ViewModelStoreOwnerContext {
+                PaymentSheetScreen(viewModel = viewModel, type = PaymentSheetFlowType.Complete)
+            }
+        }
+    }
+
+    @Test
+    fun displaysCheckboxWithMandate() {
+        val metadata = PaymentMethodMetadataFactory.create(
+            stripeIntent = SetupIntentFixtures.SI_REQUIRES_PAYMENT_METHOD,
+            hasCustomerConfiguration = true,
+            paymentMethodSaveConsentBehavior = PaymentMethodSaveConsentBehavior.Enabled,
+        )
+        val interactor = FakeAddPaymentMethodInteractor(initialState = createState(metadata))
+        val initialScreen = AddAnotherPaymentMethod(interactor)
+        val viewModel = FakeBaseSheetViewModel.create(metadata, initialScreen)
+
+        paparazziRule.snapshot {
+            ViewModelStoreOwnerContext {
+                PaymentSheetScreen(viewModel = viewModel, type = PaymentSheetFlowType.Complete)
+            }
+        }
+    }
+
+    @Test
+    fun displaysErrorWithMandate() {
+        val metadata = PaymentMethodMetadataFactory.create(
+            stripeIntent = SetupIntentFixtures.SI_REQUIRES_PAYMENT_METHOD,
+        )
+        val interactor = FakeAddPaymentMethodInteractor(initialState = createState(metadata))
+        val initialScreen = AddAnotherPaymentMethod(interactor)
+        val viewModel = FakeBaseSheetViewModel.create(metadata, initialScreen)
+        viewModel.onError("An error occurred.".resolvableString)
+
+        paparazziRule.snapshot {
+            ViewModelStoreOwnerContext {
+                PaymentSheetScreen(viewModel = viewModel, type = PaymentSheetFlowType.Complete)
+            }
+        }
+    }
 }
diff --git a/.../android/paymentsheet/navigation/PaymentSheetScreenAddFirstPaymentMethodScreenshotTest.kt b/.../android/paymentsheet/navigation/PaymentSheetScreenAddFirstPaymentMethodScreenshotTest.kt
@@ -5,6 +5,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.stripe.android.core.strings.resolvableString
 import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodMetadataFactory
+import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodSaveConsentBehavior
+import com.stripe.android.model.SetupIntentFixtures
 import com.stripe.android.paymentsheet.navigation.PaymentSheetScreen.AddFirstPaymentMethod
 import com.stripe.android.paymentsheet.ui.FakeAddPaymentMethodInteractor
 import com.stripe.android.paymentsheet.ui.FakeAddPaymentMethodInteractor.Companion.createState
@@ -30,7 +32,24 @@ internal class PaymentSheetScreenAddFirstPaymentMethodScreenshotTest {
     @Test
     fun displaysCard() {
         val metadata = PaymentMethodMetadataFactory.create()
-        val interactor = FakeAddPaymentMethodInteractor(initialState = createState())
+        val interactor = FakeAddPaymentMethodInteractor(initialState = createState(metadata))
+        val initialScreen = AddFirstPaymentMethod(interactor)
+        val viewModel = FakeBaseSheetViewModel.create(metadata, initialScreen)
+
+        paparazziRule.snapshot {
+            ViewModelStoreOwnerContext {
+                PaymentSheetScreen(viewModel = viewModel, type = PaymentSheetFlowType.Complete)
+            }
+        }
+    }
+
+    @Test
+    fun displaysCheckbox() {
+        val metadata = PaymentMethodMetadataFactory.create(
+            hasCustomerConfiguration = true,
+            paymentMethodSaveConsentBehavior = PaymentMethodSaveConsentBehavior.Enabled,
+        )
+        val interactor = FakeAddPaymentMethodInteractor(initialState = createState(metadata))
         val initialScreen = AddFirstPaymentMethod(interactor)
         val viewModel = FakeBaseSheetViewModel.create(metadata, initialScreen)
 
@@ -44,7 +63,58 @@ internal class PaymentSheetScreenAddFirstPaymentMethodScreenshotTest {
     @Test
     fun displaysError() {
         val metadata = PaymentMethodMetadataFactory.create()
-        val interactor = FakeAddPaymentMethodInteractor(initialState = createState())
+        val interactor = FakeAddPaymentMethodInteractor(initialState = createState(metadata))
+        val initialScreen = AddFirstPaymentMethod(interactor)
+        val viewModel = FakeBaseSheetViewModel.create(metadata, initialScreen)
+        viewModel.onError("An error occurred.".resolvableString)
+
+        paparazziRule.snapshot {
+            ViewModelStoreOwnerContext {
+                PaymentSheetScreen(viewModel = viewModel, type = PaymentSheetFlowType.Complete)
+            }
+        }
+    }
+
+    @Test
+    fun displaysCardWithMandate() {
+        val metadata = PaymentMethodMetadataFactory.create(
+            stripeIntent = SetupIntentFixtures.SI_REQUIRES_PAYMENT_METHOD
+        )
+        val interactor = FakeAddPaymentMethodInteractor(initialState = createState(metadata))
+        val initialScreen = AddFirstPaymentMethod(interactor)
+        val viewModel = FakeBaseSheetViewModel.create(metadata, initialScreen)
+
+        paparazziRule.snapshot {
+            ViewModelStoreOwnerContext {
+                PaymentSheetScreen(viewModel = viewModel, type = PaymentSheetFlowType.Complete)
+            }
+        }
+    }
+
+    @Test
+    fun displaysCheckboxWithMandate() {
+        val metadata = PaymentMethodMetadataFactory.create(
+            stripeIntent = SetupIntentFixtures.SI_REQUIRES_PAYMENT_METHOD,
+            hasCustomerConfiguration = true,
+            paymentMethodSaveConsentBehavior = PaymentMethodSaveConsentBehavior.Enabled,
+        )
+        val interactor = FakeAddPaymentMethodInteractor(initialState = createState(metadata))
+        val initialScreen = AddFirstPaymentMethod(interactor)
+        val viewModel = FakeBaseSheetViewModel.create(metadata, initialScreen)
+
+        paparazziRule.snapshot {
+            ViewModelStoreOwnerContext {
+                PaymentSheetScreen(viewModel = viewModel, type = PaymentSheetFlowType.Complete)
+            }
+        }
+    }
+
+    @Test
+    fun displaysErrorWithMandate() {
+        val metadata = PaymentMethodMetadataFactory.create(
+            stripeIntent = SetupIntentFixtures.SI_REQUIRES_PAYMENT_METHOD,
+        )
+        val interactor = FakeAddPaymentMethodInteractor(initialState = createState(metadata))
         val initialScreen = AddFirstPaymentMethod(interactor)
         val viewModel = FakeBaseSheetViewModel.create(metadata, initialScreen)
         viewModel.onError("An error occurred.".resolvableString)

diff --git a/...tSheetScreenAddAnotherPaymentMethodScreenshotTest_displaysCardWithMandate[].png b/...tSheetScreenAddAnotherPaymentMethodScreenshotTest_displaysCardWithMandate[].png
diff --git a/...tion_PaymentSheetScreenAddAnotherPaymentMethodScreenshotTest_displaysCard[].png b/...tion_PaymentSheetScreenAddAnotherPaymentMethodScreenshotTest_displaysCard[].png
diff --git a/...etScreenAddAnotherPaymentMethodScreenshotTest_displaysCheckboxWithMandate[].png b/...etScreenAddAnotherPaymentMethodScreenshotTest_displaysCheckboxWithMandate[].png
diff --git a/..._PaymentSheetScreenAddAnotherPaymentMethodScreenshotTest_displaysCheckbox[].png b/..._PaymentSheetScreenAddAnotherPaymentMethodScreenshotTest_displaysCheckbox[].png
diff --git a/...SheetScreenAddAnotherPaymentMethodScreenshotTest_displaysErrorWithMandate[].png b/...SheetScreenAddAnotherPaymentMethodScreenshotTest_displaysErrorWithMandate[].png
diff --git a/...ion_PaymentSheetScreenAddAnotherPaymentMethodScreenshotTest_displaysError[].png b/...ion_PaymentSheetScreenAddAnotherPaymentMethodScreenshotTest_displaysError[].png
diff --git a/...entSheetScreenAddFirstPaymentMethodScreenshotTest_displaysCardWithMandate[].png b/...entSheetScreenAddFirstPaymentMethodScreenshotTest_displaysCardWithMandate[].png
diff --git a/...gation_PaymentSheetScreenAddFirstPaymentMethodScreenshotTest_displaysCard[].png b/...gation_PaymentSheetScreenAddFirstPaymentMethodScreenshotTest_displaysCard[].png
diff --git a/...heetScreenAddFirstPaymentMethodScreenshotTest_displaysCheckboxWithMandate[].png b/...heetScreenAddFirstPaymentMethodScreenshotTest_displaysCheckboxWithMandate[].png
diff --git a/...on_PaymentSheetScreenAddFirstPaymentMethodScreenshotTest_displaysCheckbox[].png b/...on_PaymentSheetScreenAddFirstPaymentMethodScreenshotTest_displaysCheckbox[].png
diff --git a/...ntSheetScreenAddFirstPaymentMethodScreenshotTest_displaysErrorWithMandate[].png b/...ntSheetScreenAddFirstPaymentMethodScreenshotTest_displaysErrorWithMandate[].png
diff --git a/...ation_PaymentSheetScreenAddFirstPaymentMethodScreenshotTest_displaysError[].png b/...ation_PaymentSheetScreenAddFirstPaymentMethodScreenshotTest_displaysError[].png
diff --git a/...eenVerticalModeScreenshotTest_displaysVerticalModeListWithErrorAndMandate[].png b/...eenVerticalModeScreenshotTest_displaysVerticalModeListWithErrorAndMandate[].png
diff --git a/...ntSheetScreenVerticalModeScreenshotTest_displaysVerticalModeListWithError[].png b/...ntSheetScreenVerticalModeScreenshotTest_displaysVerticalModeListWithError[].png
diff --git a/...sheet.verticalmode_VerticalModeFormUIScreenshotTest_fullCardFormWithError[].png b/...sheet.verticalmode_VerticalModeFormUIScreenshotTest_fullCardFormWithError[].png