[NT-549] Keyboard dismissal when user taps save (#1058)

* zipcodeTextField is not longer a first responder when user taps save after entering card info * removed zipcodeTextFieldBecomeFirstResponder untested output * removed paymentCardTextFieldDidEndEditing
kickstarter · Feb 5, 2020 · 84a3ca9 · 84a3ca9
1 parent 09457af
commit 84a3ca9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 24 deletions.
diff --git a/Kickstarter-iOS/Views/Controllers/AddNewCardViewController.swift b/Kickstarter-iOS/Views/Controllers/AddNewCardViewController.swift
@@ -224,12 +224,6 @@ internal final class AddNewCardViewController: UIViewController,
         self?.messageBannerViewController?.showBanner(with: .error, message: errorMessage)
       }
 
-    self.viewModel.outputs.zipcodeTextFieldBecomeFirstResponder
-      .observeForControllerAction()
-      .observeValues { [weak self] _ in
-        self?.zipcodeView.textField.becomeFirstResponder()
-      }
-
     Keyboard.change
       .observeForUI()
       .observeValues { [weak self] change in
@@ -375,10 +369,6 @@ extension AddNewCardViewController {
       textField.expirationYear, textField.cvc, stpCardBrand.creditCardType
     ))
   }
-
-  internal func paymentCardTextFieldDidEndEditing(_: STPPaymentCardTextField) {
-    self.viewModel.inputs.paymentCardTextFieldDidEndEditing()
-  }
 }
 
 // MARK: - Styles

diff --git a/Library/ViewModels/AddNewCardViewModel.swift b/Library/ViewModels/AddNewCardViewModel.swift
@@ -19,7 +19,6 @@ public protocol AddNewCardViewModelInputs {
   func cardholderNameTextFieldReturn()
   func creditCardChanged(cardDetails: CardDetails)
   func configure(with intent: AddNewCardIntent, project: Project?)
-  func paymentCardTextFieldDidEndEditing()
   func paymentInfo(isValid: Bool)
   func rememberThisCardToggleChanged(to value: Bool)
   func saveButtonTapped()
@@ -45,7 +44,6 @@ public protocol AddNewCardViewModelOutputs {
   var saveButtonIsEnabled: Signal<Bool, Never> { get }
   var setStripePublishableKey: Signal<String, Never> { get }
   var unsupportedCardBrandErrorText: Signal<String, Never> { get }
-  var zipcodeTextFieldBecomeFirstResponder: Signal<Void, Never> { get }
 }
 
 public protocol AddNewCardViewModelType {
@@ -78,7 +76,6 @@ public final class AddNewCardViewModel: AddNewCardViewModelType, AddNewCardViewM
 
     self.cardholderNameBecomeFirstResponder = self.viewDidLoadProperty.signal
     self.paymentDetailsBecomeFirstResponder = self.cardholderNameTextFieldReturnProperty.signal
-    self.zipcodeTextFieldBecomeFirstResponder = self.paymentCardTextFieldDidEndEditingProperty.signal
 
     let zipcode = self.zipcodeProperty.signal.skipNil()
     let zipcodeIsValid: Signal<Bool, Never> = zipcode.map { !$0.isEmpty }
@@ -241,11 +238,6 @@ public final class AddNewCardViewModel: AddNewCardViewModelType, AddNewCardViewM
     self.addNewCardIntentAndProjectProperty.value = (intent, project)
   }
 
-  private let paymentCardTextFieldDidEndEditingProperty = MutableProperty(())
-  public func paymentCardTextFieldDidEndEditing() {
-    self.paymentCardTextFieldDidEndEditingProperty.value = ()
-  }
-
   private let paymentInfoIsValidProperty = MutableProperty(false)
   public func paymentInfo(isValid: Bool) {
     self.paymentInfoIsValidProperty.value = isValid
@@ -306,7 +298,6 @@ public final class AddNewCardViewModel: AddNewCardViewModelType, AddNewCardViewM
   public let saveButtonIsEnabled: Signal<Bool, Never>
   public let setStripePublishableKey: Signal<String, Never>
   public let unsupportedCardBrandErrorText: Signal<String, Never>
-  public let zipcodeTextFieldBecomeFirstResponder: Signal<Void, Never>
 
   public var inputs: AddNewCardViewModelInputs { return self }
   public var outputs: AddNewCardViewModelOutputs { return self }

diff --git a/Library/ViewModels/AddNewCardViewModelTests.swift b/Library/ViewModels/AddNewCardViewModelTests.swift
@@ -27,7 +27,6 @@ internal final class AddNewCardViewModelTests: TestCase {
   private let setStripePublishableKey = TestObserver<String, Never>()
   private let unsupportedCardBrandErrorText = TestObserver<String, Never>()
   private let zipcode = TestObserver<String, Never>()
-  private let zipcodeTextFieldBecomeFirstResponder = TestObserver<Void, Never>()
 
   override func setUp() {
     super.setUp()
@@ -55,8 +54,6 @@ internal final class AddNewCardViewModelTests: TestCase {
     self.vm.outputs.saveButtonIsEnabled.observe(self.saveButtonIsEnabled.observer)
     self.vm.outputs.setStripePublishableKey.observe(self.setStripePublishableKey.observer)
     self.vm.outputs.unsupportedCardBrandErrorText.observe(self.unsupportedCardBrandErrorText.observer)
-    self.vm.outputs.zipcodeTextFieldBecomeFirstResponder
-      .observe(self.zipcodeTextFieldBecomeFirstResponder.observer)
   }
 
   func testZipcodeTextFieldReturn_submitsPaymentDetails() {
@@ -172,7 +169,6 @@ internal final class AddNewCardViewModelTests: TestCase {
   func testBecomeFirstResponder() {
     self.cardholderNameBecomeFirstResponder.assertDidNotEmitValue()
     self.paymentDetailsBecomeFirstResponder.assertDidNotEmitValue()
-    self.zipcodeTextFieldBecomeFirstResponder.assertDidNotEmitValue()
     self.activityIndicatorShouldShow.assertDidNotEmitValue()
     self.saveButtonIsEnabled.assertDidNotEmitValue()
 
@@ -182,7 +178,6 @@ internal final class AddNewCardViewModelTests: TestCase {
     self.cardholderNameBecomeFirstResponder
       .assertValueCount(1, "Cardholder name field is first responder when view loads.")
     self.paymentDetailsBecomeFirstResponder.assertDidNotEmitValue("Not first responder when view loads")
-    self.zipcodeTextFieldBecomeFirstResponder.assertDidNotEmitValue()
     self.vm.inputs.cardholderNameChanged("")
     self.vm.inputs.paymentInfo(isValid: false)
     self.vm.inputs.zipcodeChanged(zipcode: "")