Fixups

stripe · Jan 29, 2025 · 620b8a5 · 620b8a5
1 parent 8754db5
commit 620b8a5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/...entSheet/StripePaymentSheet/Source/PaymentSheet/Embedded/EmbeddedPaymentMethodsView.swift b/...entSheet/StripePaymentSheet/Source/PaymentSheet/Embedded/EmbeddedPaymentMethodsView.swift
@@ -380,22 +380,24 @@ class EmbeddedPaymentMethodsView: UIView {
             }
         }()
         let selection: Selection = .saved(paymentMethod: savedPaymentMethod)
-        let savedPaymentMethodButton = RowButton.makeForSavedPaymentMethod(paymentMethod: savedPaymentMethod,
-                                                                           appearance: rowButtonAppearance,
-                                                                           rightAccessoryView: accessoryButton,
-                                                                           isEmbedded: true,
-                                                                           didTap: { [weak self] _ in
-            CustomerPaymentOption.setDefaultPaymentMethod(
-                .stripeId(savedPaymentMethod.stripeId),
-                forCustomer: self?.customer?.id
-            )
-           self?.didTap(selection: selection)
-        })
+        let savedPaymentMethodButton = RowButton.makeForSavedPaymentMethod(
+            paymentMethod: savedPaymentMethod,
+            appearance: rowButtonAppearance,
+            rightAccessoryView: accessoryButton,
+            isEmbedded: true,
+            didTap: { [weak self] _ in
+                CustomerPaymentOption.setDefaultPaymentMethod(
+                    .stripeId(savedPaymentMethod.stripeId),
+                    forCustomer: self?.customer?.id
+                )
+                self?.didTap(selection: selection)
+            }
+        )
         return savedPaymentMethodButton
     }
 
     func makePaymentMethodRowButton(paymentMethodType: PaymentSheet.PaymentMethodType, savedPaymentMethods: [STPPaymentMethod]) -> RowButton {
-        // We always add a hidden accessory button ("Change >") so we can un-hide if needed
+        // We always add a hidden accessory button ("Change >") so we can show/hide it easily
         let accessoryButton = RowButton.RightAccessoryButton(
             accessoryType: appearance.embeddedPaymentElement.row.style == .flatWithCheckmark ? .changeWithChevron : .change,
             appearance: appearance,

diff --git a/...ePaymentSheet/StripePaymentSheet/Source/PaymentSheet/Vertical Main Screen/RowButton.swift b/...ePaymentSheet/StripePaymentSheet/Source/PaymentSheet/Vertical Main Screen/RowButton.swift
@@ -210,9 +210,13 @@ class RowButton: UIView {
             imageView.widthAnchor.constraint(equalToConstant: 24),
         ]
 
-        let isSavedPMRow = rightAccessoryView != nil
-        if isFlatWithCheckmarkStyle, isSavedPMRow {
-            labelsStackView.setCustomSpacing(8, after: label)
+        if isFlatWithCheckmarkStyle, let rightAccessoryView, !rightAccessoryView.isHidden {
+            // In flat_with_checkmark, we need additional vertical space around the View More / Change accessory view.
+            if sublabel.isHidden {
+                labelsStackView.setCustomSpacing(8, after: sublabel)
+            } else {
+                labelsStackView.setCustomSpacing(8, after: label)
+            }
             imageViewConstraints.append(imageView.centerYAnchor.constraint(equalTo: label.centerYAnchor))
         } else {
             imageViewConstraints.append(imageView.centerYAnchor.constraint(equalTo: centerYAnchor))
@@ -351,7 +355,7 @@ class RowButton: UIView {
             return
         }
         // Don't do this if we *are* the tallest variant; otherwise we'll infinite loop!
-        guard sublabel?.text?.isEmpty ?? true else {
+        guard sublabel.text?.isEmpty ?? true else {
             return
         }
         heightConstraint = heightAnchor.constraint(equalToConstant: Self.calculateTallestHeight(appearance: appearance, isEmbedded: isEmbedded))
@@ -442,7 +446,7 @@ extension RowButton {
     ) -> RowButton {
         let imageView = PaymentMethodTypeImageView(paymentMethodType: paymentMethodType, backgroundColor: appearance.colors.componentBackground)
         imageView.contentMode = .scaleAspectFit
-        
+
         // Special case "New card" vs "Card" title
         let text: String = {
             if hasSavedCard && paymentMethodType == .stripe(.card) {

diff --git a/...et/Source/PaymentSheet/Vertical Main Screen/VerticalPaymentMethodListViewController.swift b/...et/Source/PaymentSheet/Vertical Main Screen/VerticalPaymentMethodListViewController.swift
@@ -252,7 +252,7 @@ enum VerticalPaymentMethodListSelection: Equatable, Hashable {
             return false
         }
     }
-    
+
     func hash(into hasher: inout Hasher) {
         switch self {
         case .new(let paymentMethodType):