diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift index 224d2334..090812b3 100644 --- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift +++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift @@ -29,23 +29,22 @@ public class RuleEqualsIgnoreCaseModel: RulesProtocol { public func validate(_ fieldMolecules: [String: FormFieldProtocol]) -> Bool { var valid = false - var compareValue: String? + var compareText: String? for formKey in fields { guard let formField = fieldMolecules[formKey] else { continue } - if compareValue == nil { - compareValue = formField.formFieldValue() as? String + guard let compareString = compareText else { + compareText = formField.formFieldValue() as? String continue } - if let compareValue = compareValue, let fieldValue = formField.formFieldValue() as? String, - compareValue.caseInsensitiveCompare(fieldValue) == .orderedSame { + if let fieldValue = formField.formFieldValue() as? String, + compareString.caseInsensitiveCompare(fieldValue) == .orderedSame { valid = true - (formField as? FormRuleWatcherFieldProtocol)?.setValidity(valid, rule: self) - } else { - (formField as? FormRuleWatcherFieldProtocol)?.setValidity(valid, rule: self) } + + (formField as? FormRuleWatcherFieldProtocol)?.setValidity(valid, rule: self) } return valid