From faf70f555231fb4799f7469d6f486faa3e6be81b Mon Sep 17 00:00:00 2001
From: "Suresh, Kamlesh" <kamlesh.suresh@verizonwireless.com>
Date: Wed, 6 May 2020 12:23:22 -0400
Subject: [PATCH] error

---
 .../Atomic/Atoms/TextFields/EntryFieldModel.swift      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
index dcccddda..fc78613b 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
@@ -67,10 +67,12 @@ import Foundation
     }
     
     public func setValidity(_ valid: Bool, rule: RulesProtocol) {
-        if let fieldKey = fieldKey {
-            self.errorMessage = rule.errorMessage?[fieldKey]
-            self.isValid = valid
-        }        
+        if let fieldKey = fieldKey,
+            let ruleErrorMessage = rule.errorMessage?[fieldKey] {
+            self.errorMessage = ruleErrorMessage
+        }
+        self.isValid = valid
+
     }
     
     //--------------------------------------------------