Merge pull request #5629 from woocommerce/issue/5598-5599-amount-validations

Author: Ecarrion

WooCommerce/Classes/ViewRelated/Orders/Simple Payments/Amount/SimplePaymentsAmount.swift

@@ -75,7 +75,7 @@ extension SimplePaymentsAmountHostingController: UIAdaptivePresentationControlle
     }
 
     func presentationControllerShouldDismiss(_ presentationController: UIPresentationController) -> Bool {
-        !rootView.viewModel.disableCancel
+        !rootView.viewModel.disableViewActions
     }
 }
 
@@ -139,9 +139,9 @@ struct SimplePaymentsAmount: View {
                     dismiss()
                     viewModel.userDidCancelFlow()
                 })
-                    .disabled(viewModel.disableCancel)
             }
         }
+        .disabled(viewModel.disableViewActions)
         .wooNavigationBarStyle()
     }
 

WooCommerce/Classes/ViewRelated/Orders/Simple Payments/Amount/SimplePaymentsAmountViewModel.swift

@@ -35,17 +35,17 @@ final class SimplePaymentsAmountViewModel: ObservableObject {
     ///
     var onOrderCreated: (Order) -> Void = { _ in }
 
-    /// Returns true when amount has less than two characters.
-    /// Less than two, because `$` should be the first character.
+    /// Returns true when the amount is not a positive number.
     ///
     var shouldDisableDoneButton: Bool {
-        amount.count < 2
+        let decimalAmount = (currencyFormatter.convertToDecimal(from: amount) ?? .zero) as Decimal
+        return decimalAmount <= .zero
     }
 
-    /// Use this to disables interactive dismissal and
-    /// Disables cancel button while performing the create order operation
+    /// Defines if the view actions should be disabled.
+    /// Currently true while a network operation is happening.
     ///
-    var disableCancel: Bool {
+    var disableViewActions: Bool {
         loading
     }
 
@@ -85,6 +85,10 @@ final class SimplePaymentsAmountViewModel: ObservableObject {
     ///
     private let storeCurrencySettings: CurrencySettings
 
+    /// Currency formatter for the provided amount
+    ///
+    private let currencyFormatter: CurrencyFormatter
+
     /// Current store currency symbol
     ///
     private let storeCurrencySymbol: String
@@ -110,6 +114,7 @@ final class SimplePaymentsAmountViewModel: ObservableObject {
         self.presentNoticeSubject = presentNoticeSubject
         self.storeCurrencySettings = storeCurrencySettings
         self.storeCurrencySymbol = storeCurrencySettings.symbol(from: storeCurrencySettings.currencyCode)
+        self.currencyFormatter = CurrencyFormatter(currencySettings: storeCurrencySettings)
         self.analytics = analytics
         self.isDevelopmentPrototype = isDevelopmentPrototype
     }

WooCommerce/Classes/ViewRelated/Orders/Simple Payments/Summary/SimplePaymentsSummary.swift

@@ -59,6 +59,7 @@ struct SimplePaymentsSummary: View {
                 viewModel.reloadContent()
                 }, viewModel: viewModel.noteViewModel)
         }
+        .disabled(viewModel.disableViewActions)
     }
 }
 

WooCommerce/Classes/ViewRelated/Orders/Simple Payments/Summary/SimplePaymentsSummaryViewModel.swift

@@ -46,6 +46,12 @@ final class SimplePaymentsSummaryViewModel: ObservableObject {
         noteViewModel.newNote
     }
 
+    /// Disable view actions while a network request is being performed
+    ///
+    var disableViewActions: Bool {
+        return showLoadingIndicator
+    }
+
     /// Total to charge with taxes.
     ///
     private let totalWithTaxes: String

WooCommerce/WooCommerceTests/ViewRelated/Orders/Simple Payments/SimplePaymentsAmountViewModelTests.swift

@@ -91,6 +91,17 @@ final class SimplePaymentsAmountViewModelTests: XCTestCase {
         XCTAssertTrue(viewModel.shouldDisableDoneButton)
     }
 
+    func test_view_model_disables_next_button_when_amount_is_not_greater_than_zero() {
+        // Given
+        let viewModel = SimplePaymentsAmountViewModel(siteID: sampleSiteID, storeCurrencySettings: usStoreSettings)
+
+        // When
+        viewModel.amount = "$0"
+
+        // Then
+        XCTAssertTrue(viewModel.shouldDisableDoneButton)
+    }
+
     func test_view_model_enables_next_button_when_amount_has_more_than_one_character() {
         // Given
         let viewModel = SimplePaymentsAmountViewModel(siteID: sampleSiteID, storeCurrencySettings: usStoreSettings)
@@ -320,7 +331,7 @@ final class SimplePaymentsAmountViewModelTests: XCTestCase {
         XCTAssertFalse(viewModel.loading)
 
         // Before creating simple payment order
-        XCTAssertFalse(viewModel.disableCancel)
+        XCTAssertFalse(viewModel.disableViewActions)
 
         // When
         let _: Bool = waitFor { promise in
@@ -336,7 +347,7 @@ final class SimplePaymentsAmountViewModelTests: XCTestCase {
         }
 
         // Then
-        XCTAssertTrue(viewModel.disableCancel)
+        XCTAssertTrue(viewModel.disableViewActions)
     }
 
 }