From 1271098ff97e2017786f130d7b5f48bcd970e970 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jbobel@flexion.us>
Date: Mon, 23 Oct 2023 13:43:26 -0400
Subject: [PATCH 1/2] Content update for blanket error page

---
 app/templates/error/500.html | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/templates/error/500.html b/app/templates/error/500.html
index 49645e00a..af86388d7 100644
--- a/app/templates/error/500.html
+++ b/app/templates/error/500.html
@@ -4,16 +4,10 @@
   <div class="grid-row">
     <div class="grid-col-8">
       <h1 class="heading-large">
-        Sorry, there’s a problem with Notify.gov
+        Sorry, we can't deliver what you asked for right now.
       </h1>
       <p class="usa-body">
-        Try again later.
-      </p>
-      <!-- <p class="usa-body">
-        You can check our <a class="usa-link" href="https://status.notifications.service.gov.uk">system status</a> page to see if there are any known issues.
-      </p> -->
-      <p class="usa-body">
-        To report a problem, please email <a class="usa-link" href="mailto:notify-support@gsa.gov">notify-support@gsa.gov</a>.
+        Please try again later or <a class="usa-link" href="mailto:notify-support@gsa.gov"></a>email us</a> for more information.</p>
       </p>
     </div>
   </div>

From a3022dcfe67d45028bf4752e3046183cf93d174c Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jbobel@flexion.us>
Date: Wed, 1 Nov 2023 13:06:29 -0400
Subject: [PATCH 2/2] Fixing tests

---
 tests/app/main/test_errorhandlers.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/app/main/test_errorhandlers.py b/tests/app/main/test_errorhandlers.py
index a544b4ab9..d810a67a5 100644
--- a/tests/app/main/test_errorhandlers.py
+++ b/tests/app/main/test_errorhandlers.py
@@ -54,7 +54,10 @@ def test_csrf_returns_400(client_request, mocker):
         _test_page_title=False,
     )
 
-    assert page.h1.string.strip() == "Sorry, there’s a problem with Notify.gov"
+    assert (
+        page.h1.string.strip()
+        == "Sorry, we can't deliver what you asked for right now."
+    )
     assert (
         page.title.string.strip()
         == "Sorry, there’s a problem with the service – Notify.gov"
@@ -75,7 +78,10 @@ def test_csrf_redirects_to_sign_in_page_if_not_signed_in(client_request, mocker)
 def test_405_returns_something_went_wrong_page(client_request, mocker):
     page = client_request.post_url("/", _expected_status=405)
 
-    assert page.h1.string.strip() == "Sorry, there’s a problem with Notify.gov"
+    assert (
+        page.h1.string.strip()
+        == "Sorry, we can't deliver what you asked for right now."
+    )
     assert (
         page.title.string.strip()
         == "Sorry, there’s a problem with the service – Notify.gov"