From 5acd6f0b23061c7912ec92cb69ba21f50c72f9be Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Thu, 26 Jun 2025 08:04:21 -0700
Subject: [PATCH 01/14] AB#29051 - Add CC and BCC support to email notification
 system

---
 .../EmailNotificationService.cs               | 49 +++++++++++++++----
 .../IEmailNotificationService.cs              |  8 +--
 .../Events/EmailNotificationEvent.cs          |  6 ++-
 .../Events/EmailNotificationHandler.cs        | 26 +++++++---
 .../Emails/CreateEmailDto.cs                  |  5 ++
 .../Emails/EmailAppService.cs                 |  4 ++
 .../Components/EmailsWidget/Default.cshtml    | 10 ++++
 .../Shared/Components/EmailsWidget/Default.js | 12 ++++-
 .../EmailsWidget/EmailsWidgetViewComponent.cs |  2 +-
 .../EmailsWidget/EmailsWidgetViewModel.cs     |  8 +++
 10 files changed, 104 insertions(+), 26 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
index e7687324f..80854e579 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
@@ -98,14 +98,14 @@ public async Task DeleteEmail(Guid id)
         await _emailLogsRepository.DeleteAsync(id);
     }
 
-    public async Task<EmailLog?> UpdateEmailLog(Guid emailId, string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status,string? emailTemplateName)
+    public async Task<EmailLog?> UpdateEmailLog(Guid emailId, string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
     {
         if (string.IsNullOrEmpty(emailTo))
         {
             return null;
         }
         
-        var emailObject = await GetEmailObjectAsync(emailTo, body, subject, emailFrom, "html", emailTemplateName);
+        var emailObject = await GetEmailObjectAsync(emailTo, body, subject, emailFrom, "html", emailTemplateName, emailCC, emailBCC);
         EmailLog emailLog = await _emailLogsRepository.GetAsync(emailId);
         emailLog = UpdateMappedEmailLog(emailLog, emailObject);
         emailLog.ApplicationId = applicationId;
@@ -117,19 +117,19 @@ public async Task DeleteEmail(Guid id)
         return loggedEmail;
     }
 
-    public async Task<EmailLog?> InitializeEmailLog(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? emailTemplateName)
+    public async Task<EmailLog?> InitializeEmailLog(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
     {
-        return await InitializeEmailLog(emailTo, body, subject, applicationId, emailFrom, EmailStatus.Initialized, emailTemplateName);
+        return await InitializeEmailLog(emailTo, body, subject, applicationId, emailFrom, EmailStatus.Initialized, emailTemplateName, emailCC, emailBCC);
     }
 
     [RemoteService(false)]
-    public async Task<EmailLog?> InitializeEmailLog(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName)
+    public async Task<EmailLog?> InitializeEmailLog(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
     {
         if (string.IsNullOrEmpty(emailTo))
         {
             return null;
         }
-        var emailObject = await GetEmailObjectAsync(emailTo, body, subject, emailFrom, "html", emailTemplateName);
+        var emailObject = await GetEmailObjectAsync(emailTo, body, subject, emailFrom, "html", emailTemplateName, emailCC, emailBCC);
         EmailLog emailLog = new EmailLog();
         emailLog = UpdateMappedEmailLog(emailLog, emailObject);
         emailLog.ApplicationId = applicationId;
@@ -234,9 +234,12 @@ public async Task<HttpResponseMessage> SendCommentNotification(EmailCommentDto i
     /// <param name="body">The body of the email</param>
     /// <param name="subject">Subject Message</param>
     /// <param name="emailFrom">From Email Address</param>
-    ///  <param name="emailBodyType">Type of body email: html or text</param>
+    /// <param name="emailBodyType">Type of body email: html or text</param>
+    /// <param name="emailTemplateName">Template name for the email</param>
+    /// <param name="emailCC">CC email addresses</param>
+    /// <param name="emailBCC">BCC email addresses</param>
     /// <returns>HttpResponseMessage indicating the result of the operation</returns>
-    public async Task<HttpResponseMessage> SendEmailNotification(string emailTo, string body, string subject, string? emailFrom, string? emailBodyType, string? emailTemplateName)
+    public async Task<HttpResponseMessage> SendEmailNotification(string emailTo, string body, string subject, string? emailFrom, string? emailBodyType, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
     {
         try
         {
@@ -250,7 +253,7 @@ public async Task<HttpResponseMessage> SendEmailNotification(string emailTo, str
 
             }
             // Send the email using the CHES client service
-            var emailObject = await GetEmailObjectAsync(emailTo, body, subject, emailFrom, emailBodyType, emailTemplateName);
+            var emailObject = await GetEmailObjectAsync(emailTo, body, subject, emailFrom, emailBodyType, emailTemplateName, emailCC, emailBCC);
             var response = await _chesClientService.SendAsync(emailObject);
 
             // Assuming SendAsync returns a HttpResponseMessage or equivalent:
@@ -328,7 +331,7 @@ public async Task SendEmailToQueue(EmailLog emailLog)
         await _emailQueueService.SendToEmailEventQueueAsync(emailNotificationEvent);
     }
 
-    protected virtual async Task<dynamic> GetEmailObjectAsync(string emailTo, string body, string subject, string? emailFrom, string? emailBodyType, string? emailTemplateName)
+    protected virtual async Task<dynamic> GetEmailObjectAsync(string emailTo, string body, string subject, string? emailFrom, string? emailBodyType, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
     {
         List<string> toList = new();
         string[] emails = emailTo.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries);
@@ -338,12 +341,36 @@ protected virtual async Task<dynamic> GetEmailObjectAsync(string emailTo, string
             toList.Add(email.Trim());
         }
 
+        List<string>? ccList = null;
+        if (!string.IsNullOrWhiteSpace(emailCC))
+        {
+            ccList = new List<string>();
+            string[] ccEmails = emailCC.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries);
+            foreach (string email in ccEmails)
+            {
+                ccList.Add(email.Trim());
+            }
+        }
+
+        List<string>? bccList = null;
+        if (!string.IsNullOrWhiteSpace(emailBCC))
+        {
+            bccList = new List<string>();
+            string[] bccEmails = emailBCC.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries);
+            foreach (string email in bccEmails)
+            {
+                bccList.Add(email.Trim());
+            }
+        }
+
         var defaultFromAddress = await SettingProvider.GetOrNullAsync(NotificationsSettings.Mailing.DefaultFromAddress);
 
         var emailObject = new
         {
             body,
             bodyType = emailBodyType ?? "text",
+            cc = ccList,
+            bcc = bccList,
             encoding = "utf-8",
             from = emailFrom ?? defaultFromAddress ?? "NoReply@gov.bc.ca",
             priority = "normal",
@@ -362,6 +389,8 @@ protected virtual EmailLog UpdateMappedEmailLog(EmailLog emailLog, dynamic email
         emailLog.BodyType = emailDynamicObject.bodyType;
         emailLog.FromAddress = emailDynamicObject.from;
         emailLog.ToAddress = String.Join(",", emailDynamicObject.to);
+        emailLog.CC = emailDynamicObject.cc != null ? String.Join(",", emailDynamicObject.cc) : "";
+        emailLog.BCC = emailDynamicObject.bcc != null ? String.Join(",", emailDynamicObject.bcc) : "";
         emailLog.TemplateName = emailDynamicObject.templateName;
         return emailLog;
     }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/IEmailNotificationService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/IEmailNotificationService.cs
index a4304c06c..9813b44f7 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/IEmailNotificationService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/IEmailNotificationService.cs
@@ -10,12 +10,12 @@ namespace Unity.Notifications.EmailNotifications
 {
     public interface IEmailNotificationService : IApplicationService
     {
-        Task<EmailLog?> UpdateEmailLog(Guid emailId, string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName);
-        Task<EmailLog?> InitializeEmailLog(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName);
-        Task<EmailLog?> InitializeEmailLog(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? emailTemplateName);
+        Task<EmailLog?> UpdateEmailLog(Guid emailId, string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null);
+        Task<EmailLog?> InitializeEmailLog(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null);
+        Task<EmailLog?> InitializeEmailLog(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? emailTemplateName, string? emailCC = null, string? emailBCC = null);
         Task<EmailLog?> GetEmailLogById(Guid id);
         Task<HttpResponseMessage> SendCommentNotification(EmailCommentDto input);
-        Task<HttpResponseMessage> SendEmailNotification(string emailTo, string body, string subject, string? emailFrom, string? emailBodyType, string? emailTemplateName);
+        Task<HttpResponseMessage> SendEmailNotification(string emailTo, string body, string subject, string? emailFrom, string? emailBodyType, string? emailTemplateName, string? emailCC = null, string? emailBCC = null);
         Task SendEmailToQueue(EmailLog emailLog);
         string GetApprovalBody();
         string GetDeclineBody();
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationEvent.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationEvent.cs
index a502e50a8..ff1ade61c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationEvent.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationEvent.cs
@@ -16,8 +16,10 @@ public class EmailNotificationEvent
         public string Subject { get; set; } = string.Empty;
         public string? EmailFrom { get; set; } = string.Empty;
         public string EmailAddress { get; set; } = string.Empty;
-        public List<string> EmailAddressList { get; set; } = new List<string>();
-
+        public List<string> EmailAddressList { get; set; } = [];
+        public string? EmailCC { get; set; } = string.Empty;
+        public string? EmailBCC { get; set; } = string.Empty;
+        public IEnumerable<string> Cc { get; set; } = [];
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public EmailAction Action { get; set; }
         public string? EmailTemplateName { get; set; } = string.Empty;
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
index f924ad56a..63afa3542 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
@@ -25,7 +25,7 @@ public async Task HandleEventAsync(EmailNotificationEvent eventData)
             }
         }
 
-        private async Task InitializeAndSendEmailToQueue(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? emailTemplateName)
+        private async Task InitializeAndSendEmailToQueue(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
         {
             EmailLog emailLog = await InitializeEmail(
                                                 emailTo,
@@ -34,12 +34,14 @@ private async Task InitializeAndSendEmailToQueue(string emailTo, string body, st
                                                 applicationId,
                                                 emailFrom,
                                                 EmailStatus.Initialized,
-                                                emailTemplateName);
+                                                emailTemplateName,
+                                                emailCC,
+                                                emailBCC);
 
             await emailNotificationService.SendEmailToQueue(emailLog);
         }
 
-        private async Task<EmailLog> InitializeEmail(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string status, string? emailTemplateName)
+        private async Task<EmailLog> InitializeEmail(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
         {
             EmailLog emailLog = await emailNotificationService.InitializeEmailLog(
                                                 emailTo,
@@ -48,7 +50,9 @@ private async Task<EmailLog> InitializeEmail(string emailTo, string body, string
                                                 applicationId,
                                                 emailFrom,
                                                 status,
-                                                emailTemplateName) ?? throw new UserFriendlyException("Unable to Initialize Email Log");
+                                                emailTemplateName,
+                                                emailCC,
+                                                emailBCC) ?? throw new UserFriendlyException("Unable to Initialize Email Log");
             return emailLog;
         }
 
@@ -87,7 +91,7 @@ private async Task HandleSendCustomEmail(EmailNotificationEvent eventData)
                 string emailToAddress = String.Join(",", eventData.EmailAddressList);
                 if (eventData.Id == Guid.Empty)
                 {
-                    await InitializeAndSendEmailToQueue(emailToAddress, eventData.Body, eventData.Subject, eventData.ApplicationId, eventData.EmailFrom,eventData.EmailTemplateName);
+                    await InitializeAndSendEmailToQueue(emailToAddress, eventData.Body, eventData.Subject, eventData.ApplicationId, eventData.EmailFrom, eventData.EmailTemplateName, eventData.EmailCC, eventData.EmailBCC);
                 }
                 else
                 {
@@ -99,7 +103,9 @@ private async Task HandleSendCustomEmail(EmailNotificationEvent eventData)
                         eventData.ApplicationId,
                         eventData.EmailFrom,
                         EmailStatus.Initialized,
-                        eventData.EmailTemplateName);
+                        eventData.EmailTemplateName,
+                        eventData.EmailCC,
+                        eventData.EmailBCC);
 
                     if (emailLog != null)
                     {
@@ -129,7 +135,9 @@ await emailNotificationService.UpdateEmailLog(
                         eventData.ApplicationId,
                         eventData.EmailFrom,
                         EmailStatus.Draft,
-                        eventData.EmailTemplateName);
+                        eventData.EmailTemplateName,
+                        eventData.EmailCC,
+                        eventData.EmailBCC);
                 }
                 else
                 {
@@ -140,7 +148,9 @@ await InitializeEmail(
                         eventData.ApplicationId,
                         eventData.EmailFrom,
                         EmailStatus.Draft, 
-                        eventData.EmailTemplateName);
+                        eventData.EmailTemplateName,
+                        eventData.EmailCC,
+                        eventData.EmailBCC);
                 }
             
         }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Emails/CreateEmailDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Emails/CreateEmailDto.cs
index f6ddffba4..8433ffe51 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Emails/CreateEmailDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Emails/CreateEmailDto.cs
@@ -18,6 +18,11 @@ public class CreateEmailDto
         
         [Required]
         public string EmailBody { get; set; } = string.Empty;
+        
+        public string? EmailCC { get; set; }
+        
+        public string? EmailBCC { get; set; }
+        
         public Guid ApplicationId { get; set; }
         public Guid OwnerId { get; set; }
         public Guid EmailId { get; set; } = Guid.Empty;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs
index db050d151..ab8cb7189 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs
@@ -36,6 +36,8 @@ private static EmailNotificationEvent GetEmailNotificationEvent(CreateEmailDto d
             List<string> toList = [];
             string[] emails = dto.EmailTo.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries);
 
+            dto.Bcc = dto.EmailBCC.Split(";").Select(e => e?.Trim()).Concat(email.Bcc?.Any() ?? false ? email.Bcc : []).NotNullOrWhiteSpace();
+
             foreach (string email in emails)
             {
                 toList.Add(email.Trim());
@@ -49,6 +51,8 @@ private static EmailNotificationEvent GetEmailNotificationEvent(CreateEmailDto d
                 EmailAddress = dto.EmailTo,
                 EmailAddressList = toList,
                 EmailFrom = dto.EmailFrom,
+                EmailCC = dto.EmailCC,
+                EmailBCC = dto.EmailBCC,
                 Subject = dto.EmailSubject,
                 Body = dto.EmailBody,
                 EmailTemplateName = dto.EmailTemplateName
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
index 832884db3..665c4d83e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
@@ -90,6 +90,16 @@
                     <abp-input asp-for="@Model.EmailTo" class="email-input" />
                 </abp-column>
             </abp-row>
+            <abp-row class="m-0 p-0">
+                <abp-column size="_10" class="px-1">
+                    <abp-input asp-for="@Model.EmailCC" class="email-input" />
+                </abp-column>
+            </abp-row>
+            <abp-row class="m-0 p-0">
+                <abp-column size="_10" class="px-1">
+                    <abp-input asp-for="@Model.EmailBCC" class="email-input" />
+                </abp-column>
+            </abp-row>
             <abp-row class="m-0 p-0">
                 <abp-column size="_10" class="px-1">
                     <abp-input asp-for="@Model.EmailFrom" class="email-input" />
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
index 3813c69d0..2850e0931 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
@@ -13,10 +13,14 @@
         inputEmailId: $('#EmailId'),
         inputEmailTo: $($('#EmailTo')[0]),
         inputEmailToField: $('#EmailTo')[0],
+        inputEmailCC: $($('#EmailCC')[0]),
+        inputEmailBCC: $($('#EmailBCC')[0]),
         inputEmailFrom: $($('#EmailFrom')[0]),
         inputEmailSubject: $($('#EmailSubject')[0]),
         inputEmailBody: $($('#EmailBody')[0]),
         inputOriginalEmailTo: $($('#OriginalDraftEmailTo')[0]),
+        inputOriginalEmailCC: $($('#OriginalDraftEmailCC')[0]),
+        inputOriginalEmailBCC: $($('#OriginalDraftEmailBCC')[0]),
         inputOriginalEmailFrom: $($('#OriginalDraftEmailFrom')[0]),
         inputOriginalEmailSubject: $($('#OriginalDraftEmailSubject')[0]),
         inputOriginalEmailBody: $($('#OriginalDraftEmailBody')[0]),
@@ -27,7 +31,9 @@
 
     let defaultValues = {
         emailTo: '',
-        emailFrom: ''
+        emailFrom: '',
+        emailCC: '',
+        emailBCC: ''
     };
     let applicationDetails;
     let mappingConfig;
@@ -46,6 +52,8 @@
         UIElements.inputEmailTo.on('change', validateEmailTo);
 
         UIElements.inputEmailTo.on('input', handleDraftChange);
+        UIElements.inputEmailCC.on('input', handleDraftChange);
+        UIElements.inputEmailBCC.on('input', handleDraftChange);
         UIElements.inputEmailFrom.on('input', handleDraftChange);
         UIElements.inputEmailSubject.on('input', handleDraftChange);
         UIElements.inputEmailBody.on('input', handleDraftChange);
@@ -57,6 +65,8 @@
         bindUIEvents();
         defaultValues.emailTo = UIElements.inputOriginalEmailTo.val();
         defaultValues.emailFrom = UIElements.inputOriginalEmailFrom.val();
+        defaultValues.emailCC = UIElements.inputOriginalEmailCC.val() || '';
+        defaultValues.emailBCC = UIElements.inputOriginalEmailBCC.val() || '';
         toastr.options.positionClass = 'toast-top-center';
         initTemplateDetails();
         $('#templateTextContainer').hide();
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewComponent.cs
index b6a0ab551..87aba2158 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewComponent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewComponent.cs
@@ -31,7 +31,7 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicationId, Guid cur
             {
                 ApplicationId = applicationId,
                 CurrentUserId = currentUserId,
-                EmailTo = application?.ApplicantAgent?.Email ?? "",
+                EmailTo = application?.ApplicantAgent?.Email ?? string.Empty,
                 EmailFrom = defaultFromAddress ?? "NoReply@gov.bc.ca",
             };
             await PopulateTemplates(model);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewModel.cs
index e73fc6578..420316373 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewModel.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewModel.cs
@@ -19,6 +19,14 @@ public class EmailsWidgetViewModel
         [DataType(DataType.EmailAddress)]
         [DisplayName("Email From")]
         public string EmailFrom { get; set; } = string.Empty;
+
+        [Placeholder("CC")]
+        [DisplayName("Email CC")]
+        public string? EmailCC { get; set; }
+
+        [Placeholder("BCC")]
+        [DisplayName("Email BCC")]
+        public string? EmailBCC { get; set; }
         
         [Required]
         [Placeholder("Subject")]

From c3fb80e8413f81494d156fbbf669a98a5d4fbdc7 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Thu, 26 Jun 2025 08:13:49 -0700
Subject: [PATCH 02/14] AB#29051 - Standardize CC and BCC support around
 IEnumerable parsing

---
 .../EmailNotificationService.cs               | 47 +++++++------------
 .../Events/EmailNotificationEvent.cs          |  4 +-
 .../Events/EmailNotificationHandler.cs        | 20 +++++---
 .../Emails/EmailAppService.cs                 | 26 ++++++++--
 .../Components/EmailsWidget/Default.cshtml    |  2 +
 .../Shared/Components/EmailsWidget/Default.js | 20 ++++++++
 6 files changed, 76 insertions(+), 43 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
index 80854e579..61ce2a2bb 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
@@ -331,37 +331,24 @@ public async Task SendEmailToQueue(EmailLog emailLog)
         await _emailQueueService.SendToEmailEventQueueAsync(emailNotificationEvent);
     }
 
-    protected virtual async Task<dynamic> GetEmailObjectAsync(string emailTo, string body, string subject, string? emailFrom, string? emailBodyType, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
+    private List<string>? ParseEmailList(string? emails)
     {
-        List<string> toList = new();
-        string[] emails = emailTo.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries);
+        if (string.IsNullOrWhiteSpace(emails))
+            return null;
 
-        foreach (string email in emails)
-        {
-            toList.Add(email.Trim());
-        }
+        var emailList = emails.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries)
+                         .Select(e => e.Trim())
+                         .Where(e => !string.IsNullOrWhiteSpace(e))
+                         .ToList();
 
-        List<string>? ccList = null;
-        if (!string.IsNullOrWhiteSpace(emailCC))
-        {
-            ccList = new List<string>();
-            string[] ccEmails = emailCC.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries);
-            foreach (string email in ccEmails)
-            {
-                ccList.Add(email.Trim());
-            }
-        }
+        return emailList.Count > 0 ? emailList : null;
+    }
 
-        List<string>? bccList = null;
-        if (!string.IsNullOrWhiteSpace(emailBCC))
-        {
-            bccList = new List<string>();
-            string[] bccEmails = emailBCC.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries);
-            foreach (string email in bccEmails)
-            {
-                bccList.Add(email.Trim());
-            }
-        }
+    protected virtual async Task<dynamic> GetEmailObjectAsync(string emailTo, string body, string subject, string? emailFrom, string? emailBodyType, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
+    {
+        var toList = ParseEmailList(emailTo) ?? [];
+        var ccList = ParseEmailList(emailCC);
+        var bccList = ParseEmailList(emailBCC);
 
         var defaultFromAddress = await SettingProvider.GetOrNullAsync(NotificationsSettings.Mailing.DefaultFromAddress);
 
@@ -388,9 +375,9 @@ protected virtual EmailLog UpdateMappedEmailLog(EmailLog emailLog, dynamic email
         emailLog.Subject = emailDynamicObject.subject;
         emailLog.BodyType = emailDynamicObject.bodyType;
         emailLog.FromAddress = emailDynamicObject.from;
-        emailLog.ToAddress = String.Join(",", emailDynamicObject.to);
-        emailLog.CC = emailDynamicObject.cc != null ? String.Join(",", emailDynamicObject.cc) : "";
-        emailLog.BCC = emailDynamicObject.bcc != null ? String.Join(",", emailDynamicObject.bcc) : "";
+        emailLog.ToAddress = string.Join(",", emailDynamicObject.to);
+        emailLog.CC = emailDynamicObject.cc != null ? string.Join(",", (IEnumerable<string>)emailDynamicObject.cc) : string.Empty;
+        emailLog.BCC = emailDynamicObject.bcc != null ? string.Join(",", (IEnumerable<string>)emailDynamicObject.bcc) : string.Empty;
         emailLog.TemplateName = emailDynamicObject.templateName;
         return emailLog;
     }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationEvent.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationEvent.cs
index ff1ade61c..4d14db077 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationEvent.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationEvent.cs
@@ -17,9 +17,9 @@ public class EmailNotificationEvent
         public string? EmailFrom { get; set; } = string.Empty;
         public string EmailAddress { get; set; } = string.Empty;
         public List<string> EmailAddressList { get; set; } = [];
-        public string? EmailCC { get; set; } = string.Empty;
-        public string? EmailBCC { get; set; } = string.Empty;
         public IEnumerable<string> Cc { get; set; } = [];
+        public IEnumerable<string> Bcc { get; set; } = [];
+
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public EmailAction Action { get; set; }
         public string? EmailTemplateName { get; set; } = string.Empty;
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
index 63afa3542..76201a212 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Unity.Notifications.EmailNotifications;
 using Unity.Notifications.Emails;
@@ -89,9 +90,12 @@ private async Task HandleSendCustomEmail(EmailNotificationEvent eventData)
 
            
                 string emailToAddress = String.Join(",", eventData.EmailAddressList);
+                string? emailCC = eventData.Cc?.Any() == true ? String.Join(",", eventData.Cc) : null;
+                string? emailBCC = eventData.Bcc?.Any() == true ? String.Join(",", eventData.Bcc) : null;
+                
                 if (eventData.Id == Guid.Empty)
                 {
-                    await InitializeAndSendEmailToQueue(emailToAddress, eventData.Body, eventData.Subject, eventData.ApplicationId, eventData.EmailFrom, eventData.EmailTemplateName, eventData.EmailCC, eventData.EmailBCC);
+                    await InitializeAndSendEmailToQueue(emailToAddress, eventData.Body, eventData.Subject, eventData.ApplicationId, eventData.EmailFrom, eventData.EmailTemplateName, emailCC, emailBCC);
                 }
                 else
                 {
@@ -104,8 +108,8 @@ private async Task HandleSendCustomEmail(EmailNotificationEvent eventData)
                         eventData.EmailFrom,
                         EmailStatus.Initialized,
                         eventData.EmailTemplateName,
-                        eventData.EmailCC,
-                        eventData.EmailBCC);
+                        emailCC,
+                        emailBCC);
 
                     if (emailLog != null)
                     {
@@ -124,6 +128,8 @@ private async Task HandleSaveDraftEmail(EmailNotificationEvent eventData)
 
             
                 string emailToAddress = String.Join(",", eventData.EmailAddressList);
+                string? emailCC = eventData.Cc?.Any() == true ? String.Join(",", eventData.Cc) : null;
+                string? emailBCC = eventData.Bcc?.Any() == true ? String.Join(",", eventData.Bcc) : null;
 
                 if (eventData.Id != Guid.Empty)
                 {
@@ -136,8 +142,8 @@ await emailNotificationService.UpdateEmailLog(
                         eventData.EmailFrom,
                         EmailStatus.Draft,
                         eventData.EmailTemplateName,
-                        eventData.EmailCC,
-                        eventData.EmailBCC);
+                        emailCC,
+                        emailBCC);
                 }
                 else
                 {
@@ -149,8 +155,8 @@ await InitializeEmail(
                         eventData.EmailFrom,
                         EmailStatus.Draft, 
                         eventData.EmailTemplateName,
-                        eventData.EmailCC,
-                        eventData.EmailBCC);
+                        emailCC,
+                        emailBCC);
                 }
             
         }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs
index ab8cb7189..1ab486730 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Unity.Notifications.Emails;
 using Unity.Notifications.Events;
@@ -36,12 +37,29 @@ private static EmailNotificationEvent GetEmailNotificationEvent(CreateEmailDto d
             List<string> toList = [];
             string[] emails = dto.EmailTo.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries);
 
-            dto.Bcc = dto.EmailBCC.Split(";").Select(e => e?.Trim()).Concat(email.Bcc?.Any() ?? false ? email.Bcc : []).NotNullOrWhiteSpace();
-
             foreach (string email in emails)
             {
                 toList.Add(email.Trim());
             }
+
+            // Parse CC emails
+            IEnumerable<string> ccList = [];
+            if (!string.IsNullOrWhiteSpace(dto.EmailCC))
+            {
+                ccList = dto.EmailCC.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries)
+                                   .Select(email => email.Trim())
+                                   .Where(email => !string.IsNullOrWhiteSpace(email));
+            }
+
+            // Parse BCC emails
+            IEnumerable<string> bccList = [];
+            if (!string.IsNullOrWhiteSpace(dto.EmailBCC))
+            {
+                bccList = dto.EmailBCC.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries)
+                                     .Select(email => email.Trim())
+                                     .Where(email => !string.IsNullOrWhiteSpace(email));
+            }
+
             return
             new EmailNotificationEvent
             {
@@ -51,8 +69,8 @@ private static EmailNotificationEvent GetEmailNotificationEvent(CreateEmailDto d
                 EmailAddress = dto.EmailTo,
                 EmailAddressList = toList,
                 EmailFrom = dto.EmailFrom,
-                EmailCC = dto.EmailCC,
-                EmailBCC = dto.EmailBCC,
+                Cc = ccList,
+                Bcc = bccList,
                 Subject = dto.EmailSubject,
                 Body = dto.EmailBody,
                 EmailTemplateName = dto.EmailTemplateName
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
index 665c4d83e..eab08540a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
@@ -71,6 +71,8 @@
             <legend class="d-none">Email Form</legend>
             <input type="hidden" id="EmailId" name="EmailId" />
             <input type="hidden" id="OriginalDraftEmailTo" value="@Model.EmailTo" />
+            <input type="hidden" id="OriginalDraftEmailCC" value="@Model.EmailCC" />
+            <input type="hidden" id="OriginalDraftEmailBCC" value="@Model.EmailBCC" />
             <input type="hidden" id="OriginalDraftEmailFrom" value="@Model.EmailFrom" />
             <input type="hidden" id="OriginalDraftEmailSubject" />
             <input type="hidden" id="OriginalDraftEmailBody" />
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
index 2850e0931..991201aee 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
@@ -48,6 +48,8 @@
         UIElements.btnSendClose.on('click', handleCloseEmail);
         UIElements.inputEmailSubject.on('change', handleKeyUpTrim);
         UIElements.inputEmailFrom.on('change', handleKeyUpTrim);
+        UIElements.inputEmailCC.on('change', handleKeyUpTrim);
+        UIElements.inputEmailBCC.on('change', handleKeyUpTrim);
         UIElements.inputEmailBody.on('change', handleKeyUpTrim);
         UIElements.inputEmailTo.on('change', validateEmailTo);
 
@@ -82,6 +84,8 @@
         UIElements.btnSave.attr('disabled', true);
         UIElements.btnDiscard.attr('disabled', true);
         UIElements.inputEmailTo.attr('disabled', true);
+        UIElements.inputEmailCC.attr('disabled', true);
+        UIElements.inputEmailBCC.attr('disabled', true);
         UIElements.inputEmailFrom.attr('disabled', true);
         UIElements.inputEmailSubject.attr('disabled', true);
         UIElements.inputEmailBody.attr('disabled', true);
@@ -92,6 +96,8 @@
         UIElements.btnSave.attr('disabled', false);
         UIElements.btnDiscard.attr('disabled', false);
         UIElements.inputEmailTo.attr('disabled', false);
+        UIElements.inputEmailCC.attr('disabled', false);
+        UIElements.inputEmailBCC.attr('disabled', false);
         UIElements.inputEmailFrom.attr('disabled', false);
         UIElements.inputEmailSubject.attr('disabled', false);
         UIElements.inputEmailBody.attr('disabled', false);
@@ -113,6 +119,8 @@
 
     function handleDiscardEmail() {
         UIElements.inputEmailTo.val(UIElements.inputOriginalEmailTo.val());
+        UIElements.inputEmailCC.val(UIElements.inputOriginalEmailCC.val());
+        UIElements.inputEmailBCC.val(UIElements.inputOriginalEmailBCC.val());
         UIElements.inputEmailFrom.val(UIElements.inputOriginalEmailFrom.val());
         UIElements.inputEmailSubject.val(UIElements.inputOriginalEmailSubject.val());
         UIElements.inputEmailBody.val(UIElements.inputOriginalEmailBody.val());
@@ -147,6 +155,8 @@
         UIElements.inputEmailId.val(emptyGuid);
         // Support discard to empty email template for new emails
         UIElements.inputOriginalEmailTo.val(defaultValues.emailTo);
+        UIElements.inputOriginalEmailCC.val(defaultValues.emailCC);
+        UIElements.inputOriginalEmailBCC.val(defaultValues.emailBCC);
         UIElements.inputOriginalEmailFrom.val(defaultValues.emailFrom);
         UIElements.inputOriginalEmailSubject.val("");
         UIElements.inputOriginalEmailBody.val("");
@@ -256,6 +266,8 @@
                 emailId: UIElements.inputEmailId[0].value,
                 applicationId: UIElements.applicationId,
                 emailTo: UIElements.inputEmailTo[0].value,
+                emailCC: UIElements.inputEmailCC[0].value,
+                emailBCC: UIElements.inputEmailBCC[0].value,
                 emailFrom: UIElements.inputEmailFrom[0].value,
                 emailBody: editorInstance.getContent(),
                 emailSubject: UIElements.inputEmailSubject[0].value,
@@ -305,6 +317,8 @@
                 emailId: UIElements.inputEmailId[0].value,
                 applicationId: UIElements.applicationId,
                 emailTo: UIElements.inputEmailTo[0].value,
+                emailCC: UIElements.inputEmailCC[0].value,
+                emailBCC: UIElements.inputEmailBCC[0].value,
                 emailFrom: UIElements.inputEmailFrom[0].value,
                 emailBody: editorInstance.getContent(),
                 emailSubject: UIElements.inputEmailSubject[0].value,
@@ -380,6 +394,8 @@
 
     function checkDraftChanges() {
         return UIElements.inputEmailTo.val() !== UIElements.inputOriginalEmailTo.val() ||
+               UIElements.inputEmailCC.val() !== UIElements.inputOriginalEmailCC.val() ||
+               UIElements.inputEmailBCC.val() !== UIElements.inputOriginalEmailBCC.val() ||
                UIElements.inputEmailFrom.val() !== UIElements.inputOriginalEmailFrom.val() ||
                UIElements.inputEmailSubject.val() !== UIElements.inputOriginalEmailSubject.val() ||
                UIElements.inputEmailBody.val() !== UIElements.inputOriginalEmailBody.val();
@@ -528,6 +544,8 @@
         $('#templateText').prop('disabled', true);
         UIElements.inputEmailId.val(data.id);
         UIElements.inputOriginalEmailTo.val(data.toAddress);
+        UIElements.inputOriginalEmailCC.val(data.cc || '');
+        UIElements.inputOriginalEmailBCC.val(data.bcc || '');
         UIElements.inputOriginalEmailFrom.val(data.fromAddress);
         UIElements.inputOriginalEmailSubject.val(data.subject);
          resetEmailBody(); 
@@ -553,6 +571,8 @@
             }
         });
         UIElements.inputEmailTo.val(data.toAddress);
+        UIElements.inputEmailCC.val(data.cc || '');
+        UIElements.inputEmailBCC.val(data.bcc || '');
         UIElements.inputEmailFrom.val(data.fromAddress);
         UIElements.inputEmailSubject.val(data.subject);
         UIElements.inputEmailBody.val(data.body);

From 44f0a9d200d637224da109bf2cf67dbf9269ccb2 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Mon, 7 Jul 2025 14:52:57 -0700
Subject: [PATCH 03/14] AB#29051 - Add ParseEmailList String Extension to
 handle formatting

---
 .../EmailNotificationService.cs               | 20 +++---------
 .../Events/EmailNotificationHandler.cs        |  2 --
 .../Emails/EmailLog.cs                        | 26 +++++++--------
 .../Shared/Components/PaymentInfo/Default.js  |  2 +-
 .../Utils/StringExtensions.cs                 | 27 ++++++++++++++++
 .../Emails/EmailAppService.cs                 | 32 +++----------------
 6 files changed, 50 insertions(+), 59 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
index 61ce2a2bb..8de524f2e 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
@@ -22,6 +22,7 @@
 using Volo.Abp;
 using Volo.Abp.Features;
 using Microsoft.AspNetCore.Http;
+using Unity.Modules.Shared.Utils;
 
 namespace Unity.Notifications.EmailNotifications;
 
@@ -331,24 +332,11 @@ public async Task SendEmailToQueue(EmailLog emailLog)
         await _emailQueueService.SendToEmailEventQueueAsync(emailNotificationEvent);
     }
 
-    private List<string>? ParseEmailList(string? emails)
-    {
-        if (string.IsNullOrWhiteSpace(emails))
-            return null;
-
-        var emailList = emails.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries)
-                         .Select(e => e.Trim())
-                         .Where(e => !string.IsNullOrWhiteSpace(e))
-                         .ToList();
-
-        return emailList.Count > 0 ? emailList : null;
-    }
-
     protected virtual async Task<dynamic> GetEmailObjectAsync(string emailTo, string body, string subject, string? emailFrom, string? emailBodyType, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
     {
-        var toList = ParseEmailList(emailTo) ?? [];
-        var ccList = ParseEmailList(emailCC);
-        var bccList = ParseEmailList(emailBCC);
+        var toList = emailTo.ParseEmailList() ?? [];
+        var ccList = emailCC.ParseEmailList();
+        var bccList = emailBCC.ParseEmailList();
 
         var defaultFromAddress = await SettingProvider.GetOrNullAsync(NotificationsSettings.Mailing.DefaultFromAddress);
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
index 76201a212..b53c3c860 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
@@ -125,8 +125,6 @@ private async Task HandleSendCustomEmail(EmailNotificationEvent eventData)
 
         private async Task HandleSaveDraftEmail(EmailNotificationEvent eventData)
         {
-
-            
                 string emailToAddress = String.Join(",", eventData.EmailAddressList);
                 string? emailCC = eventData.Cc?.Any() == true ? String.Join(",", eventData.Cc) : null;
                 string? emailBCC = eventData.Bcc?.Any() == true ? String.Join(",", eventData.Bcc) : null;
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLog.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLog.cs
index ae9b3c16b..9d304685a 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLog.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLog.cs
@@ -14,21 +14,21 @@ public class EmailLog : AuditedAggregateRoot<Guid>, IMultiTenant
     public Guid AssessmentId { get; set; }
     public Guid ApplicationId { get; set; }
     public Guid ApplicantId { get; set; }
-    public string FromAddress { get; set; } = "";
-    public string ToAddress { get; set; } = "";
-    public string CC { get; set; } = "";
-    public string BCC { get; set; } = "";
-    public string Subject { get; set; } = "";
-    public string Body { get; set; } = "";
-    public string BodyType { get; set; } = "";
-    public string Priority { get; set; } = "";
-    public string Tag { get; set; } = "";
+    public string FromAddress { get; set; } = string.Empty;
+    public string ToAddress { get; set; } = string.Empty;
+    public string CC { get; set; } = string.Empty;
+    public string BCC { get; set; } = string.Empty;
+    public string Subject { get; set; } = string.Empty;
+    public string Body { get; set; } = string.Empty;
+    public string BodyType { get; set; } = string.Empty;
+    public string Priority { get; set; } = string.Empty;
+    public string Tag { get; set; } = string.Empty;
     public int RetryAttempts { get; set; }
     public Guid? ChesMsgId { get; set; }
-    public string ChesResponse { get; set; } = "";
-    public string ChesStatus { get; set; } = "";
-    public string Status { get; set; } = "";
+    public string ChesResponse { get; set; } = string.Empty;
+    public string ChesStatus { get; set; } = string.Empty;
+    public string Status { get; set; } = string.Empty;
     public DateTime? SendOnDateTime { get; set; }
     public DateTime? SentDateTime { get; set; }
-    public string TemplateName { get; set; } = "";
+    public string TemplateName { get; set; } = string.Empty;
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js
index ea9f98ef5..81e743588 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js
@@ -98,7 +98,7 @@
                     console.error(error);
                     disableSaveButton(false);
                 })
-                .finally(() => {
+                .then(() => {
                     hideSpinner();
                     abp.ui.unblock();
                 });
diff --git a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Utils/StringExtensions.cs b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Utils/StringExtensions.cs
index 018d89f13..d28d8f508 100644
--- a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Utils/StringExtensions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Utils/StringExtensions.cs
@@ -34,5 +34,32 @@ public static double CompareStrings(this string str1, string str2)
             double percentage = union == 0 ? 0.0 : 2.0 * intersection * 100 / union;
             return Math.Round(Math.Min(percentage, 100.0), 2); // Ensure it does not exceed 100% and round to 2 decimals
         }
+
+        public static List<string>? ParseEmailList(this string? emailAddresses)
+        {
+            if (string.IsNullOrWhiteSpace(emailAddresses))
+                return null;
+
+            var emailAddressList = emailAddresses.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries)
+                         .Select(e => e.Trim())
+                         .Where(e => !string.IsNullOrWhiteSpace(e))
+                         .Distinct()
+                         .ToList();
+
+            return emailAddressList.Count > 0 ? emailAddressList : null;
+        }
+
+        public static HashSet<string>? ParseEmailSet(this string? emailAddresses)
+        {
+            if (string.IsNullOrWhiteSpace(emailAddresses))
+                return null;
+
+            var emailAddressList = emailAddresses.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries)
+                         .Select(e => e.Trim())
+                         .Where(e => !string.IsNullOrWhiteSpace(e))
+                         .ToHashSet();
+
+            return emailAddressList.Count > 0 ? emailAddressList : null;
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs
index 1ab486730..ef622db10 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Unity.Modules.Shared.Utils;
 using Unity.Notifications.Emails;
 using Unity.Notifications.Events;
 using Volo.Abp.Application.Services;
@@ -34,34 +35,11 @@ public async Task<bool> SaveDraftAsync(CreateEmailDto dto)
 
         private static EmailNotificationEvent GetEmailNotificationEvent(CreateEmailDto dto)
         {
-            List<string> toList = [];
-            string[] emails = dto.EmailTo.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries);
+            var toList = dto.EmailTo.ParseEmailList() ?? [];
+            var ccList = dto.EmailCC.ParseEmailList() ?? [];
+            var bccList = dto.EmailBCC.ParseEmailList() ?? [];
 
-            foreach (string email in emails)
-            {
-                toList.Add(email.Trim());
-            }
-
-            // Parse CC emails
-            IEnumerable<string> ccList = [];
-            if (!string.IsNullOrWhiteSpace(dto.EmailCC))
-            {
-                ccList = dto.EmailCC.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries)
-                                   .Select(email => email.Trim())
-                                   .Where(email => !string.IsNullOrWhiteSpace(email));
-            }
-
-            // Parse BCC emails
-            IEnumerable<string> bccList = [];
-            if (!string.IsNullOrWhiteSpace(dto.EmailBCC))
-            {
-                bccList = dto.EmailBCC.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries)
-                                     .Select(email => email.Trim())
-                                     .Where(email => !string.IsNullOrWhiteSpace(email));
-            }
-
-            return
-            new EmailNotificationEvent
+            return new EmailNotificationEvent
             {
                 Id = dto.EmailId,
                 ApplicationId = dto.ApplicationId,

From 8c31f1ac3e8df59a42a64bceea4950eeebe63026 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Mon, 7 Jul 2025 16:05:11 -0700
Subject: [PATCH 04/14] AB#29051 - SonarQube Cleanup

---
 .../EmailNotificationService.cs               | 19 ++++++++++---------
 .../Emails/EmailAppService.cs                 |  3 ---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
index 8de524f2e..b5d6b2700 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using System;
@@ -7,22 +8,21 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Unity.Modules.Shared.Utils;
 using Unity.Notifications.Emails;
 using Unity.Notifications.Events;
 using Unity.Notifications.Integrations.Ches;
 using Unity.Notifications.Integrations.RabbitMQ;
+using Unity.Notifications.Permissions;
+using Unity.Notifications.Settings;
 using Unity.Notifications.TeamsNotifications;
+using Volo.Abp;
 using Volo.Abp.Application.Services;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities;
-using Volo.Abp.Users;
-using Volo.Abp.SettingManagement;
-using Unity.Notifications.Settings;
-using Unity.Notifications.Permissions;
-using Volo.Abp;
 using Volo.Abp.Features;
-using Microsoft.AspNetCore.Http;
-using Unity.Modules.Shared.Utils;
+using Volo.Abp.SettingManagement;
+using Volo.Abp.Users;
 
 namespace Unity.Notifications.EmailNotifications;
 
@@ -105,7 +105,7 @@ public async Task DeleteEmail(Guid id)
         {
             return null;
         }
-        
+
         var emailObject = await GetEmailObjectAsync(emailTo, body, subject, emailFrom, "html", emailTemplateName, emailCC, emailBCC);
         EmailLog emailLog = await _emailLogsRepository.GetAsync(emailId);
         emailLog = UpdateMappedEmailLog(emailLog, emailObject);
@@ -377,7 +377,8 @@ public async Task UpdateSettings(NotificationsSettingsDto settingsDto)
         await UpdateTenantSettings(NotificationsSettings.Mailing.EmailMaxRetryAttempts, settingsDto.MaximumRetryAttempts);
     }
 
-    private async Task UpdateTenantSettings(string settingKey, string valueString) {
+    private async Task UpdateTenantSettings(string settingKey, string valueString)
+    {
         if (!valueString.IsNullOrWhiteSpace())
         {
             await _settingManager.SetForCurrentTenantAsync(settingKey, valueString);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs
index ef622db10..352622ac4 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Emails/EmailAppService.cs
@@ -1,7 +1,4 @@
 using Microsoft.AspNetCore.Authorization;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Unity.Modules.Shared.Utils;
 using Unity.Notifications.Emails;

From dc43b21b5e6e20e5ce22b21f8fea3e20bb19ab5c Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Wed, 30 Jul 2025 09:52:34 -0700
Subject: [PATCH 05/14] AB#29051 - Email CC & BCC Bugfixes

---
 .../Emails/EmailHistoryDto.cs                                 | 3 +++
 .../Integrations/RabbitMQ/EmailConsumer.cs                    | 4 +++-
 .../Views/Shared/Components/EmailsWidget/Default.cshtml       | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs
index e885a6fdb..462d5859c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Volo.Abp.Application.Dtos;
 
 namespace Unity.Notifications.Emails;
@@ -10,6 +11,8 @@ public class EmailHistoryDto : ExtensibleAuditedEntityDto<Guid>
     public string Status { get; set; } = string.Empty;
     public string FromAddress { get; set; } = string.Empty;
     public string ToAddress { get; set; } = string.Empty;
+    public string Cc { get; set; } = string.Empty;
+    public string Bcc { get; set; } = string.Empty;
     public DateTime? SentDateTime { get; set; }
     public string Body { get; set; } = string.Empty;
     public EmailHistoryUserDto? SentBy { get; set; }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/EmailConsumer.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/EmailConsumer.cs
index 2c901596c..51e5ce76d 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/EmailConsumer.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/EmailConsumer.cs
@@ -64,7 +64,9 @@ private async Task ProcessEmailLogAsync(EmailLog emailLog, EmailNotificationEven
                                                                                     emailLog.Body,
                                                                                     emailLog.Subject,
                                                                                     emailLog.FromAddress, "html",
-                                                                                    emailLog.TemplateName);
+                                                                                    emailLog.TemplateName,
+                                                                                    emailLog.CC,
+                                                                                    emailLog.BCC);
                 // Update the response
                 emailLog.ChesResponse = JsonConvert.SerializeObject(response);
                 emailLog.ChesStatus = response.StatusCode.ToString();
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
index eab08540a..3627fab78 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
@@ -65,7 +65,7 @@
     </div>
 
 
-    <form id="EmailForm" class="email-form">
+    <form id="EmailForm" class="email-form" autocomplete="off">
         <abp-input type="hidden" id="ApplicationId" asp-for="@Model.ApplicationId" />
         <fieldset @emailFieldsetState>
             <legend class="d-none">Email Form</legend>
@@ -78,7 +78,7 @@
             <input type="hidden" id="OriginalDraftEmailBody" />
 
             <abp-row class="m-0 p-0">
-                <abp-column id="templateListContainer" size="_10" class="px-1">
+                <abp-column id="templateListContainer" size="_10" class="px-2">
                     <abp-select asp-for="@Model.EmailTemplate" asp-items="@Model.TemplatesList" id="template">
                         <option value="">Please select</option>
                     </abp-select>

From 9bd9ff0d169c1cd6876fcbe82c3406f52b3cd54a Mon Sep 17 00:00:00 2001
From: jpasta <james.p.pasta@gmail.com>
Date: Wed, 30 Jul 2025 12:54:05 -0700
Subject: [PATCH 06/14] bugfix/AB#29682-FixJsonInvalidScoresheet

---
 .../Unity.Flex.Shared/FlexTypeExtensions.cs   | 31 ++++++++++++++-----
 .../NumericDefinitionWidget.cs                | 29 +++++++++++------
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/FlexTypeExtensions.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/FlexTypeExtensions.cs
index 22b68bdb8..11b25dc14 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/FlexTypeExtensions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/FlexTypeExtensions.cs
@@ -57,15 +57,30 @@ public static string ConvertInputType(this CustomFieldType type)
 
         public static CustomFieldDefinition? ConvertDefinition(this string definition, QuestionType type)
         {
-            return type switch
+            if (string.IsNullOrWhiteSpace(definition))
             {
-                QuestionType.Text => JsonSerializer.Deserialize<TextDefinition>(definition),
-                QuestionType.Number => JsonSerializer.Deserialize<NumericDefinition>(definition),
-                QuestionType.YesNo => JsonSerializer.Deserialize<QuestionYesNoDefinition>(definition),
-                QuestionType.SelectList => JsonSerializer.Deserialize<QuestionSelectListDefinition>(definition),
-                QuestionType.TextArea => JsonSerializer.Deserialize<TextAreaDefinition>(definition),
-                _ => null,
-            };
+                return null;
+            }
+
+            try
+            {
+                return type switch
+                {
+                    QuestionType.Text => JsonSerializer.Deserialize<TextDefinition>(definition),
+                    QuestionType.Number =>
+                    long.TryParse(definition, out _)
+                        ? new NumericDefinition() // or populate as needed
+                        : JsonSerializer.Deserialize<NumericDefinition>(definition),
+                    QuestionType.YesNo => JsonSerializer.Deserialize<QuestionYesNoDefinition>(definition),
+                    QuestionType.SelectList => JsonSerializer.Deserialize<QuestionSelectListDefinition>(definition),
+                    QuestionType.TextArea => JsonSerializer.Deserialize<TextAreaDefinition>(definition),
+                    _ => null,
+                };
+            }
+            catch (JsonException)
+            {
+                return null;
+            }
         }
 
         public static string[] GetCheckedOptions(this string value)
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/NumericDefinitionWidget/NumericDefinitionWidget.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/NumericDefinitionWidget/NumericDefinitionWidget.cs
index b8a1e9d89..bab7f66ae 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/NumericDefinitionWidget/NumericDefinitionWidget.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/NumericDefinitionWidget/NumericDefinitionWidget.cs
@@ -31,21 +31,32 @@ public class NumericDefinitionWidget : AbpViewComponent
 
         public async Task<IViewComponentResult> InvokeAsync(string? definition)
         {
-            if (definition != null)
+            NumericDefinitionViewModel viewModel = new();
+
+            if (!string.IsNullOrWhiteSpace(definition))
             {
-                NumericDefinition? numericDefinition = JsonSerializer.Deserialize<NumericDefinition>(definition);
-                if (numericDefinition != null)
+                try
                 {
-                    return View(await Task.FromResult(new NumericDefinitionViewModel()
+                    var options = new JsonSerializerOptions
+                    {
+                        NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString
+                    };
+                    var numericDefinition = JsonSerializer.Deserialize<NumericDefinition>(definition, options);
+
+                    if (numericDefinition != null)
                     {
-                        Min = numericDefinition.Min,
-                        Max = numericDefinition.Max,
-                        Required = numericDefinition.Required
-                    }));
+                        viewModel.Min = numericDefinition.Min;
+                        viewModel.Max = numericDefinition.Max;
+                        viewModel.Required = numericDefinition.Required;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Optionally log the error                    
                 }
             }
 
-            return View(await Task.FromResult(new NumericDefinitionViewModel()));
+            return View(await Task.FromResult(viewModel));
         }
     }
 

From d6187d90a8a84306b7ec1bdfaa664d55da3701df Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Wed, 30 Jul 2025 12:57:25 -0700
Subject: [PATCH 07/14] AB#29051 - Code Quality Cleanup and Update Email
 Address Validation

---
 .../Emails/EmailHistoryDto.cs                 |   1 -
 .../Shared/Components/EmailsWidget/Default.js | 148 +++++++++++-------
 2 files changed, 90 insertions(+), 59 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs
index 462d5859c..be4828939 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Volo.Abp.Application.Dtos;
 
 namespace Unity.Notifications.Emails;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
index 991201aee..2bfb918a3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
@@ -53,6 +53,11 @@
         UIElements.inputEmailBody.on('change', handleKeyUpTrim);
         UIElements.inputEmailTo.on('change', validateEmailTo);
 
+        // Update validation bindings
+        UIElements.inputEmailTo.on('change', validateEmailTo);
+        UIElements.inputEmailCC.on('change', validateEmailCC);
+        UIElements.inputEmailBCC.on('change', validateEmailBCC);
+
         UIElements.inputEmailTo.on('input', handleDraftChange);
         UIElements.inputEmailCC.on('input', handleDraftChange);
         UIElements.inputEmailBCC.on('input', handleDraftChange);
@@ -201,48 +206,15 @@
     }
 
     function validateEmailTo() {
-        let emailValue = UIElements.inputEmailToField.value.trim(); // Trim leading/trailing whitespace
-        // Remove trailing commas, semicolons, or spaces (safe regex)
-        emailValue = emailValue.replace(/[;,\s]+$/, ''); // Remove only trailing semicolons, commas, or spaces
-
-        let emails = emailValue.split(/[,;]/g).map(email => email.trim()); // Split by comma or semicolon, and trim each email
-        let emailToErrorSpan = $("span[data-valmsg-for*='EmailTo']")[0];
-
-        // Initialize as valid
-        let isValid = true;
-        let emailToError = '';  // Initialize error message variable
-
-        // Iterate through the list of emails using for...of loop
-        for (let emailStr of emails) {
-            // Check if the email is empty or invalid
-            if (emailStr === '' || !validateEmail(emailStr)) {
-                // Handle empty email input
-                if (emailStr === '') {
-                    emailToError = emailValue.length > 0
-                        ? 'An email is required after each comma or semicolon.'
-                        : 'The Email To field is required.';
-                } else {
-                    // Handle invalid email format
-                    emailToError = `Please enter a valid Email To: ${emailStr}`;
-                }
-
-                // Display the error message
-                $(emailToErrorSpan).addClass('field-validation-error').removeClass('field-validation-valid');
-                $(emailToErrorSpan).html(emailToError);
-
-                // Mark the validation as invalid and exit the loop
-                isValid = false;
-                break; // No need to continue checking further emails
-            }
-        }
+        return validateEmailField(UIElements.inputEmailToField, true); // EmailTo is required
+    }
 
-        // Clear error message if all emails are valid
-        if (isValid) {
-            $(emailToErrorSpan).addClass('field-validation-valid').removeClass('field-validation-error');
-            $(emailToErrorSpan).html('');  // Clear any existing error message
-        }
+    function validateEmailCC() {
+        return validateEmailField(UIElements.inputEmailCC[0], false); // CC is optional
+    }
 
-        return isValid;
+    function validateEmailBCC() {
+        return validateEmailField(UIElements.inputEmailBCC[0], false); // BCC is optional
     }
 
 
@@ -338,21 +310,84 @@
         }
     }
 
+    function validateEmailField(fieldElement, isRequired = false) {
+        // Get the field's value and trim whitespace
+        let emailValue = fieldElement.value.trim();
+
+        // Remove trailing commas, semicolons, or spaces
+        emailValue = emailValue.replace(/[;,\s]+$/, '');
+
+        // If the field is empty and not required, it's valid
+        if (!isRequired && emailValue === '') {
+            return true;
+        }
+
+        // Split by comma or semicolon, and trim each email
+        let emails = emailValue.split(/[,;]/g).map(email => email.trim());
+        let fieldName = fieldElement.name;
+        let errorSpan = $(`span[data-valmsg-for*='${fieldName}']`)[0];
+
+        // Initialize as valid
+        let isValid = true;
+        let errorMessage = '';
+
+        // Check each email
+        for (let emailStr of emails) {
+            // Skip empty emails in optional fields
+            if (emailStr === '' && !isRequired) {
+                continue;
+            }
+
+            // Check if the email is empty or invalid
+            if (emailStr === '' || !validateEmail(emailStr)) {
+                // Handle empty email input
+                if (emailStr === '') {
+                    errorMessage = emailValue.length > 0
+                        ? `An email is required after each comma or semicolon.`
+                        : `The ${fieldName} field is required.`;
+                } else {
+                    // Handle invalid email format
+                    errorMessage = `Please enter a valid email in ${fieldName}: ${emailStr}`;
+                }
+
+                // Display the error message
+                $(errorSpan).addClass('field-validation-error').removeClass('field-validation-valid');
+                $(errorSpan).html(errorMessage);
+
+                // Mark the validation as invalid and exit the loop
+                isValid = false;
+                break;
+            }
+        }
+
+        // Clear error message if all emails are valid
+        if (isValid) {
+            $(errorSpan).addClass('field-validation-valid').removeClass('field-validation-error');
+            $(errorSpan).html('');
+        }
+
+        return isValid;
+    }
+
     function validateEmailForm(e) {
         // Prevent form submission and stop propagation
         e.stopPropagation();
         e.preventDefault();
-        let isValid = UIElements.emailForm.valid();
-        let validator = UIElements.emailForm.validate();
 
-        // Validate the "Email To" field
-        if (!validateEmailTo()) {
-            return false; // If validation fails, stop further processing
+        // Validate all email fields
+        let isToValid = validateEmailTo();
+        let isCCValid = validateEmailCC();
+        let isBCCValid = validateEmailBCC();
+
+        // If any email field is invalid, return false
+        if (!isToValid || !isCCValid || !isBCCValid) {
+            return false;
         }
+
+        let isValid = UIElements.emailForm.valid();
+        let validator = UIElements.emailForm.validate();
         let fieldName = 'EmailBody';
-       
         let errorList = validator.errorList;
-
         let tinymceContent = tinymce.get(fieldName).getContent({ format: 'text' }).trim();
 
         let onlyErrorIsTinyMCE = (
@@ -360,22 +395,19 @@
             errorList[0].element.name === fieldName &&
             tinymceContent.length > 0
         );
+
         if (!isValid && onlyErrorIsTinyMCE) {
             let fieldElement = $('textarea[name="' + fieldName + '"]');
-
-            // Remove error message (if inserted by validator)
-            fieldElement.removeClass('input-validation-error'); // if ABP uses this
-            fieldElement.siblings('.field-validation-error').remove(); // for inline messages
+            fieldElement.removeClass('input-validation-error');
+            fieldElement.siblings('.field-validation-error').remove();
             return true;
-            // Proceed with your form logic here
-            // ...
         } else if (isValid) {
             return true;
         } else {
             return false;
         }
-        
     }
+
     function handleSendEmail(e) {
         // Check if the form is valid
         if (validateEmailForm(e)) {
@@ -544,8 +576,8 @@
         $('#templateText').prop('disabled', true);
         UIElements.inputEmailId.val(data.id);
         UIElements.inputOriginalEmailTo.val(data.toAddress);
-        UIElements.inputOriginalEmailCC.val(data.cc || '');
-        UIElements.inputOriginalEmailBCC.val(data.bcc || '');
+        UIElements.inputOriginalEmailCC.val(data.cc ? data.cc.replace(/,/g, '; ') : '');
+        UIElements.inputOriginalEmailBCC.val(data.bcc ? data.bcc.replace(/,/g, '; ') : '');
         UIElements.inputOriginalEmailFrom.val(data.fromAddress);
         UIElements.inputOriginalEmailSubject.val(data.subject);
          resetEmailBody(); 
@@ -571,8 +603,8 @@
             }
         });
         UIElements.inputEmailTo.val(data.toAddress);
-        UIElements.inputEmailCC.val(data.cc || '');
-        UIElements.inputEmailBCC.val(data.bcc || '');
+        UIElements.inputEmailCC.val(data.cc ? data.cc.replace(/,/g, '; ') : '');
+        UIElements.inputEmailBCC.val(data.bcc ? data.bcc.replace(/,/g, '; ') : '');
         UIElements.inputEmailFrom.val(data.fromAddress);
         UIElements.inputEmailSubject.val(data.subject);
         UIElements.inputEmailBody.val(data.body);

From 6a89e5054d18fb730df7100f2aa18d609c2ca963 Mon Sep 17 00:00:00 2001
From: James Pasta <129337673+JamesPasta@users.noreply.github.com>
Date: Wed, 30 Jul 2025 13:01:48 -0700
Subject: [PATCH 08/14] Update
 applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/FlexTypeExtensions.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../Unity.Flex/src/Unity.Flex.Shared/FlexTypeExtensions.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/FlexTypeExtensions.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/FlexTypeExtensions.cs
index 11b25dc14..ecb2bbd61 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/FlexTypeExtensions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/FlexTypeExtensions.cs
@@ -68,8 +68,8 @@ public static string ConvertInputType(this CustomFieldType type)
                 {
                     QuestionType.Text => JsonSerializer.Deserialize<TextDefinition>(definition),
                     QuestionType.Number =>
-                    long.TryParse(definition, out _)
-                        ? new NumericDefinition() // or populate as needed
+                    long.TryParse(definition, out var parsedValue)
+                        ? new NumericDefinition { Value = parsedValue } // Assuming NumericDefinition has a 'Value' property
                         : JsonSerializer.Deserialize<NumericDefinition>(definition),
                     QuestionType.YesNo => JsonSerializer.Deserialize<QuestionYesNoDefinition>(definition),
                     QuestionType.SelectList => JsonSerializer.Deserialize<QuestionSelectListDefinition>(definition),

From aaf791e896c56cfabdd89ef2ab91a8bb5895d4c0 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Wed, 30 Jul 2025 13:04:40 -0700
Subject: [PATCH 09/14] AB#29051 - Code Quality Fixes

---
 .../EmailNotificaions/EmailNotificationService.cs |  2 +-
 .../Shared/Components/EmailsWidget/Default.js     | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
index 579d99833..5c084550a 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
@@ -5,10 +5,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using System.Linq.Expressions;
 using Unity.Modules.Shared.Utils;
 using Unity.Notifications.Emails;
 using Unity.Notifications.Events;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
index 2bfb918a3..04b9dc6d2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
@@ -52,9 +52,6 @@
         UIElements.inputEmailBCC.on('change', handleKeyUpTrim);
         UIElements.inputEmailBody.on('change', handleKeyUpTrim);
         UIElements.inputEmailTo.on('change', validateEmailTo);
-
-        // Update validation bindings
-        UIElements.inputEmailTo.on('change', validateEmailTo);
         UIElements.inputEmailCC.on('change', validateEmailCC);
         UIElements.inputEmailBCC.on('change', validateEmailBCC);
 
@@ -344,10 +341,10 @@
                 if (emailStr === '') {
                     errorMessage = emailValue.length > 0
                         ? `An email is required after each comma or semicolon.`
-                        : `The ${fieldName} field is required.`;
+                        : `The ${escapeHtml(fieldName)} field is required.`;
                 } else {
                     // Handle invalid email format
-                    errorMessage = `Please enter a valid email in ${fieldName}: ${emailStr}`;
+                    errorMessage = `Please enter a valid email in ${escapeHtml(fieldName)}: ${emailStr}`;
                 }
 
                 // Display the error message
@@ -566,6 +563,14 @@
         return path.split('.').reduce((acc, key) => acc?.[key], obj);
     }
 
+    function escapeHtml(str) {
+        return String(str)
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/"/g, '&quot;')
+            .replace(/'/g, '&#39;');
+    }
 
     PubSub.subscribe('email_selected', (msg, data) => {
         resetValidationErrors();

From 676b9cda6d0eab6039025cc310e996a0f7623510 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Wed, 30 Jul 2025 13:07:51 -0700
Subject: [PATCH 10/14] AB#29051 - Code Quality Email Validation Fix

---
 .../Views/Shared/Components/EmailsWidget/Default.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
index 04b9dc6d2..585481d21 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
@@ -344,7 +344,7 @@
                         : `The ${escapeHtml(fieldName)} field is required.`;
                 } else {
                     // Handle invalid email format
-                    errorMessage = `Please enter a valid email in ${escapeHtml(fieldName)}: ${emailStr}`;
+                    errorMessage = `Please enter a valid email in ${escapeHtml(fieldName)}: ${escapeHtml(emailStr)}`;
                 }
 
                 // Display the error message

From acb64b570165d5e7f2c4f8aff00e4173c9c89985 Mon Sep 17 00:00:00 2001
From: aurelio-aot <aurelio.pascual.jr@gmail.com>
Date: Wed, 30 Jul 2025 14:03:11 -0700
Subject: [PATCH 11/14] AB#29694:Bugfix contact info not saving

---
 .../GrantApplications/ApplicationApplicantAppService.cs   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationApplicantAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationApplicantAppService.cs
index dba7b46c6..b6c9a02de 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationApplicantAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationApplicantAppService.cs
@@ -164,7 +164,7 @@ public async Task<GrantApplicationDto> UpdatePartialApplicantInfoAsync(Guid appl
         if (input.Data.ContactInfo != null
             && await AuthorizationService.IsGrantedAsync(UnitySelector.Applicant.Contact.Update))
         {
-            await CreateOrUpdateContactInfoAsync(application.ApplicantId, input.Data.ContactInfo);
+            await CreateOrUpdateContactInfoAsync(applicationId, application.ApplicantId, input.Data.ContactInfo);
         }
 
         //-- APPLICANT INFO - SIGNING AUTHORITY (APPLICATION)
@@ -250,13 +250,13 @@ public async Task<GrantApplicationDto> UpdatePartialApplicantInfoAsync(Guid appl
     /// <param name="contactInfo"></param>
     /// <returns></returns>
     [Authorize(UnitySelector.Applicant.Contact.Update)]
-    protected internal async Task<ApplicantAgent?> CreateOrUpdateContactInfoAsync(Guid applicantId, ContactInfoDto contactInfo)
+    protected internal async Task<ApplicantAgent?> CreateOrUpdateContactInfoAsync(Guid applicationId, Guid applicantId, ContactInfoDto contactInfo)
     {
-        var applicantAgent = await applicantAgentRepository.FirstOrDefaultAsync(a => a.ApplicantId == applicantId)
+        var applicantAgent = await applicantAgentRepository.FirstOrDefaultAsync(a => a.ApplicantId == applicantId && a.ApplicationId == applicationId)
         ?? new ApplicantAgent
         {
             ApplicantId   = applicantId,
-            ApplicationId = contactInfo.ApplicationId,
+            ApplicationId = applicationId,
         };
 
         ObjectMapper.Map<ContactInfoDto, ApplicantAgent>(contactInfo, applicantAgent);

From 74cf131e265bf58f9f788dcf31429aa4e53b1f2e Mon Sep 17 00:00:00 2001
From: jpasta <james.p.pasta@gmail.com>
Date: Wed, 30 Jul 2025 14:16:24 -0700
Subject: [PATCH 12/14] bugfix/AB#28691-FixUnitTest

---
 .../test/Unity.Payments.TestBase/PaymentsTestBase.cs         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.TestBase/PaymentsTestBase.cs b/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.TestBase/PaymentsTestBase.cs
index a03d5e689..0260896c3 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.TestBase/PaymentsTestBase.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.TestBase/PaymentsTestBase.cs
@@ -11,6 +11,7 @@
 using Unity.Payments.Security;
 using Volo.Abp.SettingManagement;
 using Volo.Abp.TenantManagement;
+using Unity.GrantManager.Applications;
 
 namespace Unity.Payments;
 
@@ -69,6 +70,10 @@ protected override void AfterAddApplication(IServiceCollection services)
         featureMock.IsEnabledAsync(Arg.Any<string>()).Returns(true);
         services.AddSingleton(featureMock);
 
+        // Mock the repositories to avoid database access
+        services.AddSingleton(Substitute.For<IApplicationRepository>());
+        services.AddSingleton(Substitute.For<IApplicationFormRepository>());
+
         var externalUserLookupMock = Substitute.For<FakeExternalUserLookupServiceProvider>();
         services.AddSingleton<IExternalUserLookupServiceProvider>(externalUserLookupMock);
 

From 4a3bc265dbd28c47dd7aa7dcb1246e8c8db66b24 Mon Sep 17 00:00:00 2001
From: jpasta <james.p.pasta@gmail.com>
Date: Wed, 30 Jul 2025 15:52:46 -0700
Subject: [PATCH 13/14] bugfix/AB#28691-FixL3

---
 .../Domain/Services/PaymentsManager.cs        |  4 +-
 .../PaymentRequestAppService.cs               | 75 ++++++++++++++++---
 2 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentsManager.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentsManager.cs
index d53a2defe..73bd07d3c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentsManager.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentsManager.cs
@@ -135,12 +135,12 @@ public async Task<PaymentRequest> TriggerAction(Guid paymentRequestsId, PaymentA
 
             else if (triggerAction == PaymentApprovalAction.Submit)
             {
-                if (HasPermission(PaymentsPermissions.Payments.L2ApproveOrDecline))
+                if (HasPermission(PaymentsPermissions.Payments.L2ApproveOrDecline) && paymentRequest.Status == PaymentRequestStatus.L2Pending)
                 {
                     var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == ExpenseApprovalType.Level2);
                     paymentRequest.ExpenseApprovals[index].Approve(currentUserId);
                 }
-                else if (HasPermission(PaymentsPermissions.Payments.L3ApproveOrDecline))
+                else if (HasPermission(PaymentsPermissions.Payments.L3ApproveOrDecline) && paymentRequest.Status == PaymentRequestStatus.L3Pending)
                 {
                     var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == ExpenseApprovalType.Level3);
                     paymentRequest.ExpenseApprovals[index].Approve(currentUserId);
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs
index 421acc35e..c34ff1413 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs
@@ -20,6 +20,7 @@
 using Volo.Abp.Users;
 using Unity.Payments.Domain.PaymentThresholds;
 using Volo.Abp.Domain.Repositories;
+using Unity.GrantManager.Applications;
 
 namespace Unity.Payments.PaymentRequests
 {
@@ -30,6 +31,8 @@ public class PaymentRequestAppService(
                 ICurrentUser currentUser,
                 IDataFilter dataFilter,
                 IExternalUserLookupServiceProvider externalUserLookupServiceProvider,
+                IApplicationRepository applicationRepository,
+                IApplicationFormRepository applicationFormRepository,
                 IPaymentConfigurationRepository paymentConfigurationRepository,
                 IPaymentsManager paymentsManager,
                 IPaymentRequestRepository paymentRequestsRepository,
@@ -219,28 +222,78 @@ private async Task<PaymentApprovalAction> DetermineTriggerActionAsync(
             UpdatePaymentStatusRequestDto dto,
             PaymentRequest payment)
         {
-            if (await CanPerformLevel1ActionAsync(payment.Status))
+            if (payment == null)
             {
-                return dto.IsApprove ? PaymentApprovalAction.L1Approve : PaymentApprovalAction.L1Decline;
+                Logger.LogWarning("Payment is null in DetermineTriggerActionAsync.");
+                return PaymentApprovalAction.None;
             }
 
-            if (await CanPerformLevel2ActionAsync(payment, dto.IsApprove))
+            try
             {
-                if (dto.IsApprove)
-                {
-                    return PaymentApprovalAction.Submit;
-                }
-                return PaymentApprovalAction.L2Decline;
-            }
+                if (await CanPerformLevel1ActionAsync(payment.Status))
+                    return dto.IsApprove ? PaymentApprovalAction.L1Approve : PaymentApprovalAction.L1Decline;
 
-            if (await CanPerformLevel3ActionAsync(payment.Status))
+                if (await CanPerformLevel2ActionAsync(payment, dto.IsApprove))
+                    return await GetLevel2ApprovalActionAsync(dto, payment);
+
+                if (await CanPerformLevel3ActionAsync(payment.Status))
+                    return dto.IsApprove ? PaymentApprovalAction.Submit : PaymentApprovalAction.L3Decline;
+            }
+            catch (Exception ex)
             {
-                return dto.IsApprove ? PaymentApprovalAction.Submit : PaymentApprovalAction.L3Decline;
+                Logger.LogException(ex);
             }
 
             return PaymentApprovalAction.None;
         }
 
+        private async Task<PaymentApprovalAction> GetLevel2ApprovalActionAsync(UpdatePaymentStatusRequestDto dto, PaymentRequest payment)
+        {
+            if (!dto.IsApprove)
+                return PaymentApprovalAction.L2Decline;
+            
+            decimal? threshold = null;
+            try
+            {
+                decimal? userPaymentThreshold = await GetUserPaymentThresholdAsync();
+                threshold = await GetPaymentRequestThresholdByApplicationIdAsync(payment.CorrelationId, userPaymentThreshold);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogWarning(ex, "Failed to get payment threshold for applicationId: {CorrelationId}", payment.CorrelationId);
+            }
+
+            if (threshold.HasValue && payment.Amount > threshold.Value)
+                return PaymentApprovalAction.L2Approve;
+
+            return PaymentApprovalAction.Submit;
+        }
+        public async Task<decimal?> GetPaymentRequestThresholdByApplicationIdAsync(Guid applicationId, decimal? userPaymentThreshold = null)
+        {
+            var application = await (await applicationRepository.GetQueryableAsync())
+            .Include(a => a.ApplicationForm)
+            .FirstOrDefaultAsync(a => a.Id == applicationId);
+
+            if (application == null)
+            {
+                throw new BusinessException($"Application with Id {applicationId} not found.");
+            }
+
+            var appForm = application.ApplicationForm ?? 
+            (application.ApplicationFormId != Guid.Empty 
+                ? await applicationFormRepository.GetAsync(application.ApplicationFormId) 
+                : null);
+
+            var formThreshold = appForm?.PaymentApprovalThreshold;
+
+            if (formThreshold.HasValue && userPaymentThreshold.HasValue)
+            {
+                return Math.Min(formThreshold.Value, userPaymentThreshold.Value);
+            }
+
+            return formThreshold ?? userPaymentThreshold ?? 0m;
+        }
+    
         private async Task<bool> CanPerformLevel1ActionAsync(PaymentRequestStatus status)
         {
             List<PaymentRequestStatus> level1Approvals = new() { PaymentRequestStatus.L1Pending, PaymentRequestStatus.L1Declined };

From c4f8c2fb9edb2c3ae58e55c97f2f540bc953882f Mon Sep 17 00:00:00 2001
From: jpasta <james.p.pasta@gmail.com>
Date: Wed, 30 Jul 2025 16:34:35 -0700
Subject: [PATCH 14/14] bugfix/AB#28691-FixSonar

---
 .../NumericDefinitionWidget.cs                       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/NumericDefinitionWidget/NumericDefinitionWidget.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/NumericDefinitionWidget/NumericDefinitionWidget.cs
index bab7f66ae..f0d4745c1 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/NumericDefinitionWidget/NumericDefinitionWidget.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/NumericDefinitionWidget/NumericDefinitionWidget.cs
@@ -29,6 +29,12 @@ public class NumericDefinitionWidget : AbpViewComponent
             .ApplyRequired(form);
         }
 
+        // Cache JsonSerializerOptions instance
+        private static readonly JsonSerializerOptions CachedJsonOptions = new JsonSerializerOptions
+        {
+            NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString
+        };
+
         public async Task<IViewComponentResult> InvokeAsync(string? definition)
         {
             NumericDefinitionViewModel viewModel = new();
@@ -37,11 +43,7 @@ public async Task<IViewComponentResult> InvokeAsync(string? definition)
             {
                 try
                 {
-                    var options = new JsonSerializerOptions
-                    {
-                        NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString
-                    };
-                    var numericDefinition = JsonSerializer.Deserialize<NumericDefinition>(definition, options);
+                    var numericDefinition = JsonSerializer.Deserialize<NumericDefinition>(definition, CachedJsonOptions);
 
                     if (numericDefinition != null)
                     {