PointOfSaleCollectCashView: prefill text field with order total, update button enabled state based on input & loading state, and remove validation error.

Author: jaclync

WooCommerce/Classes/POS/Presentation/PointOfSaleCollectCashView.swift

@@ -25,6 +25,12 @@ struct PointOfSaleCollectCashView: View {
         String.localizedStringWithFormat(Localization.backNavigationSubtitle, orderTotal)
     }
 
+    private var isButtonEnabled: Bool {
+        viewHelper.isPaymentButtonEnabled(orderTotal: orderTotal,
+                                          textFieldAmountInput: textFieldAmountInput,
+                                          isLoading: isLoading)
+    }
+
     @StateObject private var textFieldViewModel = FormattableAmountTextFieldViewModel(size: .extraLarge,
                                                                                       locale: Locale.autoupdatingCurrent,
                                                                                       storeCurrencySettings: ServiceLocator.currencySettings,
@@ -89,7 +95,7 @@ struct PointOfSaleCollectCashView: View {
                         .buttonStyle(POSFilledButtonStyle(size: .normal, isLoading: isLoading))
                         .frame(maxWidth: .infinity)
                         .dynamicTypeSize(...DynamicTypeSize.accessibility1)
-                        .disabled(isLoading)
+                        .disabled(!isButtonEnabled)
                     }
                     .padding([.horizontal])
                     .padding(.bottom, max(keyboardFrame.height - geometry.safeAreaInsets.bottom,
@@ -110,6 +116,9 @@ struct PointOfSaleCollectCashView: View {
             }
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .onAppear {
+            prefillOrderTotal()
+        }
     }
 
     private func markComplete() async throws {
@@ -122,9 +131,6 @@ struct PointOfSaleCollectCashView: View {
 private extension PointOfSaleCollectCashView {
     private func submitCashAmount() async {
         ServiceLocator.analytics.track(.pointOfSaleCashPaymentTapped)
-        guard validateAmountOnSubmit() else {
-            return
-        }
         isLoading = true
         do {
             try await markComplete()
@@ -141,14 +147,12 @@ private extension PointOfSaleCollectCashView {
             textFieldAmountInput: textFieldAmountInput)
     }
 
-    private func validateAmountOnSubmit() -> Bool {
-        viewHelper.validateAmountOnSubmit(
-            orderTotal: orderTotal,
-            textFieldAmountInput: textFieldAmountInput,
-            onError: { error in
-                errorMessage = error
-            })
+    private func prefillOrderTotal() {
+        if let orderDecimal = viewHelper.parseCurrency(orderTotal) {
+            textFieldViewModel.presetAmount(orderDecimal)
         }
+        isTextFieldFocused = true
+    }
 }
 
 private extension PointOfSaleCollectCashView {

WooCommerce/Classes/POS/ViewHelpers/CollectCashViewHelper.swift

@@ -54,25 +54,17 @@ final class CollectCashViewHelper {
         }
     }
 
-    func validateAmountOnSubmit(orderTotal: String,
+    func isPaymentButtonEnabled(orderTotal: String,
                                 textFieldAmountInput: String,
-                                onError: (String) -> Void) -> Bool {
-        let userInput = textFieldAmountInput.isNotEmpty ? textFieldAmountInput : "0"
-
+                                isLoading: Bool) -> Bool {
         guard let orderDecimal = parseCurrency(orderTotal),
-              let inputDecimal = parseCurrency(userInput) else {
-            onError(Localization.failedToCollectCashPayment)
-            return false
-        }
-
-        if inputDecimal < orderDecimal {
-            onError(Localization.cashPaymentAmountNotEnough)
+              let inputDecimal = parseCurrency(textFieldAmountInput.isNotEmpty ? textFieldAmountInput : "0") else {
             return false
         }
-        return true
+        return inputDecimal >= orderDecimal && !isLoading
     }
 
-    private func parseCurrency(_ amountString: String) -> Decimal? {
+    func parseCurrency(_ amountString: String) -> Decimal? {
         // Removes all leading/trailing whitespace, if any
         let sanitized = amountString.trimmingCharacters(in: .whitespacesAndNewlines)
 
@@ -101,16 +93,6 @@ private extension CollectCashViewHelper {
             comment: "Change due when the cash amount entered exceeds the order total." +
             "Reads as 'Change due: $1.23'"
         )
-        static let failedToCollectCashPayment = NSLocalizedString(
-            "collectcashviewhelper.failedtocollectcashpayment.errormessage",
-            value: "Error trying to process payment. Try again.",
-            comment: "Error message when the system fails to collect a cash payment."
-        )
-        static let cashPaymentAmountNotEnough = NSLocalizedString(
-            "collectcashviewhelper.cashpaymentamountnotenough.errormessage",
-            value: "Amount must be more or equal to total.",
-            comment: "Error message when the cash amount entered is less than the order total."
-        )
     }
 }