Show done button in editing flow

Author: ealeksandrov

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

@@ -150,7 +150,10 @@ struct NewOrder: View {
                     .id(navigationButtonID)
                     .accessibilityIdentifier(Accessibility.createButtonIdentifier)
                     .disabled(viewModel.disabled)
-
+                case .done:
+                    Button(Localization.doneButton) {
+                        dismissHandler()
+                    }
                 case .loading:
                     ProgressView()
                 }
@@ -244,6 +247,7 @@ private extension NewOrder {
     enum Localization {
         static let title = NSLocalizedString("New Order", comment: "Title for the order creation screen")
         static let createButton = NSLocalizedString("Create", comment: "Button to create an order on the New Order screen")
+        static let doneButton = NSLocalizedString("Done", comment: "Button to dismiss the Order Editing screen")
         static let cancelButton = NSLocalizedString("Cancel", comment: "Button to cancel the creation of an order on the New Order screen")
         static let products = NSLocalizedString("Products", comment: "Title text of the section that shows the Products when creating a new order")
         static let addProduct = NSLocalizedString("Add Product", comment: "Title text of the button that adds a product when creating a new order")

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

@@ -368,6 +368,7 @@ extension NewOrderViewModel {
     ///
     enum NavigationItem: Equatable {
         case create
+        case done
         case loading
     }
 
@@ -520,12 +521,17 @@ private extension NewOrderViewModel {
     ///
     func configureNavigationTrailingItem() {
         Publishers.CombineLatest(orderSynchronizer.orderPublisher, $performingNetworkRequest)
-            .map { order, performingNetworkRequest -> NavigationItem in
-                guard !performingNetworkRequest else {
+            .map { [weak self] order, performingNetworkRequest -> NavigationItem in
+                guard let self = self, !performingNetworkRequest else {
                     return .loading
                 }
 
-                return .create
+                switch self.flow {
+                case .creation:
+                    return .create
+                case .editing:
+                    return .done
+                }
             }
             .assign(to: &$navigationTrailingItem)
     }