Connect onFinished closure to done button tap in order editing flow

Author: ealeksandrov

WooCommerce/Classes/ViewRelated/Orders/Order Creation/EditableOrderViewModel.swift

@@ -357,6 +357,12 @@ final class EditableOrderViewModel: ObservableObject {
         trackCreateButtonTapped()
     }
 
+    /// Action triggered on `Done` button tap in order editing flow.
+    ///
+    func finishEditing() {
+        self.onFinished(orderSynchronizer.order)
+    }
+
     /// Assign this closure to be notified when the flow has finished.
     /// For creation it means that the order has been created.
     /// For edition it means that the merchant has finished editing the order.

WooCommerce/Classes/ViewRelated/Orders/Order Creation/OrderForm.swift

@@ -152,6 +152,7 @@ struct OrderForm: View {
                     .disabled(viewModel.disabled)
                 case .done:
                     Button(Localization.doneButton) {
+                        viewModel.finishEditing()
                         dismissHandler()
                     }
                 case .loading:

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

@@ -354,10 +354,6 @@ private extension OrderDetailsViewController {
     ///
     private func editOrder() {
         let viewModel = EditableOrderViewModel(siteID: viewModel.order.siteID, flow: .editing(initialOrder: viewModel.order))
-        viewModel.onFinished = { [weak self] order in
-            guard let self = self else { return }
-            self.dismiss(animated: true)
-        }
         let viewController = OrderFormHostingController(viewModel: viewModel)
         let navController = UINavigationController(rootViewController: viewController)
         present(navController, animated: true)