Update canBeDismissed to work only for order creation

Author: Ecarrion

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

@@ -44,7 +44,7 @@ final class NewOrderHostingController: UIHostingController<NewOrder> {
 ///
 extension NewOrderHostingController {
     override func shouldPopOnBackButton() -> Bool {
-        guard viewModel.canBeDismissed || !viewModel.hasChanges else {
+        guard viewModel.canBeDismissed else {
             presentDiscardChangesActionSheet(onDiscard: { [weak self] in
                 self?.discardOrderAndPop()
             })
@@ -62,7 +62,7 @@ extension NewOrderHostingController {
 ///
 extension NewOrderHostingController: UIAdaptivePresentationControllerDelegate {
     func presentationControllerShouldDismiss(_ presentationController: UIPresentationController) -> Bool {
-        return viewModel.canBeDismissed || !viewModel.hasChanges
+        return viewModel.canBeDismissed
     }
 
     func presentationControllerDidAttemptToDismiss(_ presentationController: UIPresentationController) {

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

@@ -36,10 +36,15 @@ final class NewOrderViewModel: ObservableObject {
         }
     }
 
-    /// Indicates whether view can be dismissed. If the value is `false` - confirmation alert will be displayd depending on `hasChanges` value.
+    /// Indicates whether view can be dismissed.
     ///
     var canBeDismissed: Bool {
-        flow == .creation
+        switch flow {
+        case .creation: // Creation can be dismissed when there aren't changes pending to commit.
+            return !hasChanges
+        case .editing: // Editing can always be dismissed because changes are committed instantly.
+            return true
+        }
     }
 
     /// Indicates whether the cancel button is visible.

WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Creation/NewOrderViewModelTests.swift

@@ -6,6 +6,7 @@ import WooFoundation
 final class NewOrderViewModelTests: XCTestCase {
 
     let sampleSiteID: Int64 = 123
+    let sampleOrderID: Int64 = 1234
     let sampleProductID: Int64 = 5
 
     func test_view_model_inits_with_expected_values() {
@@ -1012,6 +1013,46 @@ final class NewOrderViewModelTests: XCTestCase {
         XCTAssertEqual(viewModel.addressFormViewModel.fields.lastName, "",
                        "Pending change was not discarded when address form was reset")
     }
+
+    func test_canBeDismissed_is_true_when_creating_order_without_changes() {
+        // Given
+        let viewModel = NewOrderViewModel(siteID: sampleSiteID)
+
+        // Then
+        XCTAssertTrue(viewModel.canBeDismissed)
+    }
+
+    func test_canBeDismissed_is_false_when_creating_order_with_changes() {
+        // Given
+        let viewModel = NewOrderViewModel(siteID: sampleSiteID)
+
+        // When
+        viewModel.updateOrderStatus(newStatus: .failed)
+
+        // Then
+        XCTAssertFalse(viewModel.canBeDismissed)
+    }
+
+    func test_canBeDismissed_is_true_when_editing_order_without_changes() {
+        // Given
+        let order = Order.fake().copy(orderID: sampleOrderID)
+        let viewModel = NewOrderViewModel(siteID: sampleSiteID, flow: .editing(initialOrder: order))
+
+        // Then
+        XCTAssertTrue(viewModel.canBeDismissed)
+    }
+
+    func test_canBeDismissed_is_true_when_editing_order_with_changes() {
+        // Given
+        let order = Order.fake().copy(orderID: sampleOrderID)
+        let viewModel = NewOrderViewModel(siteID: sampleSiteID, flow: .editing(initialOrder: order))
+
+        // When
+        viewModel.updateOrderStatus(newStatus: .failed)
+
+        // Then
+        XCTAssertTrue(viewModel.canBeDismissed)
+    }
 }
 
 private extension MockStorageManager {