Merge pull request #5013 from woocommerce/merge/7.5-final-into-develop

Merge 7.5 final into develop

Author: oguzkocer

WooCommerce/Classes/ViewRelated/Orders/Order Details/OrderDetailsViewController.swift

@@ -545,13 +545,6 @@ private extension OrderDetailsViewController {
         let reviewOrderViewModel = ReviewOrderViewModel(order: viewModel.order, products: viewModel.products, showAddOns: viewModel.dataSource.showAddOns)
         let controller = ReviewOrderViewController(viewModel: reviewOrderViewModel) { [weak self] in
             guard let self = self else { return }
-            ServiceLocator.analytics.track(
-                .orderStatusChange,
-                withProperties: [
-                    "id": self.viewModel.order.orderID,
-                    "from": self.viewModel.order.status.rawValue,
-                    "to": OrderStatusEnum.completed.rawValue
-                ])
             let fulfillmentProcess = self.viewModel.markCompleted()
             let presenter = OrderFulfillmentNoticePresenter()
             presenter.present(process: fulfillmentProcess)

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Shipping Address Validation/ShippingLabelAddressFormViewController.swift

@@ -142,16 +142,20 @@ private extension ShippingLabelAddressFormViewController {
     }
 
     func registerTableViewCells() {
-            tableView.registerNib(for: TitleAndTextFieldTableViewCell.self)
-            tableView.registerNib(for: BasicTableViewCell.self)
+        tableView.registerNib(for: TitleAndTextFieldTableViewCell.self)
+        tableView.registerNib(for: BasicTableViewCell.self)
     }
 
     func observeViewModel() {
-        viewModel.onChange = { [weak self] in
+        viewModel.onChange = { [weak self] focusedIndex in
             guard let self = self else { return }
             self.configureNavigationBar()
             self.updateTopBannerView()
             self.tableView.reloadData()
+            if let index = focusedIndex,
+               let cell = self.tableView.cellForRow(at: IndexPath(row: index, section: 0)) as? TitleAndTextFieldTableViewCell {
+                cell.textFieldBecomeFirstResponder()
+            }
         }
     }
 
@@ -459,8 +463,7 @@ private extension ShippingLabelAddressFormViewController {
                                                                      placeholder: placeholder,
                                                                      state: .normal,
                                                                      keyboardType: .default,
-                                                                     textFieldAlignment: .leading) { _ in
-        }
+                                                                     textFieldAlignment: .leading) { _ in }
         cell.configure(viewModel: cellViewModel)
         cell.enableTextField(viewModel.statesOfSelectedCountry.isEmpty)
     }
@@ -471,8 +474,7 @@ private extension ShippingLabelAddressFormViewController {
                                                                      placeholder: Localization.countryFieldPlaceholder,
                                                                      state: .normal,
                                                                      keyboardType: .default,
-                                                                     textFieldAlignment: .leading) { _ in
-        }
+                                                                     textFieldAlignment: .leading) { _ in }
         cell.configure(viewModel: cellViewModel)
         cell.enableTextField(false)
     }

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Shipping Address Validation/ShippingLabelAddressFormViewModel.swift

@@ -25,15 +25,16 @@ final class ShippingLabelAddressFormViewModel {
     private let stores: StoresManager
 
     /// Closure to notify the `ViewController` when the view model properties change.
+    /// Accepts optional index for row to be focused after reloading the table view.
     ///
-    var onChange: (() -> (Void))?
+    var onChange: ((_ focusedRowIndex: Int?) -> (Void))?
 
     /// Current `ViewModel` state.
     ///
     private var state: State = State() {
         didSet {
             updateSections()
-            onChange?()
+            onChange?(nil)
         }
     }
 
@@ -106,10 +107,14 @@ final class ShippingLabelAddressFormViewModel {
         case .state:
             address = address?.copy(state: newValue)
         case .country:
-            address = address?.copy(country: newValue)
+            address = address?.copy(country: newValue, state: "")
         default:
             return
         }
+
+        updateSections()
+        let index: Int? = sections.first?.rows.firstIndex(where: { $0 == row })
+        onChange?(index)
     }
 
     func updateSections() {
@@ -181,23 +186,38 @@ extension ShippingLabelAddressFormViewModel {
         case invalidPhoneNumber
     }
 
-    /// Validates phone number for origin address.
+    /// Validates phone number for the address.
     /// This take into account whether phone is not empty,
     /// has length 10 with additional "1" area code for US.
     ///
-    /// Note: This logic may need to be updated if there is a need for validating other cases.
-    ///
     private var isPhoneNumberValid: Bool {
         guard let phone = address?.phone, phone.isNotEmpty else {
             return false
         }
+        guard address?.country == "US" else {
+            return true
+        }
         if phone.hasPrefix("1") {
             return phone.count == 11
         } else {
             return phone.count == 10
         }
     }
 
+    private var phoneValidationError: ValidationError? {
+        guard let addressToBeValidated = address else {
+            return nil
+        }
+        if phoneNumberRequired {
+            if addressToBeValidated.phone.isEmpty {
+                return .missingPhoneNumber
+            } else if !isPhoneNumberValid {
+                return .invalidPhoneNumber
+            }
+        }
+        return nil
+    }
+
     private func validateAddressLocally() -> [ValidationError] {
         var errors: [ValidationError] = []
 
@@ -220,12 +240,8 @@ extension ShippingLabelAddressFormViewModel {
             if addressToBeValidated.country.isEmpty {
                 errors.append(.country)
             }
-            if phoneNumberRequired {
-                if addressToBeValidated.phone.isEmpty {
-                    errors.append(.missingPhoneNumber)
-                } else if !isPhoneNumberValid {
-                    errors.append(.invalidPhoneNumber)
-                }
+            if let error = phoneValidationError {
+                errors.append(error)
             }
         }