diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html
index c870f5ab1..7a215f879 100644
--- a/src/registrar/templates/domain_request_status.html
+++ b/src/registrar/templates/domain_request_status.html
@@ -109,7 +109,7 @@
{% include "includes/summary_item.html" with title='Purpose of your domain' value=DomainRequest.purpose heading_level=heading_level %}
{% endif %}
- {% if DomainRequest.creator and not has_profile_feature_flag %}
+ {% if DomainRequest.creator %}
{% include "includes/summary_item.html" with title='Your contact information' value=DomainRequest.creator contact='true' heading_level=heading_level %}
{% endif %}
diff --git a/src/registrar/templates/domain_your_contact_information.html b/src/registrar/templates/domain_your_contact_information.html
deleted file mode 100644
index 4611c9438..000000000
--- a/src/registrar/templates/domain_your_contact_information.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "domain_base.html" %}
-{% load static field_helpers %}
-
-{% block title %}Your contact information | {{ domain.name }} | {% endblock %}
-
-{% block domain_content %}
- {% include "includes/form_errors.html" with form=form %}
-
-
Your contact information
-
-
If you’d like us to use a different name, email, or phone number you can make those changes below. Updating your contact information here will update the contact information for all domains in your account. Changing your information here won’t affect your Login.gov account information. The contact information you provide here won’t be made public and will only be used for the .gov program.
-
-
- {% include "includes/required_fields.html" %}
-
-
-
-{% endblock %} {# domain_content #}
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 400862168..65aeed1c6 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -663,11 +663,13 @@ class TestDomainRequestAdmin(MockEppLib):
"""When an action needed reason is set, an email is sent out and help@get.gov
is BCC'd in production"""
# Create fake creator
+ EMAIL = "meoward.jones@igorville.gov"
+
_creator = User.objects.create(
username="MrMeoward",
first_name="Meoward",
last_name="Jones",
- email="meoward.jones@igorville.gov",
+ email=EMAIL,
phone="(555) 123 12345",
title="Treat inspector",
)
@@ -819,12 +821,14 @@ class TestDomainRequestAdmin(MockEppLib):
Also test that the default email set in settings is NOT BCCd on non-prod whenever
an email does go out."""
+ EMAIL = "meoward.jones@igorville.gov"
+
# Create fake creator
_creator = User.objects.create(
username="MrMeoward",
first_name="Meoward",
last_name="Jones",
- email="meoward.jones@igorville.gov",
+ email=EMAIL,
phone="(555) 123 12345",
title="Treat inspector",
)
@@ -1106,11 +1110,13 @@ class TestDomainRequestAdmin(MockEppLib):
"""When transitioning to rejected on a domain request, an email is sent
explaining why when the reason is contacts or org legitimacy."""
# Create fake creator
+
+ EMAIL = "meoward.jones@igorville.gov"
_creator = User.objects.create(
username="MrMeoward",
first_name="Meoward",
last_name="Jones",
- email="meoward.jones@igorville.gov",
+ email=EMAIL,
phone="(555) 123 12345",
title="Treat inspector",
)
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 6875fc71c..b42b252e2 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -262,7 +262,7 @@ class TestDomainRequest(TestCase):
msg = "Create a domain request and submit it and see if email was sent."
domain_request = completed_domain_request(user=self.dummy_user_2)
self.check_email_sent(
- domain_request, msg, "submit", 1, expected_content="Hi", expected_email=self.dummy_user_2.email
+ domain_request, msg, "submit", 1, expected_content="Hello", expected_email=self.dummy_user_2.email
)
@override_flag("profile_feature", active=True)
@@ -272,7 +272,7 @@ class TestDomainRequest(TestCase):
msg = "Create a domain request and submit it and see if email was sent when the feature flag is on."
domain_request = completed_domain_request(user=self.dummy_user_2)
self.check_email_sent(
- domain_request, msg, "submit", 1, expected_content="Lava", expected_email="intern@igorville.com"
+ domain_request, msg, "submit", 1, expected_content="Hello", expected_email="intern@igorville.com"
)
@less_console_noise_decorator
@@ -306,16 +306,14 @@ class TestDomainRequest(TestCase):
msg = "Create a domain request and withdraw it and see if email was sent."
user, _ = User.objects.get_or_create(username="testy")
domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=user)
- self.check_email_sent(
- domain_request, msg, "withdraw", 1, expected_content="withdrawn", expected_email=user.email
- )
+ self.check_email_sent(domain_request, msg, "withdraw", 1, expected_content="Hello", expected_email=user.email)
@less_console_noise_decorator
def test_reject_sends_email(self):
msg = "Create a domain request and reject it and see if email was sent."
user, _ = User.objects.get_or_create(username="testy")
domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED, user=user)
- self.check_email_sent(domain_request, msg, "reject", 1, expected_content="rejected", expected_email=user.email)
+ self.check_email_sent(domain_request, msg, "reject", 1, expected_content="Hello", expected_email=user.email)
@less_console_noise_decorator
def test_reject_with_prejudice_does_not_send_email(self):