From e28d75d9376dec611bc7966a7276970e84a9155d Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 1 Jun 2020 15:13:14 -0500
Subject: [PATCH 01/15] Add a tableview and a NUXButton below the tableview

---
 .../View Related/SiteAddress.storyboard       | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard
index 83cb64dab..2efe2d7ad 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
@@ -16,15 +16,25 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="SiteAddress ViewController" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j39-aV-wLj">
-                                <rect key="frame" x="35" y="87" width="307" height="148"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" style="UICTFontTextStyleTitle0"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="KLl-Uz-wEP">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="597"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            </tableView>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ClH-Cn-49d" customClass="NUXButton" customModule="WordPressAuthenticator" customModuleProvider="target">
+                                <rect key="frame" x="20" y="617" width="335" height="30"/>
+                                <state key="normal" title="Button"/>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="ClH-Cn-49d" firstAttribute="leading" secondItem="ihD-pY-rg9" secondAttribute="leading" constant="20" id="5s0-Xm-ncF"/>
+                            <constraint firstItem="ihD-pY-rg9" firstAttribute="bottom" secondItem="ClH-Cn-49d" secondAttribute="bottom" constant="20" id="X4E-nI-Cd1"/>
+                            <constraint firstItem="KLl-Uz-wEP" firstAttribute="leading" secondItem="ihD-pY-rg9" secondAttribute="leading" id="aEa-e4-q18"/>
+                            <constraint firstItem="ihD-pY-rg9" firstAttribute="trailing" secondItem="ClH-Cn-49d" secondAttribute="trailing" constant="20" id="cDe-aY-Kjq"/>
+                            <constraint firstItem="KLl-Uz-wEP" firstAttribute="trailing" secondItem="ihD-pY-rg9" secondAttribute="trailing" id="gAJ-a0-NzR"/>
+                            <constraint firstItem="ClH-Cn-49d" firstAttribute="top" secondItem="KLl-Uz-wEP" secondAttribute="bottom" constant="20" id="oGY-bv-6gw"/>
+                            <constraint firstItem="KLl-Uz-wEP" firstAttribute="top" secondItem="ihD-pY-rg9" secondAttribute="top" id="yJ3-xn-prH"/>
+                        </constraints>
                         <viewLayoutGuide key="safeArea" id="ihD-pY-rg9"/>
                     </view>
                 </viewController>

From 00cb0c227aba451ad65c265448a09246f19ad71b Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 1 Jun 2020 15:21:02 -0500
Subject: [PATCH 02/15] Attach the tableView and continueButton outlets

---
 .../Unified Auth/View Related/SiteAddress.storyboard        | 4 ++++
 .../View Related/SiteAddressViewController.swift            | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard
index 2efe2d7ad..7536f987d 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
@@ -37,6 +37,10 @@
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="ihD-pY-rg9"/>
                     </view>
+                    <connections>
+                        <outlet property="continueButton" destination="ClH-Cn-49d" id="MQY-BY-P8D"/>
+                        <outlet property="tableView" destination="KLl-Uz-wEP" id="ntt-cX-m20"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Ipm-G3-kY7" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift
index d37d43cce..7c17966b8 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
@@ -3,7 +3,11 @@ import UIKit
 
 /// SiteAddressViewController: log in by Site Address.
 ///
-class SiteAddressViewController: UIViewController {
+final class SiteAddressViewController: UIViewController {
+
+    @IBOutlet private weak var tableView: UITableView!
+
+    @IBOutlet private weak var continueButton: NUXButton!
 
     override func viewDidLoad() {
         super.viewDidLoad()

From 333b8198a468fdddf5458332eee07f2888cb6ee6 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 1 Jun 2020 15:41:28 -0500
Subject: [PATCH 03/15] Connect tableview delegate and datasource

---
 .../View Related/SiteAddress.storyboard        | 10 +++++++++-
 .../SiteAddressViewController.swift            | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard
index 7536f987d..7a06a6e31 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
@@ -16,13 +16,21 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="KLl-Uz-wEP">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="KLl-Uz-wEP">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="597"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <sections/>
+                                <connections>
+                                    <outlet property="dataSource" destination="aQT-Gx-U3x" id="Sct-0G-HTk"/>
+                                    <outlet property="delegate" destination="aQT-Gx-U3x" id="2xB-Wr-Hdh"/>
+                                </connections>
                             </tableView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ClH-Cn-49d" customClass="NUXButton" customModule="WordPressAuthenticator" customModuleProvider="target">
                                 <rect key="frame" x="20" y="617" width="335" height="30"/>
                                 <state key="normal" title="Button"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="isPrimary" value="YES"/>
+                                </userDefinedRuntimeAttributes>
                             </button>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift
index 7c17966b8..8d8776f66 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
@@ -13,3 +13,21 @@ final class SiteAddressViewController: UIViewController {
         super.viewDidLoad()
     }
 }
+
+
+// MARK: - UITableViewDataSource
+extension SiteAddressViewController: UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 1
+    }
+
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        return UITableViewCell()
+    }
+}
+
+
+// MARK: - UITableViewDelegate conformance
+extension SiteAddressViewController: UITableViewDelegate {
+
+}

From fff9f7c4b4f6a92f3af3a06d78369ec403d56e75 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 1 Jun 2020 15:54:58 -0500
Subject: [PATCH 04/15] Change the continue button to be a primary NUX button

---
 .../Unified Auth/View Related/SiteAddress.storyboard          | 4 ++--
 .../Unified Auth/View Related/SiteAddressViewController.swift | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard
index 7a06a6e31..9bb4ff9fb 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
@@ -25,7 +25,7 @@
                                     <outlet property="delegate" destination="aQT-Gx-U3x" id="2xB-Wr-Hdh"/>
                                 </connections>
                             </tableView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ClH-Cn-49d" customClass="NUXButton" customModule="WordPressAuthenticator" customModuleProvider="target">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ClH-Cn-49d" userLabel="Primary Button" customClass="NUXButton" customModule="WordPressAuthenticator" customModuleProvider="target">
                                 <rect key="frame" x="20" y="617" width="335" height="30"/>
                                 <state key="normal" title="Button"/>
                                 <userDefinedRuntimeAttributes>
@@ -46,7 +46,7 @@
                         <viewLayoutGuide key="safeArea" id="ihD-pY-rg9"/>
                     </view>
                     <connections>
-                        <outlet property="continueButton" destination="ClH-Cn-49d" id="MQY-BY-P8D"/>
+                        <outlet property="primaryButton" destination="ClH-Cn-49d" id="kda-Wg-JrS"/>
                         <outlet property="tableView" destination="KLl-Uz-wEP" id="ntt-cX-m20"/>
                     </connections>
                 </viewController>
diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift
index 8d8776f66..fb43fc071 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
@@ -6,6 +6,7 @@ import UIKit
 final class SiteAddressViewController: UIViewController {
 
     @IBOutlet private weak var tableView: UITableView!
+    @IBOutlet private weak var primaryButton: NUXButton!
 
     @IBOutlet private weak var continueButton: NUXButton!
 

From c2063a9f9be0501a82f36fa6db5758772fbd162d Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 1 Jun 2020 15:55:33 -0500
Subject: [PATCH 05/15] Add siteAddressPrimaryButton title to DisplayStrings
 struct

---
 ...WordPressAuthenticatorDisplayStrings.swift | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDisplayStrings.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDisplayStrings.swift
index 0fa5e7b4e..d51282084 100644
--- a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDisplayStrings.swift
+++ b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDisplayStrings.swift
@@ -12,19 +12,34 @@ public struct WordPressAuthenticatorDisplayStrings {
 
     public let siteLoginInstructions: String
 
+    /// Strings: primary call-to-action button titles.
+    ///
+    public let siteAddressPrimaryButton: String
+
     /// Designated initializer.
     ///
-    public init(emailLoginInstructions: String, jetpackLoginInstructions: String, siteLoginInstructions: String) {
+    public init(emailLoginInstructions: String,
+                jetpackLoginInstructions: String,
+                siteLoginInstructions: String,
+                siteAddressPrimaryButton: String) {
         self.emailLoginInstructions = emailLoginInstructions
         self.jetpackLoginInstructions = jetpackLoginInstructions
         self.siteLoginInstructions = siteLoginInstructions
+        self.siteAddressPrimaryButton = siteAddressPrimaryButton
     }
 }
 
 public extension WordPressAuthenticatorDisplayStrings {
     static var defaultStrings: WordPressAuthenticatorDisplayStrings {
-        return WordPressAuthenticatorDisplayStrings(emailLoginInstructions: NSLocalizedString("Log in to your WordPress.com account with your email address.", comment: "Instruction text on the login's email address screen."),
-                                                    jetpackLoginInstructions: NSLocalizedString("Log in to the WordPress.com account you used to connect Jetpack.", comment: "Instruction text on the login's email address screen."),
-                                                    siteLoginInstructions: NSLocalizedString("Enter the address of the WordPress site you'd like to connect.", comment: "Instruction text on the login's site addresss screen."))
+        return WordPressAuthenticatorDisplayStrings(
+            emailLoginInstructions: NSLocalizedString("Log in to your WordPress.com account with your email address.",
+                                                      comment: "Instruction text on the login's email address screen."),
+            jetpackLoginInstructions: NSLocalizedString("Log in to the WordPress.com account you used to connect Jetpack.",
+                                                        comment: "Instruction text on the login's email address screen."),
+            siteLoginInstructions: NSLocalizedString("Enter the address of the WordPress site you'd like to connect.",
+                                                     comment: "Instruction text on the login's site addresss screen."),
+            siteAddressPrimaryButton: NSLocalizedString("Continue",
+                                                        comment: "The primary call-to-action button on the unified site address screen.")
+        )
     }
 }

From c787d48231436c48672ebf3ba8d2eecd36fff2e2 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Mon, 1 Jun 2020 17:02:30 -0500
Subject: [PATCH 06/15] Inherit from the LoginViewController

---
 .../View Related/SiteAddress.storyboard           |  2 +-
 .../View Related/SiteAddressViewController.swift  | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard
index 9bb4ff9fb..da94d0b36 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
@@ -46,7 +46,7 @@
                         <viewLayoutGuide key="safeArea" id="ihD-pY-rg9"/>
                     </view>
                     <connections>
-                        <outlet property="primaryButton" destination="ClH-Cn-49d" id="kda-Wg-JrS"/>
+                        <outlet property="submitButton" destination="ClH-Cn-49d" id="kBa-QN-0oH"/>
                         <outlet property="tableView" destination="KLl-Uz-wEP" id="ntt-cX-m20"/>
                     </connections>
                 </viewController>
diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift
index fb43fc071..b94378ba2 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
@@ -3,15 +3,24 @@ import UIKit
 
 /// SiteAddressViewController: log in by Site Address.
 ///
-final class SiteAddressViewController: UIViewController {
+final class SiteAddressViewController: LoginViewController {
 
     @IBOutlet private weak var tableView: UITableView!
-    @IBOutlet private weak var primaryButton: NUXButton!
 
-    @IBOutlet private weak var continueButton: NUXButton!
+    var displayStrings: WordPressAuthenticatorDisplayStrings {
+        return WordPressAuthenticator.shared.displayStrings
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        localizePrimaryButton()
+    }
+
+    func localizePrimaryButton() {
+        let primaryTitle = displayStrings.siteAddressPrimaryButton
+        submitButton?.setTitle(primaryTitle, for: .normal)
+        submitButton?.setTitle(primaryTitle, for: .highlighted)
     }
 }
 

From a1a010cd674948ba815ef4f806c867700451d626 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Tue, 2 Jun 2020 10:36:59 -0500
Subject: [PATCH 07/15] Change the display text to be more generic

`continue` is a reserved keyword, so I had to lengthen the variable name to something else.
---
 .../WordPressAuthenticatorDisplayStrings.swift         | 10 +++++-----
 .../View Related/SiteAddressViewController.swift       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDisplayStrings.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDisplayStrings.swift
index d51282084..9e52656c7 100644
--- a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDisplayStrings.swift
+++ b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDisplayStrings.swift
@@ -14,18 +14,18 @@ public struct WordPressAuthenticatorDisplayStrings {
 
     /// Strings: primary call-to-action button titles.
     ///
-    public let siteAddressPrimaryButton: String
+    public let continueButtonTitle: String
 
     /// Designated initializer.
     ///
     public init(emailLoginInstructions: String,
                 jetpackLoginInstructions: String,
                 siteLoginInstructions: String,
-                siteAddressPrimaryButton: String) {
+                continueButtonTitle: String) {
         self.emailLoginInstructions = emailLoginInstructions
         self.jetpackLoginInstructions = jetpackLoginInstructions
         self.siteLoginInstructions = siteLoginInstructions
-        self.siteAddressPrimaryButton = siteAddressPrimaryButton
+        self.continueButtonTitle = continueButtonTitle
     }
 }
 
@@ -38,8 +38,8 @@ public extension WordPressAuthenticatorDisplayStrings {
                                                         comment: "Instruction text on the login's email address screen."),
             siteLoginInstructions: NSLocalizedString("Enter the address of the WordPress site you'd like to connect.",
                                                      comment: "Instruction text on the login's site addresss screen."),
-            siteAddressPrimaryButton: NSLocalizedString("Continue",
-                                                        comment: "The primary call-to-action button on the unified site address screen.")
+            continueButtonTitle: NSLocalizedString("Continue",
+                                                    comment: "The primary call-to-action button text on the unified site address screen.")
         )
     }
 }
diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift
index b94378ba2..f106a6d16 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
@@ -18,7 +18,7 @@ final class SiteAddressViewController: LoginViewController {
     }
 
     func localizePrimaryButton() {
-        let primaryTitle = displayStrings.siteAddressPrimaryButton
+        let primaryTitle = displayStrings.continueButtonTitle
         submitButton?.setTitle(primaryTitle, for: .normal)
         submitButton?.setTitle(primaryTitle, for: .highlighted)
     }

From 4f981722b7b05e1cd6f374c3127a091a6802c80a Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Tue, 2 Jun 2020 13:04:16 -0500
Subject: [PATCH 08/15] bump the podspec

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

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

From cf90a80445e051b4d2a512582b4254ad9e37d906 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Tue, 2 Jun 2020 13:04:35 -0500
Subject: [PATCH 09/15] Quick sketch to lay out a few example tableview cells

---
 .../View Related/SiteAddress.storyboard       | 185 ++++++++++++++++--
 1 file changed, 174 insertions(+), 11 deletions(-)

diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard
index da94d0b36..5e59bf31f 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
@@ -19,33 +19,193 @@
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="KLl-Uz-wEP">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="597"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="largetitlecell" id="vor-II-J02">
+                                        <rect key="frame" x="0.0" y="28" width="375" height="63"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="vor-II-J02" id="NND-aw-AEe">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="63"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Log In" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gqK-sL-hGK">
+                                                    <rect key="frame" x="15" y="11" width="345" height="41"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="41" id="VZr-Ok-yTn"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleTitle0"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="gqK-sL-hGK" firstAttribute="bottom" secondItem="NND-aw-AEe" secondAttribute="bottomMargin" id="WkG-Y6-3hN"/>
+                                                <constraint firstItem="gqK-sL-hGK" firstAttribute="top" secondItem="NND-aw-AEe" secondAttribute="topMargin" id="p0W-SD-QoH"/>
+                                                <constraint firstItem="gqK-sL-hGK" firstAttribute="leading" secondItem="NND-aw-AEe" secondAttribute="leadingMargin" id="wjF-Va-UbG"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="gqK-sL-hGK" secondAttribute="trailing" id="zWd-EP-4pK"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="emailcell" id="6NS-Rl-APH">
+                                        <rect key="frame" x="0.0" y="91" width="375" height="64"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="6NS-Rl-APH" id="bKI-fe-L6E">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="add-image" highlightedImage="add-image" translatesAutoresizingMaskIntoConstraints="NO" id="xt5-Xs-TIZ">
+                                                    <rect key="frame" x="15" y="11" width="42" height="42"/>
+                                                    <color key="tintColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="42" id="1dx-e7-4U3"/>
+                                                        <constraint firstAttribute="height" constant="42" id="vDn-sx-V87"/>
+                                                    </constraints>
+                                                </imageView>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="pamelanguyen@example.com" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KpI-a8-nlt">
+                                                    <rect key="frame" x="69" y="21.5" width="229" height="21"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="KpI-a8-nlt" firstAttribute="leading" secondItem="xt5-Xs-TIZ" secondAttribute="trailing" constant="12" id="50X-Z3-CaP"/>
+                                                <constraint firstItem="xt5-Xs-TIZ" firstAttribute="top" secondItem="bKI-fe-L6E" secondAttribute="topMargin" id="D43-zb-KZd"/>
+                                                <constraint firstItem="xt5-Xs-TIZ" firstAttribute="leading" secondItem="bKI-fe-L6E" secondAttribute="leadingMargin" id="SSX-uG-7PM"/>
+                                                <constraint firstAttribute="bottomMargin" secondItem="xt5-Xs-TIZ" secondAttribute="bottom" id="haO-Wa-dC0"/>
+                                                <constraint firstItem="KpI-a8-nlt" firstAttribute="centerY" secondItem="xt5-Xs-TIZ" secondAttribute="centerY" id="i5H-nl-HFj"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="instructionscell" id="tSL-eV-WeQ">
+                                        <rect key="frame" x="0.0" y="155" width="375" height="144"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="tSL-eV-WeQ" id="Ori-y1-lm5">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="144"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GgF-OF-Ghc">
+                                                    <rect key="frame" x="15" y="11" width="345" height="122"/>
+                                                    <string key="text">Check your email on this device, and tap the link in the email you receive from WordPress.com.
+
+Not seeing the email? Check your Spam or Junk Mail folder.</string>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="GgF-OF-Ghc" firstAttribute="top" secondItem="Ori-y1-lm5" secondAttribute="topMargin" id="ERr-Ya-bl3"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="GgF-OF-Ghc" secondAttribute="trailing" id="KjF-hG-8pn"/>
+                                                <constraint firstAttribute="bottomMargin" secondItem="GgF-OF-Ghc" secondAttribute="bottom" id="dc5-wH-XGa"/>
+                                                <constraint firstItem="GgF-OF-Ghc" firstAttribute="leading" secondItem="Ori-y1-lm5" secondAttribute="leadingMargin" id="tn3-qF-8ie"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="textfieldcell" id="nQV-pd-ZNP">
+                                        <rect key="frame" x="0.0" y="299" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="nQV-pd-ZNP" id="Ka8-LK-RxQ">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="example.com" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ApH-uX-bpN">
+                                                    <rect key="frame" x="15" y="5" width="360" height="34"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                    <textInputTraits key="textInputTraits"/>
+                                                </textField>
+                                                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9sF-5w-sdP">
+                                                    <rect key="frame" x="16" y="34" width="359" height="1"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <color key="backgroundColor" systemColor="opaqueSeparatorColor" red="0.77647058820000003" green="0.77647058820000003" blue="0.7843137255" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                </view>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="errorcell" id="zyf-mX-xuB">
+                                        <rect key="frame" x="0.0" y="343" width="375" height="64.5"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="zyf-mX-xuB" id="2q1-Jx-bgj">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="64.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="It looks like this username/password isn’t associated with this site." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GZO-89-ULi">
+                                                    <rect key="frame" x="15" y="11" width="345" height="42.5"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                    <color key="textColor" systemColor="systemRedColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailingMargin" secondItem="GZO-89-ULi" secondAttribute="trailing" id="ZaN-Q0-1zK"/>
+                                                <constraint firstItem="GZO-89-ULi" firstAttribute="leading" secondItem="2q1-Jx-bgj" secondAttribute="leadingMargin" id="b8I-PC-08C"/>
+                                                <constraint firstAttribute="bottomMargin" secondItem="GZO-89-ULi" secondAttribute="bottom" id="rSM-8m-wkh"/>
+                                                <constraint firstItem="GZO-89-ULi" firstAttribute="top" secondItem="2q1-Jx-bgj" secondAttribute="topMargin" id="yi7-Ub-fIt"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="secondaryhelperbuttoncell" id="lHt-fi-8Uy">
+                                        <rect key="frame" x="0.0" y="407.5" width="375" height="52"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="lHt-fi-8Uy" id="rVL-7r-NuP">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="52"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oAd-AQ-RmB">
+                                                    <rect key="frame" x="15" y="11" width="345" height="30"/>
+                                                    <state key="normal" title="Or type your password"/>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="oAd-AQ-RmB" firstAttribute="leading" secondItem="rVL-7r-NuP" secondAttribute="leadingMargin" id="05U-8a-ecz"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="oAd-AQ-RmB" secondAttribute="trailing" id="SWn-kO-Gyb"/>
+                                                <constraint firstItem="oAd-AQ-RmB" firstAttribute="top" secondItem="rVL-7r-NuP" secondAttribute="topMargin" id="fOH-A9-uXu"/>
+                                                <constraint firstAttribute="bottomMargin" secondItem="oAd-AQ-RmB" secondAttribute="bottom" id="kj1-th-hSj"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </prototypes>
                                 <sections/>
                                 <connections>
                                     <outlet property="dataSource" destination="aQT-Gx-U3x" id="Sct-0G-HTk"/>
                                     <outlet property="delegate" destination="aQT-Gx-U3x" id="2xB-Wr-Hdh"/>
                                 </connections>
                             </tableView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ClH-Cn-49d" userLabel="Primary Button" customClass="NUXButton" customModule="WordPressAuthenticator" customModuleProvider="target">
-                                <rect key="frame" x="20" y="617" width="335" height="30"/>
-                                <state key="normal" title="Button"/>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="boolean" keyPath="isPrimary" value="YES"/>
-                                </userDefinedRuntimeAttributes>
-                            </button>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xwA-rd-6jO">
+                                <rect key="frame" x="0.0" y="597" width="375" height="70"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ClH-Cn-49d" userLabel="Primary Button" customClass="NUXButton" customModule="WordPressAuthenticator" customModuleProvider="target">
+                                        <rect key="frame" x="8" y="8" width="359" height="30"/>
+                                        <state key="normal" title="Button"/>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="boolean" keyPath="isPrimary" value="YES"/>
+                                        </userDefinedRuntimeAttributes>
+                                    </button>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="trailingMargin" secondItem="ClH-Cn-49d" secondAttribute="trailing" id="66E-El-fXy"/>
+                                    <constraint firstAttribute="height" constant="70" id="CMh-CV-QH5"/>
+                                    <constraint firstItem="ClH-Cn-49d" firstAttribute="top" secondItem="xwA-rd-6jO" secondAttribute="topMargin" id="MI3-SN-E85"/>
+                                    <constraint firstItem="ClH-Cn-49d" firstAttribute="leading" secondItem="xwA-rd-6jO" secondAttribute="leadingMargin" id="XA3-JN-7xe"/>
+                                    <constraint firstAttribute="bottomMargin" relation="greaterThanOrEqual" secondItem="ClH-Cn-49d" secondAttribute="bottom" id="vEi-N0-Veh"/>
+                                </constraints>
+                            </view>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
-                            <constraint firstItem="ClH-Cn-49d" firstAttribute="leading" secondItem="ihD-pY-rg9" secondAttribute="leading" constant="20" id="5s0-Xm-ncF"/>
-                            <constraint firstItem="ihD-pY-rg9" firstAttribute="bottom" secondItem="ClH-Cn-49d" secondAttribute="bottom" constant="20" id="X4E-nI-Cd1"/>
+                            <constraint firstItem="xwA-rd-6jO" firstAttribute="leading" secondItem="ihD-pY-rg9" secondAttribute="leading" id="QTV-s6-drf"/>
                             <constraint firstItem="KLl-Uz-wEP" firstAttribute="leading" secondItem="ihD-pY-rg9" secondAttribute="leading" id="aEa-e4-q18"/>
-                            <constraint firstItem="ihD-pY-rg9" firstAttribute="trailing" secondItem="ClH-Cn-49d" secondAttribute="trailing" constant="20" id="cDe-aY-Kjq"/>
                             <constraint firstItem="KLl-Uz-wEP" firstAttribute="trailing" secondItem="ihD-pY-rg9" secondAttribute="trailing" id="gAJ-a0-NzR"/>
-                            <constraint firstItem="ClH-Cn-49d" firstAttribute="top" secondItem="KLl-Uz-wEP" secondAttribute="bottom" constant="20" id="oGY-bv-6gw"/>
+                            <constraint firstItem="xwA-rd-6jO" firstAttribute="top" secondItem="KLl-Uz-wEP" secondAttribute="bottom" id="khF-7L-9bL"/>
+                            <constraint firstItem="xwA-rd-6jO" firstAttribute="trailing" secondItem="ihD-pY-rg9" secondAttribute="trailing" id="naM-R5-NUx"/>
                             <constraint firstItem="KLl-Uz-wEP" firstAttribute="top" secondItem="ihD-pY-rg9" secondAttribute="top" id="yJ3-xn-prH"/>
+                            <constraint firstItem="xwA-rd-6jO" firstAttribute="bottom" secondItem="ihD-pY-rg9" secondAttribute="bottom" id="z9P-d0-DZt"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="ihD-pY-rg9"/>
                     </view>
                     <connections>
+                        <outlet property="bottomContentConstraint" destination="z9P-d0-DZt" id="WE0-bN-W0T"/>
                         <outlet property="submitButton" destination="ClH-Cn-49d" id="kBa-QN-0oH"/>
                         <outlet property="tableView" destination="KLl-Uz-wEP" id="ntt-cX-m20"/>
                     </connections>
@@ -55,4 +215,7 @@
             <point key="canvasLocation" x="-162.40000000000001" y="20.239880059970016"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="add-image" width="24" height="24"/>
+    </resources>
 </document>

From dfd7f4fbac76e2d303e26c4796d1ad6bf89e75fe Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Tue, 2 Jun 2020 13:05:15 -0500
Subject: [PATCH 10/15] Add table row cells and conform to NUXKeyboardResponder

---
 .../SiteAddressViewController.swift           | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift
index f106a6d16..4b5d78183 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
@@ -6,6 +6,7 @@ import UIKit
 final class SiteAddressViewController: LoginViewController {
 
     @IBOutlet private weak var tableView: UITableView!
+    @IBOutlet var bottomContentConstraint: NSLayoutConstraint?
 
     var displayStrings: WordPressAuthenticatorDisplayStrings {
         return WordPressAuthenticator.shared.displayStrings
@@ -28,10 +29,34 @@ final class SiteAddressViewController: LoginViewController {
 // MARK: - UITableViewDataSource
 extension SiteAddressViewController: UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 1
+        return 4
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.row == 0 {
+            return tableView.dequeueReusableCell(withIdentifier: "largetitlecell") ?? UITableViewCell()
+        }
+
+        if indexPath.row == 1 {
+            return tableView.dequeueReusableCell(withIdentifier: "emailcell")  ?? UITableViewCell()
+        }
+
+        if indexPath.row == 2 {
+            return tableView.dequeueReusableCell(withIdentifier: "instructionscell") ?? UITableViewCell()
+        }
+
+        if indexPath.row == 3 {
+            return tableView.dequeueReusableCell(withIdentifier: "textfieldcell") ?? UITableViewCell()
+        }
+
+        if indexPath.row == 4 {
+            return tableView.dequeueReusableCell(withIdentifier: "errorcell") ?? UITableViewCell()
+        }
+
+        if indexPath.row == 5 {
+            return tableView.dequeueReusableCell(withIdentifier: "secondaryhelperbuttoncell") ?? UITableViewCell()
+        }
+
         return UITableViewCell()
     }
 }
@@ -41,3 +66,20 @@ extension SiteAddressViewController: UITableViewDataSource {
 extension SiteAddressViewController: UITableViewDelegate {
 
 }
+
+// MARK: - Keyboard Notifications
+extension SiteAddressViewController: NUXKeyboardResponder {
+    var verticalCenterConstraint: NSLayoutConstraint? {
+        // no-op
+        return nil
+    }
+
+    @objc func handleKeyboardWillShow(_ notification: Foundation.Notification) {
+        keyboardWillShow(notification)
+    }
+
+
+    @objc func handleKeyboardWillHide(_ notification: Foundation.Notification) {
+        keyboardWillHide(notification)
+    }
+}

From 4af1f3ddb7c078d378874147107efa5da530a776 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Tue, 2 Jun 2020 13:05:15 -0500
Subject: [PATCH 11/15] Revert "Add table row cells and conform to
 NUXKeyboardResponder"

This reverts commit dfd7f4fbac76e2d303e26c4796d1ad6bf89e75fe.
---
 .../SiteAddressViewController.swift           | 44 +------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift
index 4b5d78183..f106a6d16 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddressViewController.swift	
@@ -6,7 +6,6 @@ import UIKit
 final class SiteAddressViewController: LoginViewController {
 
     @IBOutlet private weak var tableView: UITableView!
-    @IBOutlet var bottomContentConstraint: NSLayoutConstraint?
 
     var displayStrings: WordPressAuthenticatorDisplayStrings {
         return WordPressAuthenticator.shared.displayStrings
@@ -29,34 +28,10 @@ final class SiteAddressViewController: LoginViewController {
 // MARK: - UITableViewDataSource
 extension SiteAddressViewController: UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 4
+        return 1
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        if indexPath.row == 0 {
-            return tableView.dequeueReusableCell(withIdentifier: "largetitlecell") ?? UITableViewCell()
-        }
-
-        if indexPath.row == 1 {
-            return tableView.dequeueReusableCell(withIdentifier: "emailcell")  ?? UITableViewCell()
-        }
-
-        if indexPath.row == 2 {
-            return tableView.dequeueReusableCell(withIdentifier: "instructionscell") ?? UITableViewCell()
-        }
-
-        if indexPath.row == 3 {
-            return tableView.dequeueReusableCell(withIdentifier: "textfieldcell") ?? UITableViewCell()
-        }
-
-        if indexPath.row == 4 {
-            return tableView.dequeueReusableCell(withIdentifier: "errorcell") ?? UITableViewCell()
-        }
-
-        if indexPath.row == 5 {
-            return tableView.dequeueReusableCell(withIdentifier: "secondaryhelperbuttoncell") ?? UITableViewCell()
-        }
-
         return UITableViewCell()
     }
 }
@@ -66,20 +41,3 @@ extension SiteAddressViewController: UITableViewDataSource {
 extension SiteAddressViewController: UITableViewDelegate {
 
 }
-
-// MARK: - Keyboard Notifications
-extension SiteAddressViewController: NUXKeyboardResponder {
-    var verticalCenterConstraint: NSLayoutConstraint? {
-        // no-op
-        return nil
-    }
-
-    @objc func handleKeyboardWillShow(_ notification: Foundation.Notification) {
-        keyboardWillShow(notification)
-    }
-
-
-    @objc func handleKeyboardWillHide(_ notification: Foundation.Notification) {
-        keyboardWillHide(notification)
-    }
-}

From e80c6727d38365e86929c22d2fae5caa4cae8611 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Tue, 2 Jun 2020 13:04:35 -0500
Subject: [PATCH 12/15] Revert "Quick sketch to lay out a few example tableview
 cells"

This reverts commit cf90a80445e051b4d2a512582b4254ad9e37d906.
---
 .../View Related/SiteAddress.storyboard       | 185 ++----------------
 1 file changed, 11 insertions(+), 174 deletions(-)

diff --git a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard
index 5e59bf31f..da94d0b36 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
+++ b/WordPressAuthenticator/Unified Auth/View Related/SiteAddress.storyboard	
@@ -19,193 +19,33 @@
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="KLl-Uz-wEP">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="597"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                                <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="largetitlecell" id="vor-II-J02">
-                                        <rect key="frame" x="0.0" y="28" width="375" height="63"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="vor-II-J02" id="NND-aw-AEe">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="63"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Log In" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gqK-sL-hGK">
-                                                    <rect key="frame" x="15" y="11" width="345" height="41"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="height" constant="41" id="VZr-Ok-yTn"/>
-                                                    </constraints>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleTitle0"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="gqK-sL-hGK" firstAttribute="bottom" secondItem="NND-aw-AEe" secondAttribute="bottomMargin" id="WkG-Y6-3hN"/>
-                                                <constraint firstItem="gqK-sL-hGK" firstAttribute="top" secondItem="NND-aw-AEe" secondAttribute="topMargin" id="p0W-SD-QoH"/>
-                                                <constraint firstItem="gqK-sL-hGK" firstAttribute="leading" secondItem="NND-aw-AEe" secondAttribute="leadingMargin" id="wjF-Va-UbG"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="gqK-sL-hGK" secondAttribute="trailing" id="zWd-EP-4pK"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="emailcell" id="6NS-Rl-APH">
-                                        <rect key="frame" x="0.0" y="91" width="375" height="64"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="6NS-Rl-APH" id="bKI-fe-L6E">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="add-image" highlightedImage="add-image" translatesAutoresizingMaskIntoConstraints="NO" id="xt5-Xs-TIZ">
-                                                    <rect key="frame" x="15" y="11" width="42" height="42"/>
-                                                    <color key="tintColor" cocoaTouchSystemColor="darkTextColor"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="42" id="1dx-e7-4U3"/>
-                                                        <constraint firstAttribute="height" constant="42" id="vDn-sx-V87"/>
-                                                    </constraints>
-                                                </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="pamelanguyen@example.com" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KpI-a8-nlt">
-                                                    <rect key="frame" x="69" y="21.5" width="229" height="21"/>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="KpI-a8-nlt" firstAttribute="leading" secondItem="xt5-Xs-TIZ" secondAttribute="trailing" constant="12" id="50X-Z3-CaP"/>
-                                                <constraint firstItem="xt5-Xs-TIZ" firstAttribute="top" secondItem="bKI-fe-L6E" secondAttribute="topMargin" id="D43-zb-KZd"/>
-                                                <constraint firstItem="xt5-Xs-TIZ" firstAttribute="leading" secondItem="bKI-fe-L6E" secondAttribute="leadingMargin" id="SSX-uG-7PM"/>
-                                                <constraint firstAttribute="bottomMargin" secondItem="xt5-Xs-TIZ" secondAttribute="bottom" id="haO-Wa-dC0"/>
-                                                <constraint firstItem="KpI-a8-nlt" firstAttribute="centerY" secondItem="xt5-Xs-TIZ" secondAttribute="centerY" id="i5H-nl-HFj"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="instructionscell" id="tSL-eV-WeQ">
-                                        <rect key="frame" x="0.0" y="155" width="375" height="144"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="tSL-eV-WeQ" id="Ori-y1-lm5">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="144"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GgF-OF-Ghc">
-                                                    <rect key="frame" x="15" y="11" width="345" height="122"/>
-                                                    <string key="text">Check your email on this device, and tap the link in the email you receive from WordPress.com.
-
-Not seeing the email? Check your Spam or Junk Mail folder.</string>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="GgF-OF-Ghc" firstAttribute="top" secondItem="Ori-y1-lm5" secondAttribute="topMargin" id="ERr-Ya-bl3"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="GgF-OF-Ghc" secondAttribute="trailing" id="KjF-hG-8pn"/>
-                                                <constraint firstAttribute="bottomMargin" secondItem="GgF-OF-Ghc" secondAttribute="bottom" id="dc5-wH-XGa"/>
-                                                <constraint firstItem="GgF-OF-Ghc" firstAttribute="leading" secondItem="Ori-y1-lm5" secondAttribute="leadingMargin" id="tn3-qF-8ie"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="textfieldcell" id="nQV-pd-ZNP">
-                                        <rect key="frame" x="0.0" y="299" width="375" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="nQV-pd-ZNP" id="Ka8-LK-RxQ">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="example.com" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ApH-uX-bpN">
-                                                    <rect key="frame" x="15" y="5" width="360" height="34"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                                    <textInputTraits key="textInputTraits"/>
-                                                </textField>
-                                                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9sF-5w-sdP">
-                                                    <rect key="frame" x="16" y="34" width="359" height="1"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <color key="backgroundColor" systemColor="opaqueSeparatorColor" red="0.77647058820000003" green="0.77647058820000003" blue="0.7843137255" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                </view>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="errorcell" id="zyf-mX-xuB">
-                                        <rect key="frame" x="0.0" y="343" width="375" height="64.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="zyf-mX-xuB" id="2q1-Jx-bgj">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="64.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="It looks like this username/password isn’t associated with this site." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GZO-89-ULi">
-                                                    <rect key="frame" x="15" y="11" width="345" height="42.5"/>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                                    <color key="textColor" systemColor="systemRedColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstAttribute="trailingMargin" secondItem="GZO-89-ULi" secondAttribute="trailing" id="ZaN-Q0-1zK"/>
-                                                <constraint firstItem="GZO-89-ULi" firstAttribute="leading" secondItem="2q1-Jx-bgj" secondAttribute="leadingMargin" id="b8I-PC-08C"/>
-                                                <constraint firstAttribute="bottomMargin" secondItem="GZO-89-ULi" secondAttribute="bottom" id="rSM-8m-wkh"/>
-                                                <constraint firstItem="GZO-89-ULi" firstAttribute="top" secondItem="2q1-Jx-bgj" secondAttribute="topMargin" id="yi7-Ub-fIt"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="secondaryhelperbuttoncell" id="lHt-fi-8Uy">
-                                        <rect key="frame" x="0.0" y="407.5" width="375" height="52"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="lHt-fi-8Uy" id="rVL-7r-NuP">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="52"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oAd-AQ-RmB">
-                                                    <rect key="frame" x="15" y="11" width="345" height="30"/>
-                                                    <state key="normal" title="Or type your password"/>
-                                                </button>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="oAd-AQ-RmB" firstAttribute="leading" secondItem="rVL-7r-NuP" secondAttribute="leadingMargin" id="05U-8a-ecz"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="oAd-AQ-RmB" secondAttribute="trailing" id="SWn-kO-Gyb"/>
-                                                <constraint firstItem="oAd-AQ-RmB" firstAttribute="top" secondItem="rVL-7r-NuP" secondAttribute="topMargin" id="fOH-A9-uXu"/>
-                                                <constraint firstAttribute="bottomMargin" secondItem="oAd-AQ-RmB" secondAttribute="bottom" id="kj1-th-hSj"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </prototypes>
                                 <sections/>
                                 <connections>
                                     <outlet property="dataSource" destination="aQT-Gx-U3x" id="Sct-0G-HTk"/>
                                     <outlet property="delegate" destination="aQT-Gx-U3x" id="2xB-Wr-Hdh"/>
                                 </connections>
                             </tableView>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xwA-rd-6jO">
-                                <rect key="frame" x="0.0" y="597" width="375" height="70"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ClH-Cn-49d" userLabel="Primary Button" customClass="NUXButton" customModule="WordPressAuthenticator" customModuleProvider="target">
-                                        <rect key="frame" x="8" y="8" width="359" height="30"/>
-                                        <state key="normal" title="Button"/>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="boolean" keyPath="isPrimary" value="YES"/>
-                                        </userDefinedRuntimeAttributes>
-                                    </button>
-                                </subviews>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="trailingMargin" secondItem="ClH-Cn-49d" secondAttribute="trailing" id="66E-El-fXy"/>
-                                    <constraint firstAttribute="height" constant="70" id="CMh-CV-QH5"/>
-                                    <constraint firstItem="ClH-Cn-49d" firstAttribute="top" secondItem="xwA-rd-6jO" secondAttribute="topMargin" id="MI3-SN-E85"/>
-                                    <constraint firstItem="ClH-Cn-49d" firstAttribute="leading" secondItem="xwA-rd-6jO" secondAttribute="leadingMargin" id="XA3-JN-7xe"/>
-                                    <constraint firstAttribute="bottomMargin" relation="greaterThanOrEqual" secondItem="ClH-Cn-49d" secondAttribute="bottom" id="vEi-N0-Veh"/>
-                                </constraints>
-                            </view>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ClH-Cn-49d" userLabel="Primary Button" customClass="NUXButton" customModule="WordPressAuthenticator" customModuleProvider="target">
+                                <rect key="frame" x="20" y="617" width="335" height="30"/>
+                                <state key="normal" title="Button"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="isPrimary" value="YES"/>
+                                </userDefinedRuntimeAttributes>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
-                            <constraint firstItem="xwA-rd-6jO" firstAttribute="leading" secondItem="ihD-pY-rg9" secondAttribute="leading" id="QTV-s6-drf"/>
+                            <constraint firstItem="ClH-Cn-49d" firstAttribute="leading" secondItem="ihD-pY-rg9" secondAttribute="leading" constant="20" id="5s0-Xm-ncF"/>
+                            <constraint firstItem="ihD-pY-rg9" firstAttribute="bottom" secondItem="ClH-Cn-49d" secondAttribute="bottom" constant="20" id="X4E-nI-Cd1"/>
                             <constraint firstItem="KLl-Uz-wEP" firstAttribute="leading" secondItem="ihD-pY-rg9" secondAttribute="leading" id="aEa-e4-q18"/>
+                            <constraint firstItem="ihD-pY-rg9" firstAttribute="trailing" secondItem="ClH-Cn-49d" secondAttribute="trailing" constant="20" id="cDe-aY-Kjq"/>
                             <constraint firstItem="KLl-Uz-wEP" firstAttribute="trailing" secondItem="ihD-pY-rg9" secondAttribute="trailing" id="gAJ-a0-NzR"/>
-                            <constraint firstItem="xwA-rd-6jO" firstAttribute="top" secondItem="KLl-Uz-wEP" secondAttribute="bottom" id="khF-7L-9bL"/>
-                            <constraint firstItem="xwA-rd-6jO" firstAttribute="trailing" secondItem="ihD-pY-rg9" secondAttribute="trailing" id="naM-R5-NUx"/>
+                            <constraint firstItem="ClH-Cn-49d" firstAttribute="top" secondItem="KLl-Uz-wEP" secondAttribute="bottom" constant="20" id="oGY-bv-6gw"/>
                             <constraint firstItem="KLl-Uz-wEP" firstAttribute="top" secondItem="ihD-pY-rg9" secondAttribute="top" id="yJ3-xn-prH"/>
-                            <constraint firstItem="xwA-rd-6jO" firstAttribute="bottom" secondItem="ihD-pY-rg9" secondAttribute="bottom" id="z9P-d0-DZt"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="ihD-pY-rg9"/>
                     </view>
                     <connections>
-                        <outlet property="bottomContentConstraint" destination="z9P-d0-DZt" id="WE0-bN-W0T"/>
                         <outlet property="submitButton" destination="ClH-Cn-49d" id="kBa-QN-0oH"/>
                         <outlet property="tableView" destination="KLl-Uz-wEP" id="ntt-cX-m20"/>
                     </connections>
@@ -215,7 +55,4 @@ Not seeing the email? Check your Spam or Junk Mail folder.</string>
             <point key="canvasLocation" x="-162.40000000000001" y="20.239880059970016"/>
         </scene>
     </scenes>
-    <resources>
-        <image name="add-image" width="24" height="24"/>
-    </resources>
 </document>

From d357666da674dd3d6a95f17aad98c71c90768d1b Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Tue, 2 Jun 2020 13:04:16 -0500
Subject: [PATCH 13/15] Revert "bump the podspec"

This reverts commit 4f981722b7b05e1cd6f374c3127a091a6802c80a.
---
 WordPressAuthenticator.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 412f0ec578176afc8f401a2a080ccd4790a016f9 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Tue, 2 Jun 2020 13:34:30 -0500
Subject: [PATCH 14/15] Bump podspec

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

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

From 42fef108a3599a82544da32b95394fccaf7e2b97 Mon Sep 17 00:00:00 2001
From: "Thuy.Copeland" <thuycopeland@gmail.com>
Date: Tue, 2 Jun 2020 13:39:48 -0500
Subject: [PATCH 15/15] Change comment text for translators

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

diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDisplayStrings.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDisplayStrings.swift
index 9e52656c7..f2faf0a77 100644
--- a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDisplayStrings.swift
+++ b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDisplayStrings.swift
@@ -39,7 +39,7 @@ public extension WordPressAuthenticatorDisplayStrings {
             siteLoginInstructions: NSLocalizedString("Enter the address of the WordPress site you'd like to connect.",
                                                      comment: "Instruction text on the login's site addresss screen."),
             continueButtonTitle: NSLocalizedString("Continue",
-                                                    comment: "The primary call-to-action button text on the unified site address screen.")
+                                                    comment: "The button title text when there is a next step for logging in or signing up.")
         )
     }
 }