diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index eccfa1750..48e033919 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -811,7 +811,8 @@ class DomainAdmin(ListHeaderAdmin):
else:
self.message_user(
request,
- ("Domain statuses are %s" ". Thanks!") % statuses,
+ f"The registry statuses are {statuses}. "
+ "These statuses are from the provider of the .gov registry.",
)
return HttpResponseRedirect(".")
diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index 59edb707a..82f2c2cf4 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -718,7 +718,6 @@ class Domain(TimeStampedModel, DomainHelper):
if not isinstance(contact, eppInfo.InfoContactResultData):
raise ContactError("Contact must be of type InfoContactResultData")
-
auth_info = contact.auth_info
postal_info = contact.postal_info
addr = postal_info.addr
diff --git a/src/registrar/templates/django/admin/domain_change_form.html b/src/registrar/templates/django/admin/domain_change_form.html
index ac26fc922..2ed3d7532 100644
--- a/src/registrar/templates/django/admin/domain_change_form.html
+++ b/src/registrar/templates/django/admin/domain_change_form.html
@@ -13,10 +13,10 @@
{% elif original.state == original.State.ON_HOLD %}
{% endif %}
-
-
+
+
{% if original.state != original.State.DELETED %}
-
+
{% endif %}
{{ block.super }}
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index dd87a003a..51ace34f7 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -109,12 +109,12 @@ class TestDomainAdmin(MockEppLib):
)
self.assertEqual(response.status_code, 200)
self.assertContains(response, domain.name)
- self.assertContains(response, "Delete Domain in Registry")
+ self.assertContains(response, "Delete domain in registry")
# Test the info dialog
request = self.factory.post(
"/admin/registrar/domain/{}/change/".format(domain.pk),
- {"_delete_domain": "Delete Domain in Registry", "name": domain.name},
+ {"_delete_domain": "Delete domain in registry", "name": domain.name},
follow=True,
)
request.user = self.client
@@ -149,12 +149,12 @@ class TestDomainAdmin(MockEppLib):
)
self.assertEqual(response.status_code, 200)
self.assertContains(response, domain.name)
- self.assertContains(response, "Delete Domain in Registry")
+ self.assertContains(response, "Delete domain in registry")
# Test the error
request = self.factory.post(
"/admin/registrar/domain/{}/change/".format(domain.pk),
- {"_delete_domain": "Delete Domain in Registry", "name": domain.name},
+ {"_delete_domain": "Delete domain in registry", "name": domain.name},
follow=True,
)
request.user = self.client
@@ -194,12 +194,12 @@ class TestDomainAdmin(MockEppLib):
)
self.assertEqual(response.status_code, 200)
self.assertContains(response, domain.name)
- self.assertContains(response, "Delete Domain in Registry")
+ self.assertContains(response, "Delete domain in registry")
# Test the info dialog
request = self.factory.post(
"/admin/registrar/domain/{}/change/".format(domain.pk),
- {"_delete_domain": "Delete Domain in Registry", "name": domain.name},
+ {"_delete_domain": "Delete domain in registry", "name": domain.name},
follow=True,
)
request.user = self.client
@@ -221,7 +221,7 @@ class TestDomainAdmin(MockEppLib):
# Test the info dialog
request = self.factory.post(
"/admin/registrar/domain/{}/change/".format(domain.pk),
- {"_delete_domain": "Delete Domain in Registry", "name": domain.name},
+ {"_delete_domain": "Delete domain in registry", "name": domain.name},
follow=True,
)
request.user = self.client