Fixing required validation

aws-amplify · Mar 11, 2024 · 75c70d1 · 75c70d1
1 parent 438e6bc
commit 75c70d1
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Sources/Authenticator/Views/Primitives/PhoneNumberField.swift b/Sources/Authenticator/Views/Primitives/PhoneNumberField.swift
@@ -60,8 +60,8 @@ struct PhoneNumberField: View {
                     .foregroundColor(foregroundColor)
                     .focused($focusedField, equals: .callingCode)
                     .onChange(of: callingCode) { code in
-                        if !phoneNumber.isEmpty {
-                            text = "\(code)\(phoneNumber)"
+                        if !numericPhoneNumber.isEmpty {
+                            text = "\(code)\(numericPhoneNumber)"
                         }
                     }
 
@@ -80,13 +80,11 @@ struct PhoneNumberField: View {
                             return
                         }
 
-                        if phoneNumber.isEmpty {
+                        if numericPhoneNumber.isEmpty {
                             // If the phone number is empty, we consider this to be an empty input regardless of the calling code, as that one is automatically populated
                             self.text = ""
                         } else {
-                            // Only numbers are allowed by the service, so remove other characters in the internally tracked full phone number
-                            let onlyNumbers = phoneNumber.filter("0123456789".contains)
-                            self.text = "\(callingCode)\(onlyNumbers)"
+                            self.text = "\(callingCode)\(numericPhoneNumber)"
                         }
 
                         if validator.state != .normal || !phoneNumber.isEmpty {
@@ -154,6 +152,10 @@ struct PhoneNumberField: View {
         case callingCode
         case phoneNumber
     }
+
+    private var numericPhoneNumber: String {
+        return phoneNumber.filter("0123456789".contains)
+    }
 }
 
 /// This allows the user to select a dialing code from a list of all available ones,