diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js index 8a07b3f27..0bf62565d 100644 --- a/src/registrar/assets/js/get-gov.js +++ b/src/registrar/assets/js/get-gov.js @@ -1625,8 +1625,14 @@ class DomainRequestsTable extends LoadTableBase { ` } - // If the request is deletable, create modal body and insert it. This is true for both requests and portfolio requests pages - if (request.is_deletable) { + if (!request.is_deletable) { + // If the request is not deletable, insert a message + // for the screenreader to pickup explaining the empty table cell + modalTrigger = ` + Domain request cannot be deleted now. Edit the request for more information.` + } + else { + // If the request is deletable, create modal body and insert it. This is true for both requests and portfolio requests pages let modalHeading = ''; let modalDescription = ''; diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py index 29e9fa639..c84ddee78 100644 --- a/src/registrar/forms/domain_request_wizard.py +++ b/src/registrar/forms/domain_request_wizard.py @@ -229,7 +229,8 @@ class SeniorOfficialForm(RegistrarForm): email = forms.EmailField( label="Email", max_length=None, - error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")}, + error_messages={"invalid": ("Enter an email address in the required format, like name@example.com."), + "required": ("Enter an email address in the required format, like name@example.com.")}, validators=[ MaxLengthValidator( 320, diff --git a/src/registrar/templates/includes/senior_official.html b/src/registrar/templates/includes/senior_official.html index 073b82457..0302bc71f 100644 --- a/src/registrar/templates/includes/senior_official.html +++ b/src/registrar/templates/includes/senior_official.html @@ -21,9 +21,7 @@ {% input_with_errors form.first_name %} {% input_with_errors form.last_name %} {% input_with_errors form.title %} - {% with sublabel_text="Enter an email address in the required format, like name@example.com." %} - {% input_with_errors form.email %} - {% endwith %} + {% input_with_errors form.email %} {% elif not form.full_name.value and not form.title.value and not form.email.value %}