From 672e8feb6a4c3b6d8484a1c8c41bd39640f1022c Mon Sep 17 00:00:00 2001 From: Rebecca Antonelli Date: Wed, 14 Jun 2023 11:41:17 -0500 Subject: [PATCH 1/4] validates after choosing contact --- MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift index db3c28c4..b06f00ac 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift @@ -134,6 +134,7 @@ import MVMCore UIAccessibility.post(notification: .layoutChanged, argument: textField) } + self.validateText() return isValid } From b6d9cf5255cedd80607b3a076a96e06a83f6ca96 Mon Sep 17 00:00:00 2001 From: Rebecca Antonelli Date: Wed, 14 Jun 2023 13:47:09 -0500 Subject: [PATCH 2/4] validates after choosing contact better fix --- .../Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift index b06f00ac..81f08f45 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift @@ -134,7 +134,6 @@ import MVMCore UIAccessibility.post(notification: .layoutChanged, argument: textField) } - self.validateText() return isValid } @@ -218,6 +217,7 @@ import MVMCore if validateMDNTextField() && isNationalMDN { textField.text = MVMCoreUIUtility.formatMdn(textField.text) + self.validateText() } } From a384e816db3f9576dc7b5bd750291637b27059af Mon Sep 17 00:00:00 2001 From: Rebecca Antonelli Date: Thu, 15 Jun 2023 08:08:38 -0500 Subject: [PATCH 3/4] fix check --- .../Atoms/FormFields/TextFields/MdnEntryField.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift index 81f08f45..837493e5 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift @@ -215,9 +215,11 @@ import MVMCore proprietorTextDelegate?.textFieldDidEndEditing?(textField) - if validateMDNTextField() && isNationalMDN { - textField.text = MVMCoreUIUtility.formatMdn(textField.text) - self.validateText() + if validateMDNTextField() { + if isNationalMDN { + textField.text = MVMCoreUIUtility.formatMdn(textField.text) + } + validateText() } } From e122c3abcb8694aa08ce3a0c589410ad8003962f Mon Sep 17 00:00:00 2001 From: Rebecca Antonelli Date: Thu, 15 Jun 2023 11:25:06 -0500 Subject: [PATCH 4/4] add comment for clarity --- MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift index 837493e5..502682c2 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift @@ -219,6 +219,7 @@ import MVMCore if isNationalMDN { textField.text = MVMCoreUIUtility.formatMdn(textField.text) } + // Validate the base input field along with triggering form field validation rules. validateText() } }