From 3828004d34b3a7cc86b43d53dd1b5fb9631bd1a6 Mon Sep 17 00:00:00 2001 From: Nate Heagy Date: Thu, 19 Oct 2017 16:09:45 -0600 Subject: [PATCH 1/2] Stop clearing email when social signin fails --- WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift index aaf35781a9b4..3db1d268d2da 100644 --- a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift @@ -476,7 +476,6 @@ extension LoginEmailViewController: GIDSignInDelegate { extension LoginEmailViewController: LoginSocialErrorViewControllerDelegate { private func cleanupAfterSocialErrors() { - loginFields.username = "" dismiss(animated: true) {} } From e21cad12bff00786f37d824d886a783772cb0bd0 Mon Sep 17 00:00:00 2001 From: Nate Heagy Date: Fri, 20 Oct 2017 15:34:43 -0600 Subject: [PATCH 2/2] Fix behaviour of email field after Google login fails --- .../Classes/ViewRelated/NUX/LoginEmailViewController.swift | 2 ++ WordPress/Classes/ViewRelated/NUX/SignupViewController.swift | 1 + 2 files changed, 3 insertions(+) diff --git a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift index 3db1d268d2da..22da3004c88d 100644 --- a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift @@ -480,6 +480,7 @@ extension LoginEmailViewController: LoginSocialErrorViewControllerDelegate { } func retryWithEmail() { + loginFields.username = "" cleanupAfterSocialErrors() } func retryWithAddress() { @@ -490,6 +491,7 @@ extension LoginEmailViewController: LoginSocialErrorViewControllerDelegate { cleanupAfterSocialErrors() let storyboard = UIStoryboard(name: "Login", bundle: nil) if let controller = storyboard.instantiateViewController(withIdentifier: "SignupViewController") as? NUXAbstractViewController { + controller.loginFields = loginFields navigationController?.pushViewController(controller, animated: true) } } diff --git a/WordPress/Classes/ViewRelated/NUX/SignupViewController.swift b/WordPress/Classes/ViewRelated/NUX/SignupViewController.swift index 7066918634d7..ffb4b5b762ff 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupViewController.swift @@ -74,6 +74,7 @@ import WordPressShared // Update special case login fields. loginFields.meta.userIsDotCom = true + emailField.text = loginFields.emailAddress configureLayoutForSmallScreensIfNeeded() configureSubmitButton(animating: false)