From 04e161f7b0c6907bc088b4ded7137329eead8773 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Wed, 18 Mar 2020 11:45:31 -0500
Subject: [PATCH 01/18] Remove .showLinkMailView from Login.storyboard

---
 WordPressAuthenticator/Signin/Login.storyboard | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard
index 64617b607..30f32eded 100644
--- a/WordPressAuthenticator/Signin/Login.storyboard
+++ b/WordPressAuthenticator/Signin/Login.storyboard
@@ -1020,7 +1020,6 @@
                         <outlet property="label" destination="CmN-ir-1YK" id="Xhc-3L-kvy"/>
                         <outlet property="sendLinkButton" destination="iIy-Sm-1r0" id="9My-fJ-l9S"/>
                         <outlet property="usePasswordButton" destination="B6x-b7-hU9" id="mB8-03-VBa"/>
-                        <segue destination="Aii-0z-zLC" kind="show" identifier="showLinkMailView" id="xs3-qG-RaP"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="cja-vu-y88" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1183,14 +1182,6 @@
             </objects>
             <point key="canvasLocation" x="794" y="1179"/>
         </scene>
-        <!--LinkMailView-->
-        <scene sceneID="UUd-M2-Fvg">
-            <objects>
-                <viewControllerPlaceholder storyboardIdentifier="LinkMailView" storyboardName="EmailMagicLink" referencedIdentifier="LinkMailView" id="Aii-0z-zLC" sceneMemberID="viewController"/>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="WTT-3e-E71" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="3355" y="255"/>
-        </scene>
         <!--Login Username Password View Controller-->
         <scene sceneID="b9v-Sc-w6J">
             <objects>
@@ -1471,7 +1462,7 @@
         <segue reference="N3P-wt-Rn3"/>
         <segue reference="Njv-lY-Lyi"/>
         <segue reference="2Of-BA-xqb"/>
-        <segue reference="UV4-XI-c0q"/>
+        <segue reference="0ao-yi-yZI"/>
         <segue reference="4SK-mG-U33"/>
         <segue reference="nCA-u7-fKm"/>
         <segue reference="swV-lc-6gI"/>

From c8ebc5b88a72d7b5fcd7b531625eda9658aed3cb Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Wed, 18 Mar 2020 11:47:02 -0500
Subject: [PATCH 02/18] Remove .showLinkMailView storyboardID from
 EmailMagicLink.storyboard

---
 WordPressAuthenticator/Signin/EmailMagicLink.storyboard | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPressAuthenticator/Signin/EmailMagicLink.storyboard b/WordPressAuthenticator/Signin/EmailMagicLink.storyboard
index 976e00ad5..5f8b0ddde 100644
--- a/WordPressAuthenticator/Signin/EmailMagicLink.storyboard
+++ b/WordPressAuthenticator/Signin/EmailMagicLink.storyboard
@@ -52,7 +52,7 @@
         <!--Link Mail View Controller-->
         <scene sceneID="zhV-IL-bW4">
             <objects>
-                <viewController storyboardIdentifier="LinkMailView" extendedLayoutIncludesOpaqueBars="YES" useStoryboardIdentifierAsRestorationIdentifier="YES" id="GSd-vy-rpZ" customClass="NUXLinkMailViewController" customModule="WordPressAuthenticator" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="NUXLinkMailViewController" extendedLayoutIncludesOpaqueBars="YES" useStoryboardIdentifierAsRestorationIdentifier="YES" id="GSd-vy-rpZ" customClass="NUXLinkMailViewController" customModule="WordPressAuthenticator" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="s8Z-uG-nj5"/>
                         <viewControllerLayoutGuide type="bottom" id="vKK-Mm-0yR"/>
@@ -91,7 +91,7 @@
                                             </mask>
                                         </variation>
                                     </label>
-                                    <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="749" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Iy-9H-ykD" customClass="NUXButton" customModule="WordPressAuthenticator" >
+                                    <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="749" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Iy-9H-ykD" customClass="NUXButton" customModule="WordPressAuthenticator">
                                         <rect key="frame" x="114" y="306.5" width="75" height="34"/>
                                         <constraints>
                                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="34" id="tyz-kt-Arb"/>
@@ -122,7 +122,7 @@
                                     </mask>
                                 </variation>
                             </stackView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b0O-LO-6ax" customClass="SubheadlineButton" customModule="WordPressAuthenticator" >
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b0O-LO-6ax" customClass="SubheadlineButton" customModule="WordPressAuthenticator">
                                 <rect key="frame" x="0.0" y="617" width="375" height="30"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                 <state key="normal" title="Enter your password instead">

From 93f982898317d66f0b4e8c22a22b674181bcb46e Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Wed, 18 Mar 2020 11:47:26 -0500
Subject: [PATCH 03/18] Xcode updating the metadata for
 EmailMagicLink.storyboard

---
 WordPressAuthenticator/Signin/EmailMagicLink.storyboard | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/WordPressAuthenticator/Signin/EmailMagicLink.storyboard b/WordPressAuthenticator/Signin/EmailMagicLink.storyboard
index 5f8b0ddde..d49c77d07 100644
--- a/WordPressAuthenticator/Signin/EmailMagicLink.storyboard
+++ b/WordPressAuthenticator/Signin/EmailMagicLink.storyboard
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>

From ddb322b314156f9c22bfa279f636b2a19dba1591 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Wed, 18 Mar 2020 11:53:40 -0500
Subject: [PATCH 04/18] Delete segues `.showLinkMailView` and
 `SignupEmailViewController`

---
 .../Signup/Signup.storyboard                   | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/WordPressAuthenticator/Signup/Signup.storyboard b/WordPressAuthenticator/Signup/Signup.storyboard
index 80eb2676e..db447d9fb 100644
--- a/WordPressAuthenticator/Signup/Signup.storyboard
+++ b/WordPressAuthenticator/Signup/Signup.storyboard
@@ -128,8 +128,6 @@
                         <outlet property="errorLabel" destination="EYw-oM-W1K" id="P2j-f2-bLo"/>
                         <outlet property="instructionLabel" destination="CPF-7g-0y5" id="Urr-Xa-YNp"/>
                         <outlet property="submitButton" destination="4Su-Zc-Omp" id="amJ-9P-tcO"/>
-                        <segue destination="Je3-5O-NYu" kind="show" identifier="showLinkMailView" id="Yop-RV-xJa"/>
-                        <segue destination="J8B-jx-UJD" kind="show" identifier="SignupEmailViewController" id="1cg-nu-IEn"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="OAN-7g-PQl" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -180,22 +178,6 @@
             </objects>
             <point key="canvasLocation" x="-938" y="791"/>
         </scene>
-        <!--LinkMailView-->
-        <scene sceneID="lKY-0n-z5h">
-            <objects>
-                <viewControllerPlaceholder storyboardIdentifier="LinkMailView" storyboardName="EmailMagicLink" referencedIdentifier="LinkMailView" id="Je3-5O-NYu" sceneMemberID="viewController"/>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="DAI-Ik-KtV" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-358" y="190"/>
-        </scene>
-        <!--LoginEmailViewController-->
-        <scene sceneID="JU2-CA-QR6">
-            <objects>
-                <viewControllerPlaceholder storyboardName="Login" referencedIdentifier="LoginEmailViewController" id="J8B-jx-UJD" sceneMemberID="viewController"/>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Y5k-uW-muf" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-346" y="-127"/>
-        </scene>
     </scenes>
     <resources>
         <image name="icon-username-field" width="18" height="18"/>

From e11c23ef1a224aefe25bee86814c3c9ee31d3fe3 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Wed, 18 Mar 2020 11:54:08 -0500
Subject: [PATCH 05/18] Remove segues using showLinkMailView

---
 .../Signin/LoginLinkRequestViewController.swift           | 8 +++++++-
 .../Signup/SignupEmailViewController.swift                | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift b/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
index e7a58d181..82d0a0468 100644
--- a/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
+++ b/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
@@ -139,7 +139,13 @@ class LoginLinkRequestViewController: LoginViewController {
     @objc func didRequestAuthenticationLink() {
         WordPressAuthenticator.track(.loginMagicLinkRequested)
         WordPressAuthenticator.storeLoginInfoForTokenAuth(loginFields)
-        performSegue(withIdentifier: .showLinkMailView, sender: self)
+
+        guard let vc = NUXLinkMailViewController.instantiate(from: .signup) else {
+            DDLogError("Failed to navigate to NUXLinkMailViewController")
+            return
+        }
+
+        navigationController?.pushViewController(vc, animated: true)
     }
 
     @IBAction func handleUsePasswordTapped(_ sender: UIButton) {
diff --git a/WordPressAuthenticator/Signup/SignupEmailViewController.swift b/WordPressAuthenticator/Signup/SignupEmailViewController.swift
index 94faf75a3..c03da9070 100644
--- a/WordPressAuthenticator/Signup/SignupEmailViewController.swift
+++ b/WordPressAuthenticator/Signup/SignupEmailViewController.swift
@@ -217,7 +217,13 @@ class SignupEmailViewController: LoginViewController, NUXKeyboardResponder {
     private func didRequestSignupLink() {
         WordPressAuthenticator.track(.signupMagicLinkRequested)
         WordPressAuthenticator.storeLoginInfoForTokenAuth(loginFields)
-        performSegue(withIdentifier: "showLinkMailView", sender: nil)
+
+        guard let vc = NUXLinkMailViewController.instantiate(from: .signup) else {
+            DDLogError("Failed to navigate to NUXLinkMailViewController")
+            return
+        }
+
+        navigationController?.pushViewController(vc, animated: true)
     }
 
     // MARK: - Action Handling

From 7ffaf5f09294837ce5dcae1542a8db5524cc3d36 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Wed, 18 Mar 2020 11:54:25 -0500
Subject: [PATCH 06/18] Remove enum case showLinkMailView

---
 WordPressAuthenticator/NUX/NUXViewController.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPressAuthenticator/NUX/NUXViewController.swift b/WordPressAuthenticator/NUX/NUXViewController.swift
index c39426c18..468cd584b 100644
--- a/WordPressAuthenticator/NUX/NUXViewController.swift
+++ b/WordPressAuthenticator/NUX/NUXViewController.swift
@@ -34,7 +34,6 @@ open class NUXViewController: UIViewController, NUXViewControllerBase, UIViewCon
         case showWPComLogin
         case startMagicLinkFlow
         case showMagicLink
-        case showLinkMailView
         case show2FA
         case showDomains
         case showCreateSite

From e4f1b0ed26b936192002c5f40b738d2add596e76 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Wed, 18 Mar 2020 11:57:50 -0500
Subject: [PATCH 07/18] Bump podspec to beta.15

---
 WordPressAuthenticator.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec
index a807fe1a9..d696ca5f5 100644
--- a/WordPressAuthenticator.podspec
+++ b/WordPressAuthenticator.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.11.0-beta.14"
+  s.version       = "1.11.0-beta.15"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC

From 9fc623e29d6f118a3155a97bbacc39dbfbdeb552 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Wed, 18 Mar 2020 12:09:01 -0500
Subject: [PATCH 08/18] Instantiate the correct Storyboard, `emailMagicLink`

---
 WordPressAuthenticator/Extensions/UIStoryboard+Helpers.swift    | 1 +
 .../Signin/LoginLinkRequestViewController.swift                 | 2 +-
 WordPressAuthenticator/Signup/SignupEmailViewController.swift   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WordPressAuthenticator/Extensions/UIStoryboard+Helpers.swift b/WordPressAuthenticator/Extensions/UIStoryboard+Helpers.swift
index bf17b5b1d..f5e479ca5 100644
--- a/WordPressAuthenticator/Extensions/UIStoryboard+Helpers.swift
+++ b/WordPressAuthenticator/Extensions/UIStoryboard+Helpers.swift
@@ -5,6 +5,7 @@ import Foundation
 enum Storyboard: String {
     case login
     case signup
+    case emailMagicLink
 
     var instance: UIStoryboard {
         return UIStoryboard(name: self.rawValue.capitalized, bundle: WordPressAuthenticator.bundle)
diff --git a/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift b/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
index 82d0a0468..9b819d402 100644
--- a/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
+++ b/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
@@ -140,7 +140,7 @@ class LoginLinkRequestViewController: LoginViewController {
         WordPressAuthenticator.track(.loginMagicLinkRequested)
         WordPressAuthenticator.storeLoginInfoForTokenAuth(loginFields)
 
-        guard let vc = NUXLinkMailViewController.instantiate(from: .signup) else {
+        guard let vc = NUXLinkMailViewController.instantiate(from: .emailMagicLink) else {
             DDLogError("Failed to navigate to NUXLinkMailViewController")
             return
         }
diff --git a/WordPressAuthenticator/Signup/SignupEmailViewController.swift b/WordPressAuthenticator/Signup/SignupEmailViewController.swift
index c03da9070..574aafc94 100644
--- a/WordPressAuthenticator/Signup/SignupEmailViewController.swift
+++ b/WordPressAuthenticator/Signup/SignupEmailViewController.swift
@@ -218,7 +218,7 @@ class SignupEmailViewController: LoginViewController, NUXKeyboardResponder {
         WordPressAuthenticator.track(.signupMagicLinkRequested)
         WordPressAuthenticator.storeLoginInfoForTokenAuth(loginFields)
 
-        guard let vc = NUXLinkMailViewController.instantiate(from: .signup) else {
+        guard let vc = NUXLinkMailViewController.instantiate(from: .emailMagicLink) else {
             DDLogError("Failed to navigate to NUXLinkMailViewController")
             return
         }

From 115b2e419cec411b0d6c47e6877857acf254c920 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Wed, 18 Mar 2020 15:00:06 -0500
Subject: [PATCH 09/18] Define the raw string values for storyboards

---
 .../Extensions/UIStoryboard+Helpers.swift                 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPressAuthenticator/Extensions/UIStoryboard+Helpers.swift b/WordPressAuthenticator/Extensions/UIStoryboard+Helpers.swift
index f5e479ca5..7e362985b 100644
--- a/WordPressAuthenticator/Extensions/UIStoryboard+Helpers.swift
+++ b/WordPressAuthenticator/Extensions/UIStoryboard+Helpers.swift
@@ -3,12 +3,12 @@ import Foundation
 
 // MARK - Storyboard enum
 enum Storyboard: String {
-    case login
-    case signup
-    case emailMagicLink
+    case login = "Login"
+    case signup = "Signup"
+    case emailMagicLink = "EmailMagicLink"
 
     var instance: UIStoryboard {
-        return UIStoryboard(name: self.rawValue.capitalized, bundle: WordPressAuthenticator.bundle)
+        return UIStoryboard(name: self.rawValue, bundle: WordPressAuthenticator.bundle)
     }
 
     /// Returns a view controller from a Storyboard

From 707de415faa0aaa1eba634851d795d10d2e3157b Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 23 Mar 2020 09:42:43 -0500
Subject: [PATCH 10/18] Restore NUX button configurations for button insets

---
 WordPressAuthenticator/NUX/NUXButton.swift | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/WordPressAuthenticator/NUX/NUXButton.swift b/WordPressAuthenticator/NUX/NUXButton.swift
index 01451f107..929d5fb16 100644
--- a/WordPressAuthenticator/NUX/NUXButton.swift
+++ b/WordPressAuthenticator/NUX/NUXButton.swift
@@ -111,11 +111,18 @@ import WordPressKit
     /// Setup: Everything = [Insets, Backgrounds, titleColor(s), titleLabel]
     ///
     private func configureAppearance() {
+        configureInsets()
         configureBackgrounds()
         configureTitleColors()
         configureTitleLabel()
     }
 
+    /// Setup: NUXButton's Default Settings
+    ///
+    private func configureInsets() {
+        contentEdgeInsets = UIImage.DefaultRenderMetrics.contentInsets
+    }
+
     /// Setup: BackgroundImage
     ///
     private func configureBackgrounds() {

From 40fcbd9a4f103e53183b885099f8d926d01d33aa Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 23 Mar 2020 09:43:42 -0500
Subject: [PATCH 11/18] Bump podspec

---
 WordPressAuthenticator.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec
index b5e439ca1..3ee235bbf 100644
--- a/WordPressAuthenticator.podspec
+++ b/WordPressAuthenticator.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.11.0"
+  s.version       = "1.11.1-beta.1"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC

From 119478e3f514f75d48327c269076cc8a926834b0 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 23 Mar 2020 10:00:13 -0500
Subject: [PATCH 12/18] Skip the beta for hotfixes

---
 WordPressAuthenticator.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec
index 3ee235bbf..de1fcf9ab 100644
--- a/WordPressAuthenticator.podspec
+++ b/WordPressAuthenticator.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.11.1-beta.1"
+  s.version       = "1.11.1"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC

From ee78b1d6c0400d72c5790adc0491b1dc8a555ca6 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 23 Mar 2020 10:44:15 -0500
Subject: [PATCH 13/18] Bump podspec to 1.11.2-beta.1

---
 WordPressAuthenticator.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec
index de1fcf9ab..37221cd92 100644
--- a/WordPressAuthenticator.podspec
+++ b/WordPressAuthenticator.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.11.1"
+  s.version       = "1.11.2-beta.1"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC

From a1a4f8e73e5960aea51613a3ada86f5b893e4447 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 23 Mar 2020 12:09:15 -0500
Subject: [PATCH 14/18] Pass the loginFields from one viewcontroller to another

---
 .../Signin/LoginLinkRequestViewController.swift                | 2 ++
 WordPressAuthenticator/Signup/SignupEmailViewController.swift  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift b/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
index 9b819d402..faf8f33bd 100644
--- a/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
+++ b/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
@@ -145,6 +145,8 @@ class LoginLinkRequestViewController: LoginViewController {
             return
         }
 
+        vc.loginFields = self.loginFields
+        vc.loginFields.restrictToWPCom = true
         navigationController?.pushViewController(vc, animated: true)
     }
 
diff --git a/WordPressAuthenticator/Signup/SignupEmailViewController.swift b/WordPressAuthenticator/Signup/SignupEmailViewController.swift
index 574aafc94..1ba935347 100644
--- a/WordPressAuthenticator/Signup/SignupEmailViewController.swift
+++ b/WordPressAuthenticator/Signup/SignupEmailViewController.swift
@@ -223,6 +223,9 @@ class SignupEmailViewController: LoginViewController, NUXKeyboardResponder {
             return
         }
 
+        vc.loginFields.restrictToWPCom = true
+        vc.loginFields.username = loginFields.emailAddress
+
         navigationController?.pushViewController(vc, animated: true)
     }
 

From 0ef3707b4f17c761612a33a075231f45a69ccc11 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 23 Mar 2020 12:09:35 -0500
Subject: [PATCH 15/18] Delete `prepareForSegue` method, it should no longer be
 used

---
 .../Signup/SignupEmailViewController.swift               | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/WordPressAuthenticator/Signup/SignupEmailViewController.swift b/WordPressAuthenticator/Signup/SignupEmailViewController.swift
index 1ba935347..a78c23630 100644
--- a/WordPressAuthenticator/Signup/SignupEmailViewController.swift
+++ b/WordPressAuthenticator/Signup/SignupEmailViewController.swift
@@ -183,15 +183,6 @@ class SignupEmailViewController: LoginViewController, NUXKeyboardResponder {
         })
     }
 
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        super.prepare(for: segue, sender: sender)
-        // Configure login flow to allow only .com login and prefill the email
-        if let destination = segue.destination as? LoginEmailViewController {
-            destination.loginFields.restrictToWPCom = true
-            destination.loginFields.username = loginFields.emailAddress
-        }
-    }
-
     // MARK: - Send email
 
     /// Makes the call to request a magic signup link be emailed to the user.

From 12866fcac8ed5cd7adddd79335d8d3855a76163b Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 23 Mar 2020 12:09:49 -0500
Subject: [PATCH 16/18] Change related storyboard to use convenience method

---
 .../Authenticator/WordPressAuthenticator.swift                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift
index f378ca7a9..9e20f0fb5 100644
--- a/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift
+++ b/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift
@@ -269,7 +269,7 @@ import AuthenticationServices
             return false
         }
 
-        let storyboard = UIStoryboard(name: "EmailMagicLink", bundle: bundle)
+        let storyboard = Storyboard.emailMagicLink.instance
         guard let loginController = storyboard.instantiateViewController(withIdentifier: "LinkAuthView") as? NUXLinkAuthViewController else {
             DDLogInfo("App opened with authentication link but couldn't create login screen.")
             return false

From 8c8170675e2bfa686ebb9fa7620704623d006432 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 23 Mar 2020 12:22:32 -0500
Subject: [PATCH 17/18] Pass all loginFields from the SignupEmailVC to the
 NUXLinkMailVC

---
 WordPressAuthenticator/Signup/SignupEmailViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPressAuthenticator/Signup/SignupEmailViewController.swift b/WordPressAuthenticator/Signup/SignupEmailViewController.swift
index a78c23630..d0cb58687 100644
--- a/WordPressAuthenticator/Signup/SignupEmailViewController.swift
+++ b/WordPressAuthenticator/Signup/SignupEmailViewController.swift
@@ -214,8 +214,8 @@ class SignupEmailViewController: LoginViewController, NUXKeyboardResponder {
             return
         }
 
+        vc.loginFields = loginFields
         vc.loginFields.restrictToWPCom = true
-        vc.loginFields.username = loginFields.emailAddress
 
         navigationController?.pushViewController(vc, animated: true)
     }

From 36b35e946fdecc98cdd76ece87ce122d3a6c734b Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 23 Mar 2020 15:48:12 -0500
Subject: [PATCH 18/18] Revert "Merge branch 'issue/fancy-buttons-hotfix' into
 issue/211-remove-showLinkMailView"

This reverts commit b9c020acb1c5bd4c3af1889b32b65b7395f4714d.
---
 WordPressAuthenticator/NUX/NUXButton.swift | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/WordPressAuthenticator/NUX/NUXButton.swift b/WordPressAuthenticator/NUX/NUXButton.swift
index 929d5fb16..01451f107 100644
--- a/WordPressAuthenticator/NUX/NUXButton.swift
+++ b/WordPressAuthenticator/NUX/NUXButton.swift
@@ -111,18 +111,11 @@ import WordPressKit
     /// Setup: Everything = [Insets, Backgrounds, titleColor(s), titleLabel]
     ///
     private func configureAppearance() {
-        configureInsets()
         configureBackgrounds()
         configureTitleColors()
         configureTitleLabel()
     }
 
-    /// Setup: NUXButton's Default Settings
-    ///
-    private func configureInsets() {
-        contentEdgeInsets = UIImage.DefaultRenderMetrics.contentInsets
-    }
-
     /// Setup: BackgroundImage
     ///
     private func configureBackgrounds() {