From dabad14ed5009368214e7b9ffd27d3ff512061c7 Mon Sep 17 00:00:00 2001
From: "Suresh, Kamlesh" <kamlesh.suresh@verizonwireless.com>
Date: Wed, 6 Jan 2021 18:51:03 -0500
Subject: [PATCH] code review fiixes

---
 .../Atomic/Atoms/FormFields/TextFields/EntryField.swift     | 3 ++-
 .../Atoms/FormFields/TextFields/EntryFieldModel.swift       | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
index e29081ea..23b9710f 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
@@ -319,7 +319,8 @@ import UIKit
         
         model.updateUIDynamicError = { [weak self] in
             MVMCoreDispatchUtility.performBlock(onMainThread: {
-                guard let self = self else { return }
+                guard let self = self, model.dynamicErrorMessage != nil else { return }
+                model.isValid = false
                 self.updateValidation(model.isValid ?? false)
             })
         }
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift
index f70110ec..08d3ee39 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift
@@ -23,8 +23,7 @@ import Foundation
     public var title: String?
     public var feedback: String?
     public var dynamicErrorMessage: String? {
-        didSet {
-            isValid = false
+        didSet {            
             updateUIDynamicError?()
         }
     }
@@ -47,7 +46,8 @@ import Foundation
     
     /// Temporary binding mechanism for the view to update on enable changes.
     public var updateUI: ActionBlock?
-    
+
+    // TODO: Remove once updateUI is fixed with isSelected
     public var updateUIDynamicError: ActionBlock?
     
     //--------------------------------------------------