Re-add logic for disabling card button prior to validation pass

primer-io · Jan 26, 2024 · db727e8 · db727e8
1 parent 2326c4b
commit db727e8
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/Co-Badged Cards/SwiftUI/Co-Badged Cards Example/Models/PrimerCardDataErrorsModel.swift b/Co-Badged Cards/SwiftUI/Co-Badged Cards Example/Models/PrimerCardDataErrorsModel.swift
@@ -22,6 +22,15 @@ class PrimerCardDataErrorsModel: PrimerBaseCardDataModel {
         self.cardholderName = ""
         self.selectedCardNetwork = .unknown
     }
+
+    var hasErrors: Bool {
+        !(
+            cardNumber.isEmpty &&
+            expiryDate.isEmpty &&
+            cvvNumber.isEmpty &&
+            cardholderName.isEmpty
+        )
+    }
 }
 
 extension PrimerCardDataErrorsModel: PrimerDataServiceErrorsDelegate {

diff --git a/Co-Badged Cards/SwiftUI/Co-Badged Cards Example/Models/PrimerCardDataModel.swift b/Co-Badged Cards/SwiftUI/Co-Badged Cards Example/Models/PrimerCardDataModel.swift
@@ -69,6 +69,13 @@ class PrimerCardDataModel: PrimerBaseCardDataModel {
             }
         }.store(in: &cancellables)
     }
+
+    var isEmpty: Bool {
+        cardNumber.isEmpty &&
+        expiryDate.isEmpty &&
+        cvvNumber.isEmpty &&
+        cardholderName.isEmpty
+    }
 }
 
 extension PrimerCardDataModel: PrimerDataServiceModelsDelegate {

diff --git a/Co-Badged Cards/SwiftUI/Co-Badged Cards Example/Views/Views/CardDetailsFormView.swift b/Co-Badged Cards/SwiftUI/Co-Badged Cards Example/Views/Views/CardDetailsFormView.swift
@@ -69,7 +69,11 @@ struct CardDetailsFormView: View {
             )
 
             VStack(spacing: 12) {
-                PrimerButton(action: onSubmit, labelText: "Pay")
+                PrimerButton(
+                    action: onSubmit,
+                    labelText: "Pay",
+                    isEnabled: !errors.hasErrors && !model.isEmpty
+                )
             }
             .padding([.leading, .trailing], 6)
         }

diff --git a/Co-Badged Cards/SwiftUI/Co-Badged Cards Example/Views/Views/Controls/PrimerButton.swift b/Co-Badged Cards/SwiftUI/Co-Badged Cards Example/Views/Views/Controls/PrimerButton.swift
@@ -13,6 +13,8 @@ struct PrimerButton: View {
 
     let labelText: String
 
+    let isEnabled: Bool
+
     @State var isWaitingForActionToComplete: Bool = false
 
     var body: some View {
@@ -31,6 +33,6 @@ struct PrimerButton: View {
             }
         }
         .primerButtonStyle()
-        .disabled(isWaitingForActionToComplete)
+        .disabled(isWaitingForActionToComplete || !isEnabled)
     }
 }