Merge branch 'main' into 2104-join-notify

app/main/views/index.py

@@ -55,7 +55,7 @@ def index():
     return render_template(
         "views/signedout.html",
         sms_rate=CURRENT_SMS_RATE,
-        counts=status_api_client.get_count_of_live_services_and_organizations()
+        counts=status_api_client.get_count_of_live_services_and_organizations(),
     )
 
 
@@ -278,6 +278,13 @@ def guidance_index():
     )
 
 
+@main.route("/contact")
+def contact():
+    return render_template(
+        "views/contact.html",
+    )
+
+
 @main.route("/about")
 def about_notify():
     return render_template(

app/main/views/send.py

@@ -483,6 +483,7 @@ def send_one_off_step(service_id, template_id, step_index):
         link_to_upload=(
             request.endpoint == "main.send_one_off_step" and step_index == 0
         ),
+        errors=form.errors if form.errors else None
     )
 
 
@@ -739,7 +740,7 @@ def all_placeholders_in_session(placeholders):
 
 def get_send_test_page_title(template_type, entering_recipient, name=None):
     if entering_recipient:
-        return "Send ‘{}’".format(name)
+        return "Select recipients"
     return "Personalize this message"
 
 

app/main/views/sub_navigation_dictionaries.py

@@ -114,4 +114,8 @@ def about_notify_nav():
                 },
             ],
         },
+        {
+            "name": "Contact",
+            "link": "main.contact",
+        },
     ]