Merge branch 'develop' of github.com:woocommerce/woocommerce-ios into feature/177-dashboard-mark6

* 'develop' of github.com:woocommerce/woocommerce-ios:
  Code review changes: `public` declaration not needed for cell variables, `guard` instead of `if let`
  Updating Authenticator to Mark 1.0.6
  Missed a whitespace
  Support empty addresses
  `pod update`
  Code review changes: make it swift-y
  Order List: Improve custom payment labels
  AppDelegate: Nukes unneeded self
  OrderStoreTests: Fixing Typo
  SettingsViewController: Simplifies downcasting
  MockupNetwork: Nukes extra dot
  AlamofireNetwork: Nukes extra space
  Order: Simplifies parsing

# Conflicts:
#	Podfile.lock

Author: bummytime

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/Model/OrderStatus.swift

@@ -64,6 +64,7 @@ extension OrderStatus: RawRepresentable {
 extension OrderStatus: CustomStringConvertible {
 
     /// Returns a string describing the current OrderStatus Instance
+    /// Custom doesn't return a localized string because the payload arrives at runtime, not buildtime.
     ///
     public var description: String {
         switch self {
@@ -74,7 +75,10 @@ extension OrderStatus: CustomStringConvertible {
         case .cancelled:            return NSLocalizedString("Canceled", comment: "Cancelled Order Status")
         case .completed:            return NSLocalizedString("Completed", comment: "Completed Order Status")
         case .refunded:             return NSLocalizedString("Refunded", comment: "Refunded Order Status")
-        case .custom(let payload):  return NSLocalizedString("\(payload)", comment: "Custom Order Status")
+        case .custom(let payload):
+            return payload
+                .replacingOccurrences(of: "-", with: " ")
+                .capitalized
         }
     }
 }

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

Podfile

@@ -18,7 +18,7 @@ target 'WooCommerce' do
   #
   pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :tag => '0.2.3'
   pod 'Gridicons', '0.15'
-  pod 'WordPressAuthenticator', '1.0.5'
+  pod 'WordPressAuthenticator', '1.0.6'
   pod 'WordPressShared', '1.0.8'
 
 

Podfile.lock

@@ -16,9 +16,9 @@ PODS:
     - CocoaLumberjack/Default
   - CocoaLumberjack/Swift (3.4.2):
     - CocoaLumberjack/Default
-  - Crashlytics (3.10.5):
-    - Fabric (~> 1.7.9)
-  - Fabric (1.7.9)
+  - Crashlytics (3.10.7):
+    - Fabric (~> 1.7.11)
+  - Fabric (1.7.11)
   - FormatterKit/Resources (1.8.2)
   - FormatterKit/TimeIntervalFormatter (1.8.2):
     - FormatterKit/Resources
@@ -41,7 +41,7 @@ PODS:
   - Reachability (3.2)
   - SVProgressHUD (2.2.5)
   - UIDeviceIdentifier (0.5.0)
-  - WordPressAuthenticator (1.0.5):
+  - WordPressAuthenticator (1.0.6):
     - 1PasswordExtension (= 1.8.5)
     - Alamofire (= 4.7.2)
     - CocoaLumberjack (= 3.4.2)
@@ -77,7 +77,7 @@ DEPENDENCIES:
   - Crashlytics (~> 3.10)
   - Gridicons (= 0.15)
   - KeychainAccess (~> 3.1)
-  - WordPressAuthenticator (= 1.0.5)
+  - WordPressAuthenticator (= 1.0.6)
   - WordPressShared (= 1.0.8)
   - XLPagerTabStrip (~> 8.0)
 
@@ -123,8 +123,8 @@ SPEC CHECKSUMS:
   Automattic-Tracks-iOS: d8c6c6c1351b1905a73e45f431b15598d71963b5
   Charts: 90a4d61da0f6e06684c591e3bcab11940fe61736
   CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
-  Crashlytics: 7f2e38d302d9da96475b3d64d86fb29e31a542b7
-  Fabric: a2917d3895e4c1569b9c3170de7320ea1b1e6661
+  Crashlytics: ccaac42660eb9351b9960c0d66106b0bcf99f4fa
+  Fabric: f233c9492b3bbc1f04e3882986740f7988a58edb
   FormatterKit: 4b8f29acc9b872d5d12a63efb560661e8f2e1b98
   GoogleSignInRepacked: d357702618c555f38923576924661325eb1ef22b
   GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f
@@ -136,13 +136,13 @@ SPEC CHECKSUMS:
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   UIDeviceIdentifier: a959a6d4f51036b4180dd31fb26483a820f1cc46
-  WordPressAuthenticator: e6e1c80aff95f1b2ad11e4477fcfe9f61aa8c49a
+  WordPressAuthenticator: 56538a229185640b41912c10c3f1891c2cc9bbb9
   WordPressKit: a4a3849684f631a3abf579f6d3f15a32677cbb30
   WordPressShared: 063e1e8b1a7aaf635abf17f091a2d235a068abdc
   WordPressUI: af141587ec444f9af753a00605bd0d3f14d8d8a3
   wpxmlrpc: bfc572f62ce7ee897f6f38b098d2ba08732ecef4
   XLPagerTabStrip: c908b17cbf42fcd2598ee1adfc49bae25444d88a
 
-PODFILE CHECKSUM: a2a2362208b6735d77e2c6358fbcdf29aead6bff
+PODFILE CHECKSUM: 579bb6345aecc3f27e78d220e137a749e9ee5f08
 
 COCOAPODS: 1.5.3

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/Model/Order+Woo.swift

@@ -14,16 +14,4 @@ extension Order {
 
         return NSLocale(localeIdentifier: identifier).currencySymbol
     }
-
-    /// Determines if a shipping address exists.
-    ///
-    var hasSeparateShippingDetail: Bool {
-        return shippingAddress != nil
-    }
-
-    /// FIXME: Creates an empty-string value Billing details, until i6 fix
-    ///
-    func generateEmptyBillingAddress() -> Address {
-        return Address(firstName: "", lastName: "", company: "", address1: "", address2: "", city: "", state: "", postcode: "", country: "", phone: "", email: "")
-    }
 }

WooCommerce/Classes/ViewModels/OrderDetailsViewModel.swift

@@ -62,30 +62,20 @@ class OrderDetailsViewModel {
         return order.customerNote ?? String()
     }
 
-    var shippingViewModel: ContactViewModel {
+    var shippingViewModel: ContactViewModel? {
         if let shippingAddress = order.shippingAddress {
             return ContactViewModel(with: shippingAddress, contactType: ContactType.shipping)
         }
 
-        if let billingAddress = order.billingAddress {
-            return ContactViewModel(with: billingAddress, contactType: ContactType.shipping)
-        }
-
-        return ContactViewModel(with: order.generateEmptyBillingAddress(), contactType: ContactType.shipping)
-    }
-    var shippingAddress: String? {
-        return shippingViewModel.formattedAddress
+        return nil
     }
 
     var billingViewModel: ContactViewModel? {
         if let billingAddress = order.billingAddress {
             return ContactViewModel(with: billingAddress, contactType: ContactType.billing)
         }
-        return nil
-    }
 
-    var billingAddress: String? {
-        return billingViewModel?.formattedAddress
+        return nil
     }
 
     let subtotalLabel = NSLocalizedString("Subtotal", comment: "Subtotal label for payment view")

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
     }