Merge pull request #238 from woocommerce/issue/addressing-prs-feedback

(Late!!) Addressing PR's Feedback

Author: jleandroperez

Networking/Networking/Model/Order.swift

@@ -117,19 +117,8 @@ public struct Order: Decodable {
 
         let items = try container.decode([OrderItem].self, forKey: .items)
 
-        var shippingAddress: Address? = nil
-        do {
-            shippingAddress = try container.decodeIfPresent(Address.self, forKey: .shippingAddress)
-        } catch {
-            // no-op
-        }
-
-        var billingAddress: Address? = nil
-        do {
-            billingAddress = try container.decode(Address.self, forKey: .billingAddress)
-        } catch {
-            billingAddress = Address(firstName: "", lastName: "", company: "", address1: "", address2: "", city: "", state: "", postcode: "", country: "", phone: "", email: "")
-        }
+        let shippingAddress = try? container.decode(Address.self, forKey: .shippingAddress)
+        let billingAddress = try? container.decode(Address.self, forKey: .billingAddress)
 
         let coupons = try container.decode([OrderCouponLine].self, forKey: .couponLines)
 

Networking/Networking/Network/AlamofireNetwork.swift

@@ -61,7 +61,7 @@ public class AlamofireNetwork: Network {
 ///
 private extension Alamofire.DataResponse {
 
-    /// Returns `NetworkError.notFound` whenever the Request failed  with a 404 StatusCode. This may be used by upper layers,
+    /// Returns `NetworkError.notFound` whenever the Request failed with a 404 StatusCode. This may be used by upper layers,
     /// to determine if an object should be deleted (for instance!).
     ///
     /// In any other case, this property will actually return the regular `DataResponse.error` result.

Networking/Networking/Network/MockupNetwork.swift

@@ -88,7 +88,7 @@ extension MockupNetwork {
         responseMap[requestUrlSuffix] = filename
     }
 
-    /// We'll return the specified Error, whenever a request matches the specified Suffix Criteria!.
+    /// We'll return the specified Error, whenever a request matches the specified Suffix Criteria!
     ///
     func simulateError(requestUrlSuffix: String, error: Error) {
         errorMap[requestUrlSuffix] = error

WooCommerce/Classes/AppDelegate.swift

@@ -133,7 +133,7 @@ private extension AppDelegate {
 
         // Take advantage of a bug in UIAlertController
         // to style all UIAlertControllers with WC color
-        self.window?.tintColor = StyleManager.wooCommerceBrandColor
+        window?.tintColor = StyleManager.wooCommerceBrandColor
     }
 
     /// Sets up FancyButton's UIAppearance.

WooCommerce/Classes/ViewRelated/Dashboard/Settings/SettingsViewController.swift

@@ -68,7 +68,7 @@ class SettingsViewController: UIViewController {
     func logOutUser() {
         WooAnalytics.shared.track(.logout)
         StoresManager.shared.deauthenticate()
-        self.navigationController?.popToRootViewController(animated: true)
+        navigationController?.popToRootViewController(animated: true)
     }
 }
 
@@ -100,12 +100,12 @@ extension SettingsViewController: UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let row = sections[indexPath.section].rows[indexPath.row]
         let cell = tableView.dequeueReusableCell(withIdentifier: row.reuseIdentifier, for: indexPath)
-        if cell is LogOutTableViewCell {
-            let logoutCell = cell as! LogOutTableViewCell
+        if let logoutCell = cell as? LogOutTableViewCell {
             logoutCell.didSelectLogout = { [weak self] in
                 self?.handleLogout()
             }
         }
+
         return cell
     }
 

Yosemite/YosemiteTests/Stores/OrderStoreTests.swift

@@ -280,7 +280,7 @@ class OrderStoreTests: XCTestCase {
     }
 
     /// Verifies that whenever a `retrieveOrder` action results in a response with statusCode = 404, the local entity
-    /// is obliterated from existance.
+    /// is obliterated from existence.
     ///
     func testRetrieveSingleOrderResultingInStatusCode404CausesTheStoredOrderToGetDeleted() {
         let expectation = self.expectation(description: "Retrieve single order empty response")