diff --git a/Sources/Classes/BaseTextFieldViewModel/BaseTextFieldViewModel.swift b/Sources/Classes/BaseTextFieldViewModel/BaseTextFieldViewModel.swift index 9e1b0e4..c0ebcdd 100644 --- a/Sources/Classes/BaseTextFieldViewModel/BaseTextFieldViewModel.swift +++ b/Sources/Classes/BaseTextFieldViewModel/BaseTextFieldViewModel.swift @@ -105,8 +105,7 @@ public extension BaseTextFieldViewModelEvents { } let passedRules = offlineRules - .map { $0.validate(nonEmptyString) } - .reduce(true) { $0 && $1 } + .allSatisfy { $0.validate(nonEmptyString) } guard passedRules else { return .just(.initial) diff --git a/Sources/Services/ValidationService/ValidationService.swift b/Sources/Services/ValidationService/ValidationService.swift index 29b39e2..5662744 100644 --- a/Sources/Services/ValidationService/ValidationService.swift +++ b/Sources/Services/ValidationService/ValidationService.swift @@ -71,7 +71,7 @@ public final class ValidationService { public func validate() -> Bool { validationStateReactType = .all - let isValid = validationItems.map { $0.manualValidate() }.reduce(true) { $0 && $1 } + let isValid = validationItems.allSatisfy { $0.manualValidate() } validationStateReactType = .each return isValid @@ -95,7 +95,7 @@ public final class ValidationService { stateObservables.forEach { observable in observable .map { states -> Bool in - states.map { $0.isValid }.reduce(true) { $0 && $1 } + states.allSatisfy { $0.isValid } } .map { $0 ? ValidationServiceState.valid : .invalid } .bind(to: stateHolder)