From cd436857adb72b0f887048b65e27f41869933e69 Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Wed, 15 Nov 2023 12:15:47 +0000
Subject: [PATCH 1/2] Add missing suffix to settings page link

---
 app/templates/views/service-settings.html                   | 3 ++-
 .../main/views/service_settings/test_service_settings.py    | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index 02ccd93f26..62d1493d82 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -248,7 +248,8 @@ <h1 class="heading-medium">Settings</h1>
             {{ edit_field(
               'Change',
               url_for('main.service_set_international_letters', service_id=current_service.id),
-              permissions=['manage_service']
+              permissions=['manage_service'],
+              suffix='your settings for sending international letters',
             )}}
           {% 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 f0782fc80b..4b1d746c28 100644
--- a/tests/app/main/views/service_settings/test_service_settings.py
+++ b/tests/app/main/views/service_settings/test_service_settings.py
@@ -97,7 +97,7 @@ def mock_get_service_settings_page_common(
                 "Send text messages Off Change your settings for sending text messages",
                 "Label Value Action",
                 "Send letters On Change your settings for sending letters",
-                "Send international letters Off Change",
+                "Send international letters Off Change your settings for sending international letters",
                 "Sender addresses Not set Manage sender addresses",
                 "Letter branding Not set Change letter branding",
             ],
@@ -157,7 +157,7 @@ def mock_get_service_settings_page_common(
                 "Send text messages Off Change your settings for sending text messages",
                 "Label Value Action",
                 "Send letters On Change your settings for sending letters",
-                "Send international letters Off Change",
+                "Send international letters Off Change your settings for sending international letters",
                 "Sender addresses Not set Manage sender addresses",
                 "Letter branding Not set Change letter branding",
                 "Label Value Action",
@@ -474,7 +474,7 @@ def test_send_files_by_email_row_on_settings_page(
                 "Send text messages Off Change your settings for sending text messages",
                 "Label Value Action",
                 "Send letters On Change your settings for sending letters",
-                "Send international letters Off Change",
+                "Send international letters Off Change your settings for sending international letters",
                 "Sender addresses 1 Example Street Manage sender addresses",
                 "Letter branding Not set Change letter branding",
             ],

From fff39fa5c6b87663f3dfeecc8b82d6c39cb052fe Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Wed, 15 Nov 2023 13:58:59 +0000
Subject: [PATCH 2/2] Add CSS fix for visually-hidden text

Borrowed from v5 of govuk-frontend which includes
the changes from this pull request to fix an issue
with how certain screen readers announce spaces in
visually hidden text:

https://github.com/alphagov/govuk-frontend/pull/3836
---
 .../stylesheets/govuk-frontend/extensions.scss      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/assets/stylesheets/govuk-frontend/extensions.scss b/app/assets/stylesheets/govuk-frontend/extensions.scss
index 390789835e..ea212cc746 100644
--- a/app/assets/stylesheets/govuk-frontend/extensions.scss
+++ b/app/assets/stylesheets/govuk-frontend/extensions.scss
@@ -59,6 +59,19 @@ $govuk-destructive-link-active-colour: $govuk-text-colour;
   @include govuk-link-style-destructive-no-visited-state;
 }
 
+// TODO: Remove when updating to v5 of govuk-frontend
+// Absolute positioning has the unintended consequence of removing any
+// whitespace surrounding visually hidden text from the accessibility tree.
+// Insert a space character before and after visually hidden text to separate
+// it from any visible text surrounding it.
+.govuk-visually-hidden::before {
+  content: "\00a0";
+}
+
+.govuk-visually-hidden::after {
+  content: "\00a0";
+}
+
 // GOVUK Frontend's grid-column classes are built from the $govuk-grid-widths map
 // that means we can extend the map to get extra classes
 $notify-grid-widths: (