[PoC] Update email field in MPE Bank tab once Instant Debits completes

StripeCore/StripeCore/Source/Connections Bindings/InstantDebitsLinkedBank.swift

@@ -9,16 +9,20 @@ import Foundation
 
 @_spi(STP) public struct InstantDebitsLinkedBank: Equatable {
     public let paymentMethodId: String
+    public let email: String?
     public let bankName: String?
     public let last4: String?
     public let linkMode: LinkMode?
+
     public init(
         paymentMethodId: String,
+        email: String?,
         bankName: String?,
         last4: String?,
         linkMode: LinkMode?
     ) {
         self.paymentMethodId = paymentMethodId
+        self.email = email
         self.bankName = bankName
         self.last4 = last4
         self.linkMode = linkMode

StripeFinancialConnections/StripeFinancialConnections/Source/Native/NativeFlowController.swift

@@ -541,6 +541,7 @@ extension NativeFlowController {
             case .success(let paymentMethod):
                 let linkedBank = InstantDebitsLinkedBank(
                     paymentMethodId: paymentMethod.id,
+                    email: self.dataManager.consumerSession?.emailAddress,
                     bankName: bankAccountDetails?.bankName,
                     last4: bankAccountDetails?.last4,
                     linkMode: linkMode

StripeFinancialConnections/StripeFinancialConnections/Source/Web/FinancialConnectionsWebFlowViewController.swift

@@ -171,6 +171,7 @@ extension FinancialConnectionsWebFlowViewController {
                         {
                             let instantDebitsLinkedBank = InstantDebitsLinkedBank(
                                 paymentMethodId: paymentMethodId,
+                                email: Self.extractValue(from: returnUrl, key: "email"),
                                 bankName: Self.extractValue(from: returnUrl, key: "bank_name")?
                                 // backend can return "+" instead of a more-common encoding of "%20" for spaces
                                     .replacingOccurrences(of: "+", with: " "),

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/Elements/TextField/TextFieldElement+Card.swift

@@ -23,6 +23,7 @@ extension TextFieldElement {
         let defaultValue: String?
         let cardBrandDropDown: DropdownFieldElement?
         let cardFilter: CardBrandFilter
+        var isEditable: Bool = true
 
         init(defaultValue: String? = nil, cardBrandDropDown: DropdownFieldElement? = nil, cardFilter: CardBrandFilter = .default) {
             self.defaultValue = defaultValue
@@ -197,6 +198,7 @@ extension TextFieldElement {
         let cardBrandProvider: () -> (STPCardBrand)
         var label = String.Localized.cvc
         let disallowedCharacters: CharacterSet = .stp_invertedAsciiDigit
+        var isEditable: Bool = true
 
         func keyboardProperties(for text: String) -> KeyboardProperties {
             return .init(type: .asciiCapableNumberPad, textContentType: nil, autocapitalization: .none)
@@ -235,6 +237,7 @@ extension TextFieldElement {
         let accessibilityLabel: String = String.Localized.expiration_date_accessibility_label
         let disallowedCharacters: CharacterSet = .stp_invertedAsciiDigit
         let defaultValue: String?
+        var isEditable: Bool = true
         func keyboardProperties(for text: String) -> KeyboardProperties {
             return .init(type: .asciiCapableNumberPad, textContentType: nil, autocapitalization: .none)
         }
@@ -316,7 +319,7 @@ extension TextFieldElement {
     struct LastFourConfiguration: TextFieldElementConfiguration {
         let label = String.Localized.card_brand
         let lastFour: String
-        let isEditable = false
+        var isEditable = false
         let cardBrandDropDown: DropdownFieldElement
         let cardFilter: CardBrandFilter
 

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/Elements/TextField/TextFieldElement+IBAN.swift

@@ -58,6 +58,7 @@ extension TextFieldElement {
     struct IBANConfiguration: TextFieldElementConfiguration {
         let label: String = STPLocalizedString("IBAN", "Label for an IBAN field")
         let defaultValue: String?
+        var isEditable: Bool = true
         func maxLength(for text: String) -> Int {
             return 34
         }

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/New Payment Method Screen/AddPaymentMethodViewController.swift

@@ -38,7 +38,8 @@ class AddPaymentMethodViewController: UIViewController {
         paymentMethodTypesView.selected
     }
     var paymentOption: PaymentOption? {
-        paymentMethodFormViewController.paymentOption
+        print("**** didGet paymentOption, \(paymentMethodFormViewController.paymentOption != nil)")
+        return paymentMethodFormViewController.paymentOption
     }
 
     var overridePrimaryButtonState: OverridePrimaryButtonState? {

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/PaymentSheetFormFactory/PaymentSheetFormFactory.swift

@@ -245,9 +245,13 @@ extension PaymentSheetFormFactory {
         }
     }
 
-    func makeEmail(apiPath: String? = nil) -> PaymentMethodElementWrapper<TextFieldElement> {
+    func makeEmail(apiPath: String? = nil, isOptional: Bool = false) -> PaymentMethodElementWrapper<TextFieldElement> {
         let defaultValue = defaultBillingDetails(emailAPIPath: apiPath).email
-        let element = TextFieldElement.makeEmail(defaultValue: defaultValue, theme: theme)
+        let element = TextFieldElement.makeEmail(
+            defaultValue: defaultValue,
+            isOptional: isOptional,
+            theme: theme
+        )
         return PaymentMethodElementWrapper(element) { textField, params in
             if let apiPath = apiPath {
                 params.paymentMethodParams.additionalAPIParameters[apiPath] = textField.text
@@ -656,7 +660,7 @@ extension PaymentSheetFormFactory {
                     )
                 }
             }(),
-            emailElement: makeEmail(),
+            emailElement: makeEmail(isOptional: true),
             theme: theme
         )
     }

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/USBankAccount/InstantDebitsPaymentMethodElement.swift

@@ -23,9 +23,14 @@ final class InstantDebitsPaymentMethodElement: ContainerElement {
         return [linkedBankInfoSectionElement]
     }
     private let linkedBankInfoSectionElement: SectionElement
+    private var linkedBank: InstantDebitsLinkedBank? {
+        didSet {
+            // Disable email field if we have a linked bank
+            emailElement.isEnabled = linkedBank == nil
+        }
+    }
     private let emailElement: TextFieldElement
     private let linkedBankInfoView: BankAccountInfoView
-    private var linkedBank: InstantDebitsLinkedBank?
     private let theme: ElementsAppearance
     var presentingViewControllerDelegate: PresentingViewControllerDelegate?
 
@@ -65,10 +70,16 @@ final class InstantDebitsPaymentMethodElement: ContainerElement {
     }
 
     var enableCTA: Bool {
-        return STPEmailAddressValidator.stringIsValidEmailAddress(email)
+        true
     }
+
     var email: String {
-        return emailElement.text
+        get {
+            emailElement.text
+        }
+        set {
+            emailElement.setText(newValue)
+        }
     }
 
     init(
@@ -117,6 +128,9 @@ final class InstantDebitsPaymentMethodElement: ContainerElement {
                 animated: true
             )
         }
+        if let email = linkedBank.email {
+            self.email = email
+        }
         self.delegate?.didUpdate(element: self)
     }
 

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/ViewControllers/PaymentMethodFormViewController.swift

@@ -317,6 +317,8 @@ extension PaymentMethodFormViewController {
             case .completed(let completedResult):
                 if case .financialConnections(let linkedBank) = completedResult {
                     usBankAccountFormElement.linkedBank = linkedBank
+                } else if case .instantDebits(let linkedBank) = completedResult {
+                    self.instantDebitsFormElement?.setLinkedBank(linkedBank)
                 } else {
                     self.delegate?.updateErrorLabel(for: genericError)
                 }

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/ViewControllers/PaymentSheetViewController.swift

@@ -353,6 +353,7 @@ class PaymentSheetViewController: UIViewController, PaymentSheetViewControllerPr
                 callToAction = overridePrimaryButtonState.ctaType
                 buyButtonStatus = overridePrimaryButtonState.enabled ? .enabled : .disabled
             } else {
+                print("**** buyButtonStatus: \(addPaymentMethodViewController.paymentOption == nil ? "disabled" : "enabled")")
                 buyButtonStatus = addPaymentMethodViewController.paymentOption == nil ? .disabled : .enabled
             }
         }

StripeUICore/StripeUICore/Source/Elements/Factories/IDNumberTextFieldConfiguration.swift

@@ -23,15 +23,22 @@ import Foundation
     let type: IDNumberType?
     public let label: String
     public let defaultValue: String?
+    public var isEditable: Bool
 
     /**
      - Parameters:
        - type: The type of ID number that should be validated in this input field. If the ID type is unknown, passing `nil` will produce a configuration with no restrictions on the input.
        - label: The label of the field
      */
-    public init(type: IDNumberType?, label: String, defaultValue: String?) {
+    public init(
+        type: IDNumberType?,
+        label: String,
+        isEditable: Bool = true,
+        defaultValue: String?
+    ) {
         self.type = type
         self.label = label
+        self.isEditable = isEditable
         self.defaultValue = defaultValue
     }
 

StripeUICore/StripeUICore/Source/Elements/Factories/TextFieldElement+AccountFactory.swift

@@ -21,6 +21,7 @@ import UIKit
             func maxLength(for text: String) -> Int {
                 return 6
             }
+            var isEditable: Bool = true
             let defaultValue: String?
             func subLabel(text: String) -> String? {
                 return BSBNumberProvider.shared.bsbName(for: text)
@@ -57,6 +58,7 @@ import UIKit
             let label = String.Localized.accountNumber
             let disallowedCharacters: CharacterSet = .stp_invertedAsciiDigit
             let numberOfDigitsRequired = 9
+            var isEditable: Bool = true
 
             func maxLength(for text: String) -> Int {
                 return numberOfDigitsRequired
@@ -85,6 +87,7 @@ import UIKit
 
             let label = STPLocalizedString("Sort code", "Placeholder for Bacs sort code (a bank routing number used in the UK and Ireland)")
             let disallowedCharacters: CharacterSet = .stp_invertedAsciiDigit
+            var isEditable: Bool = true
             func maxLength(for text: String) -> Int {
                 return 6
             }
@@ -120,6 +123,7 @@ import UIKit
             let label = String.Localized.accountNumber
             let disallowedCharacters: CharacterSet = .stp_invertedAsciiDigit
             let numberOfDigitsRequired = 8
+            var isEditable: Bool = true
 
             func maxLength(for text: String) -> Int {
                 return numberOfDigitsRequired

StripeUICore/StripeUICore/Source/Elements/Factories/TextFieldElement+AddressFactory.swift

@@ -26,6 +26,7 @@ import UIKit
                 case line1Autocompletable(didTapAutocomplete: () -> Void)
             }
             let lineType: LineType
+            var isEditable: Bool
             var label: String {
                 switch lineType {
                 case .line1, .line1Autocompletable:
@@ -69,24 +70,56 @@ import UIKit
                 }
                 return nil
             }
+
+            init(lineType: LineType, isEditable: Bool = true, defaultValue: String?) {
+                self.lineType = lineType
+                self.isEditable = isEditable
+                self.defaultValue = defaultValue
+            }
         }
 
-        public static func makeLine1(defaultValue: String?, theme: ElementsAppearance) -> TextFieldElement {
-            return TextFieldElement(
-                configuration: LineConfiguration(lineType: .line1, defaultValue: defaultValue), theme: theme
+        public static func makeLine1(
+            defaultValue: String?,
+            isEditable: Bool = true,
+            theme: ElementsAppearance
+        ) -> TextFieldElement {
+            TextFieldElement(
+                configuration: LineConfiguration(
+                    lineType: .line1,
+                    isEditable: isEditable,
+                    defaultValue: defaultValue
+                ),
+                theme: theme
             )
         }
 
-        static func makeLine2(defaultValue: String?, theme: ElementsAppearance) -> TextFieldElement {
-            let line2 = TextFieldElement(
-                configuration: LineConfiguration(lineType: .line2, defaultValue: defaultValue), theme: theme
+        static func makeLine2(
+            defaultValue: String?,
+            isEditable: Bool = true,
+            theme: ElementsAppearance
+        ) -> TextFieldElement {
+            TextFieldElement(
+                configuration: LineConfiguration(
+                    lineType: .line2,
+                    isEditable: isEditable,
+                    defaultValue: defaultValue
+                ),
+                theme: theme
             )
-            return line2
         }
 
-        public static func makeAutoCompleteLine(defaultValue: String?, theme: ElementsAppearance) -> TextFieldElement {
-            return TextFieldElement(
-                configuration: LineConfiguration(lineType: .autoComplete, defaultValue: defaultValue), theme: theme
+        public static func makeAutoCompleteLine(
+            defaultValue: String?,
+            isEditable: Bool = true,
+            theme: ElementsAppearance
+        ) -> TextFieldElement {
+            TextFieldElement(
+                configuration: LineConfiguration(
+                    lineType: .autoComplete,
+                    isEditable: isEditable,
+                    defaultValue: defaultValue
+                ),
+                theme: theme
             )
         }
 
@@ -96,6 +129,7 @@ import UIKit
             let label: String
             let defaultValue: String?
             let isOptional: Bool
+            var isEditable: Bool = true
 
             func keyboardProperties(for text: String) -> TextFieldElement.KeyboardProperties {
                 return .init(type: .default, textContentType: .addressCity, autocapitalization: .words)
@@ -108,6 +142,7 @@ import UIKit
             let label: String
             let defaultValue: String?
             let isOptional: Bool
+            var isEditable: Bool = true
 
             func keyboardProperties(for text: String) -> TextFieldElement.KeyboardProperties {
                 return .init(type: .default, textContentType: .addressState, autocapitalization: .words)
@@ -121,6 +156,7 @@ import UIKit
             let label: String
             let defaultValue: String?
             let isOptional: Bool
+            var isEditable: Bool = true
             public var disallowedCharacters: CharacterSet {
                 return countryCode == "US" ? .decimalDigits.inverted : .newlines
             }