From 9c658bf0203a1d25fc62a597cb9aeffdf6359dc9 Mon Sep 17 00:00:00 2001
From: Andrew Shumway <ashumway@flexion.us>
Date: Wed, 6 Dec 2023 12:26:33 -0700
Subject: [PATCH] Fix verbage on front end to better reflect functionality

---
 app/main/forms.py                                      |  2 +-
 app/templates/views/service-settings.html              | 10 +++++-----
 .../views/service-settings/set-message-limit.html      |  4 ++--
 .../views/service_settings/test_service_settings.py    |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index fb9b7eeac..5e926dce4 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -1196,7 +1196,7 @@ class AdminServiceSMSAllowanceForm(StripWhitespaceForm):
 
 class AdminServiceMessageLimitForm(StripWhitespaceForm):
     message_limit = GovukIntegerField(
-        "Number of messages the service is allowed to send each day",
+        "Max number of messages the service has per send",
         validators=[DataRequired(message="Cannot be empty")],
     )
 
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index 9364880fc..c3e0803ab 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -93,7 +93,7 @@
           )
           }}
         {% endcall %}
-        
+
         {% if current_user.platform_admin %}
           {% call settings_row(if_has_permission='sms') %}
             {{ text_field('Send international text messages') }}
@@ -107,7 +107,7 @@
             }}
           {% endcall %}
         {% endif %}
-        
+
         <!-- {% call settings_row(if_has_permission='sms') %}
                   {{ text_field('Receive text messages') }}
                   {{ boolean_field('inbound_sms' in current_service.permissions) }}
@@ -294,9 +294,9 @@
             {{ edit_field('Change', url_for('.set_rate_limit', service_id=current_service.id), suffix='rate limit') }}
           {% endcall %}
           {% call row() %}
-            {{ text_field('Message limit')}}
-            {{ text_field('{:,} per day'.format(current_service.message_limit)) }}
-            {{ edit_field('Change', url_for('.set_message_limit', service_id=current_service.id), suffix='daily message limit') }}
+            {{ text_field('Message batch limit')}}
+            {{ text_field('{:,} per send'.format(current_service.message_limit)) }}
+            {{ edit_field('Change', url_for('.set_message_limit', service_id=current_service.id), suffix='message batch limit') }}
           {% endcall %}
           {% call row() %}
             {{ text_field('Free text message allowance')}}
diff --git a/app/templates/views/service-settings/set-message-limit.html b/app/templates/views/service-settings/set-message-limit.html
index 74feb1053..7fc632954 100644
--- a/app/templates/views/service-settings/set-message-limit.html
+++ b/app/templates/views/service-settings/set-message-limit.html
@@ -5,7 +5,7 @@
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
 
 {% block service_page_title %}
-  Daily message limit
+  Message batch limit
 {% endblock %}
 
 {% block backLink %}
@@ -15,7 +15,7 @@
 {% block maincolumn_content %}
 
   {% call form_wrapper() %}
-    {{ page_header('Daily message limit') }}
+    {{ page_header('Message batch limit') }}
     {{ form.message_limit }}
     {{ page_footer('Save') }}
   {% endcall %}
diff --git a/tests/app/main/views/service_settings/test_service_settings.py b/tests/app/main/views/service_settings/test_service_settings.py
index ab467a1f9..ede9f1e92 100644
--- a/tests/app/main/views/service_settings/test_service_settings.py
+++ b/tests/app/main/views/service_settings/test_service_settings.py
@@ -81,7 +81,7 @@ def _mock_get_service_settings_page_common(
                 "Notes None Change the notes for the service",
                 "Organization Test organization Federal government Change organization for service",
                 "Rate limit 3,000 per minute Change rate limit",
-                "Message limit 1,000 per day Change daily message limit",
+                "Message batch limit 1,000 per send Change message batch limit",
                 "Free text message allowance 250,000 per year Change free text message allowance",
                 "Email branding GOV.UK Change email branding (admin view)",
                 "Custom data retention Email – 7 days Change data retention",
@@ -3171,7 +3171,7 @@ def test_should_show_page_to_set_message_limit(
     client_request.login(platform_admin_user)
     page = client_request.get("main.set_message_limit", service_id=SERVICE_ONE_ID)
     assert normalize_spaces(page.select_one("label").text) == (
-        "Number of messages the service is allowed to send each day"
+        "Max number of messages the service has per send"
     )
     assert normalize_spaces(page.select_one("input[type=text]")["value"]) == ("1000")