From 67312fefd3cea787b1a071ac3c5ab03528f1da35 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 19 Jan 2022 11:45:59 -0600 Subject: [PATCH 1/2] if false, the loop was breaking out before the previousValidity was set with the fieldKey that failed. Signed-off-by: Matt Bruce --- MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift index 70b787bf..aa07cb29 100644 --- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift +++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift @@ -43,6 +43,7 @@ public class RuleEqualsModel: RulesProtocol { if compareValue != formField.formFieldValue() { valid = false + previousValidity[formKey] = valid break } else { var fieldValidity = valid @@ -50,9 +51,8 @@ public class RuleEqualsModel: RulesProtocol { if let validity = previousFieldValidity[formKey], !validity, fieldValidity { fieldValidity = false } + previousValidity[formKey] = valid } - previousValidity[formKey] = valid - } return (valid: valid, fieldValidity: previousValidity) } From a2319babc738362d70b395b3b874c510fc2b78df Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 19 Jan 2022 11:52:04 -0600 Subject: [PATCH 2/2] ensure the previousValidity is set before breaks Signed-off-by: Matt Bruce --- .../FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift index 25e21d4f..95149551 100644 --- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift +++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift @@ -50,7 +50,7 @@ public class RuleEqualsIgnoreCaseModel: RulesProtocol { if let validity = previousFieldValidity[formKey], !validity, fieldValidity { fieldValidity = false } - + previousValidity[formKey] = valid break }