Updates based on feedback

StripePaymentSheet/StripePaymentSheet/Source/Internal/Link/Components/PaymentMethodPicker/LinkPaymentMethodPicker-Cell.swift

@@ -193,17 +193,15 @@ extension LinkPaymentMethodPicker {
             contentView.paymentMethod = paymentMethod
             updateAccessibilityContent()
 
-            guard let paymentMethod = paymentMethod else {
+            guard let paymentMethod else {
                 return
             }
 
             var hasExpired: Bool {
                 switch paymentMethod.details {
                 case .card(let card):
                     return card.hasExpired
-                case .bankAccount:
-                    return false
-                case .unparsable:
+                case .bankAccount, .unparsable:
                     return false
                 }
             }
@@ -228,7 +226,7 @@ extension LinkPaymentMethodPicker {
         }
 
         private func updateAccessibilityContent() {
-            guard let paymentMethod = paymentMethod else {
+            guard let paymentMethod else {
                 return
             }
 

StripePaymentSheet/StripePaymentSheet/Source/Internal/Link/Components/PaymentMethodPicker/LinkPaymentMethodPicker.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 
+@_spi(STP) import StripeCore
 @_spi(STP) import StripeUICore
 
 protocol LinkPaymentMethodPickerDelegate: AnyObject {
@@ -55,6 +56,7 @@ final class LinkPaymentMethodPicker: UIView {
         let count = dataSource?.numberOfPaymentMethods(in: self) ?? 0
 
         guard selectedIndex >= 0 && selectedIndex < count else {
+            stpAssertionFailure()
             return nil
         }
 
@@ -142,7 +144,7 @@ final class LinkPaymentMethodPicker: UIView {
 
         // Prevent double header animation
         if headerView.isExpanded {
-            // TODO(ramont): revise layout margin placement and remove conditional
+            // TODO(link): revise layout margin placement and remove conditional
             setNeedsLayout()
             layoutIfNeeded()
         } else {
@@ -199,11 +201,12 @@ extension LinkPaymentMethodPicker {
 
     func reloadCell(at index: Int) {
         guard let cell = listView.arrangedSubviews[index] as? Cell else {
-            preconditionFailure("Cell not found at index: \(index)")
+            stpAssertionFailure("Cell not found at index: \(index)")
+            return
         }
 
         guard let dataSource = dataSource else {
-            assertionFailure("Data source not configured.")
+            stpAssertionFailure("Data source not configured.")
             return
         }
 
@@ -216,15 +219,17 @@ extension LinkPaymentMethodPicker {
 
     func showLoader(at index: Int) {
         guard let cell = listView.arrangedSubviews[index] as? Cell else {
-            preconditionFailure("Cell not found at index: \(index)")
+            stpAssertionFailure("Cell not found at index: \(index)")
+            return
         }
 
         cell.isLoading = true
     }
 
     func hideLoader(at index: Int) {
         guard let cell = listView.arrangedSubviews[index] as? Cell else {
-            preconditionFailure("Cell not found at index: \(index)")
+            stpAssertionFailure("Cell not found at index: \(index)")
+            return
         }
 
         cell.isLoading = false
@@ -308,7 +313,7 @@ extension LinkPaymentMethodPicker: LinkPaymentMethodPickerCellDelegate {
 
     func savedPaymentPickerCell(_ cell: Cell, didTapMenuButton button: UIButton) {
         guard let index = index(for: cell) else {
-            assertionFailure("Index not found")
+            stpAssertionFailure("Index not found")
             return
         }
 

StripePaymentSheet/StripePaymentSheet/Source/Internal/Link/Elements/LinkCardEditElement.swift

@@ -12,7 +12,7 @@
 @_spi(STP) import StripeUICore
 import UIKit
 
-// TODO(ramont): Remove after migrating to modern bindings
+// TODO(link): Remove after migrating to modern bindings
 fileprivate extension ConsumerPaymentDetails {
     var cardDetails: Details.Card? {
         switch details {
@@ -58,7 +58,7 @@ final class LinkCardEditElement: Element {
             return nil
         }
 
-        // TODO(ramont): Replace `STPPaymentMethodBillingDetails` with a custom struct for Link.
+        // TODO(link): Replace `STPPaymentMethodBillingDetails` with a custom struct for Link.
         // This matches the object that was returned by CardDetailsEditView, but won't work
         // with `collectionMode: .all`, because extra fields won't match what expected by Link.
         let billingDetails = STPPaymentMethodBillingDetails()

StripePaymentSheet/StripePaymentSheet/Source/Internal/Link/Verification/LinkVerificationView.swift

@@ -80,8 +80,7 @@ final class LinkVerificationView: UIView {
     }()
 
     private(set) lazy var codeField: OneTimeCodeTextField = {
-        let codeField = OneTimeCodeTextField(configuration:
-                .init(numberOfDigits: 6),
+        let codeField = OneTimeCodeTextField(configuration: .init(numberOfDigits: 6),
                                              theme: LinkUI.appearance.asElementsTheme)
         codeField.addTarget(self, action: #selector(oneTimeCodeFieldChanged(_:)), for: .valueChanged)
         return codeField

StripePaymentSheet/StripePaymentSheet/Source/Internal/Link/Verification/LinkVerificationViewController-PresentationController.swift

@@ -28,7 +28,7 @@ extension LinkVerificationViewController {
         ///
         ///  This is always equals to the container view safe area minus `padding` on eat edge.
         private var safeFrame: CGRect {
-            guard let containerView = containerView else {
+            guard let containerView else {
                 return .zero
             }
 
@@ -52,7 +52,7 @@ extension LinkVerificationViewController {
         }
 
         override var frameOfPresentedViewInContainerView: CGRect {
-            guard let containerView = containerView else {
+            guard let containerView else {
                 return .zero
             }
 
@@ -95,7 +95,7 @@ extension LinkVerificationViewController {
         override func containerViewWillLayoutSubviews() {
             super.containerViewWillLayoutSubviews()
 
-            guard let containerView = containerView else {
+            guard let containerView else {
                 return
             }
 
@@ -106,7 +106,7 @@ extension LinkVerificationViewController {
         override func presentationTransitionWillBegin() {
             super.presentationTransitionWillBegin()
 
-            guard let containerView = containerView,
+            guard let containerView,
                   let transitionCoordinator = presentedViewController.transitionCoordinator else {
                 return
             }
@@ -188,7 +188,7 @@ extension LinkVerificationViewController.PresentationController {
         let userInfo = notification.userInfo
 
         guard let keyboardFrame = userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect,
-              let containerView = containerView else {
+              let containerView else {
             return
         }
 

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/BottomSheet/BottomSheetPresentationController.swift

@@ -23,7 +23,7 @@ class BottomSheetPresentationController: UIPresentationController {
         return presentedViewController as? BottomSheetPresentable
     }
     private lazy var fullHeightConstraint: NSLayoutConstraint = {
-        guard let containerView = containerView else {
+        guard let containerView else {
             assertionFailure()
             return NSLayoutConstraint()
         }
@@ -135,7 +135,7 @@ class BottomSheetPresentationController: UIPresentationController {
 extension BottomSheetPresentationController {
 
     fileprivate func installConstraints() {
-        guard let containerView = containerView else { return }
+        guard let containerView else { return }
 
         // Add a dimmed view behind the view controller
         containerView.addAndPinSubview(backgroundView)