Merge branch 'main' into stvnrlly-timezones

2026-05-24 10:44:00 -04:00 · 2022-11-28 16:21:43 -05:00
parent e12e780a05 383733612b
commit 03dad94af0
12 changed files with 73 additions and 133 deletions
--- a/app/main/views/sub_navigation_dictionaries.py
+++ b/app/main/views/sub_navigation_dictionaries.py
@@ -59,14 +59,14 @@ def using_notify_nav():
                    "name": "Formatting",
                    "link": "main.edit_and_format_messages",
                },
-                {
-                    "name": "Branding",
-                    "link": "main.branding_and_customisation",
-                },
-                {
-                    "name": "Send files by email",
-                    "link": "main.send_files_by_email",
-                },
+                # {
+                #   "name": "Branding",
+                #    "link": "main.branding_and_customisation",
+                # },
+                # {
+                #    "name": "Send files by email",
+                #    "link": "main.send_files_by_email",
+                # },
                # {
                #     "name": "Upload a letter",
                #     "link": "main.upload_a_letter",
@@ -77,8 +77,8 @@ def using_notify_nav():
                # },
            ]
        },
-        {
-            "name": "API documentation",
-            "link": "main.documentation",
-        },
+        # {
+        #   "name": "API documentation",
+        #   "link": "main.documentation",
+        # },
    ]
--- a/app/templates/views/accessibility_statement.html
+++ b/app/templates/views/accessibility_statement.html
@@ -13,20 +13,20 @@
  {{ content_metadata(
    data={
      "Published": "23 September 2020",
-      "Last updated": "27 April 2022",
-      "Next review due": "21 June 2022"
+      "Last updated": "21 November 2022",
+      "Next review due": "21 February 2023"
    }
    ) }}

  <p class="govuk-body">
-    This accessibility statement applies to the us notify domain. It does not apply to the <a class="govuk-link govuk-link--no-visited-state" href="https://docs.notifications.service.gov.uk">US Notify API documentation subdomain</a>.
+    This accessibility statement applies to the US Notify domain. <!-- It does not apply to the <a class="govuk-link govuk-link--no-visited-state" href="https://docs.notifications.service.gov.uk">US Notify API documentation subdomain</a>.-->
  </p>

  <p class="govuk-body">
-    This website is run by the US Notify team at the Government Digital Service (GDS). It is designed to be used by as many people as possible. You should be able to:
+    This website is run by the Public Benefits Studio team at the Technology Transformation Services within GSA. It is designed to be used by as many people as possible. You should be able to:
  </p>
  <ul class="govuk-list govuk-list--bullet">
-    <li>change colours, contrast levels and fonts</li>
+    <li>change colors, contrast levels and fonts</li>
    <li>zoom in up to 300% without the text spilling off the screen</li>
    <li>navigate most of the website using just a keyboard</li>
    <li>navigate most of the website using speech recognition software</li>
@@ -41,7 +41,7 @@
    <a class="govuk-link govuk-link--no-visited-state" href="https://mcmw.abilitynet.org.uk">AbilityNet</a> has advice on making your device easier to use if you have a disability.
  </p>

-  <h2 class="heading-medium" id="how-accessible-this-website-is">How accessible this website is</h2>
+  <h2 class="heading-medium" id="how-accessible-this-website-is">How accessible is this website?</h2>

  <p class="govuk-body">
    We know some parts of this website are not fully accessible:
@@ -56,17 +56,17 @@
    <li>choosing the date and time to send a message may be hard for some screen reader users</li>
    <li>screen reader users may find it expand or collapse groups of checkboxes</li>
    <li>one page links to a PDF document that is not fully accessible</li>
-    <li>the Notify status page has several accessibility issues</li>
+    <!--<li>the Notify status page has several accessibility issues</li> -->
  </ul>

-  <p class="govuk-body">
+  <!-- <p class="govuk-body">
    We also know that the emails Notify sends are not fully accessible. The JAWS and NVDA screen readers announce extra spaces in emails when you view them in Microsoft Outlook.
-  </p>
+  </p> -->

  <h2 class="heading-medium" id="feedback-and-contact-information">Feedback and contact information</h2>

  <p class="govuk-body">
-    If you need any part of this service in a different format like large print, audio recording or braille, <a class="govuk-link govuk-link--no-visited-state" href="https://www.notifications.service.gov.uk/support">contact the US Notify team</a>.
+    If you need any part of this service in a different format like large print, audio recording or braille, <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">contact the US Notify team</a>.
  </p>

  <p class="govuk-body">
@@ -76,23 +76,15 @@
  <h2 class="heading-medium" id="reporting-accessibility-problems">Reporting accessibility problems with this website</h2>

  <p class="govuk-body">
-    We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, <a class="govuk-link govuk-link--no-visited-state" href="https://www.notifications.service.gov.uk/support">contact the US Notify team</a>.
-  </p>
-
-  <h2 class="heading-medium" id="enforcement-procedure">Enforcement procedure</h2>
-
-  <p class="govuk-body">
-    The Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018 (the ‘accessibility regulations’). If you’re not happy with how we respond to your complaint, contact the Equality Advisory and Support Service (EASS).
-  </p>
-
-  <p class="govuk-body">
-    Find out how to <a class="govuk-link govuk-link--no-visited-state" href="https://www.notifications.service.gov.uk/support">contact the US Notify team</a>.
+    We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">contact the US Notify team</a>.
  </p>

  <h2 class="heading-medium" id="technical-information">Technical information about this website’s accessibility</h2>

  <p class="govuk-body">
-    GDS is committed to making its website accessible, in accordance with the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018.
+   We strive to make our website as accessible and usable as possible. We do this by following <a class="govuk-link govuk-link--no-visited-state" href="https://www.section508.gov/manage/laws-and-policies/">Section 508</a> and the Web Content Accessibility Guidelines (WCAG 2.0) produced by the World Wide Web Consortium (W3C, the web's governing body).
+
+  Section 508 is a legal requirement and WCAG is a set of checkpoints and guidelines that help ensure that websites are designed and written properly.
  </p>

  <p class="govuk-body">
@@ -123,10 +115,6 @@
    </li>
  </ul>

-  <p class="govuk-body">
-    We expect to fix these issues by the end of July 2022.
-  </p>
-
  <h3 class="heading-small" id="problems-with-using-the-interface">Problems with using the interface</h3>

  <p class="govuk-body">
@@ -151,10 +139,6 @@
    </li>
  </ul>

-  <p class="govuk-body">
-    We hope to fix these issues by the end of September 2022.
-  </p>
-
  <h3 class="heading-small" id="pdfs-documents">
    PDFs and other documents
  </h3>
@@ -166,7 +150,7 @@
    We provide a written description of the information in the PDF on an HTML page as an accessible alternative.
  </p>

-  <h3 class="heading-small" id="emails">
+ <!-- <h3 class="heading-small" id="emails">
    Emails
  </h3>

@@ -184,7 +168,7 @@

  <p class="govuk-body">
    The following content on the <a class="govuk-link govuk-link--no-visited-state" href="https://status.notifications.service.gov.uk/">Notify status page</a> is not compliant with the WCAG version 2.1 AA standard:
-  </p>
+  </p> 

  <ul class="govuk-list govuk-list--bullet">
    <li>an incorrect heading hierarchy which fails <a class="govuk-link govuk-link--no-visited-state" href="https://www.w3.org/TR/WCAG21/#info-and-relationships">success criterion 1.3.1: info and relationships</a></li>
@@ -212,5 +196,5 @@

  <p class="govuk-body">
    We decided which pages to test based on the most common tasks that US Notify users need to complete. We also tested a sample of pages with common user interface components.
-  </p>
+  </p> -->
 {% endblock %}
--- a/app/templates/views/features/text-messages.html
+++ b/app/templates/views/features/text-messages.html
@@ -1,5 +1,6 @@
 {% extends "content_template.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
+{% from "components/service-link.html" import service_link %}

 {% block per_page_title %}
  Text messages
@@ -17,18 +18,25 @@
  <p class="govuk-body">Notify makes it easy to:</p>
  <ul class="list list-bullet">
    <li>create reusable text message templates</li>
-    <li>personalise the content of your texts</li>
+    <li>personalize the content of your texts</li>
    <li>send and schedule bulk messages</li></ul>
-  <p class="govuk-body">You can also <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">integrate with our API</a> to send text messages automatically.<p class="govuk-body">
+  <!-- <p class="govuk-body">You can also <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">integrate with our API</a> to send text messages automatically.<p class="govuk-body">

  <h3 class="heading heading-small" id="receive">Receive text messages</h3>
  <p class="govuk-body">Let people send messages to your service or reply to your texts.</p>
  <p class="govuk-body">You can see and reply to the messages you receive when you sign in to Notify. If you’re using our API, you can set up your own automated processes to manage replies.</p>
-  <p class="govuk-body"><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.support') }}">Contact us</a> to request a unique number for text message replies.</p>
+  <p class="govuk-body"><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.support') }}">Contact us</a> to request a unique number for text message replies.</p> -->

  <h3 class="heading heading-small" id="sender">Show people who your texts are from</h3>
  <p class="govuk-body">When you send a text message with Notify, the sender name tells people who it’s from.</p>
-  <p class="govuk-body">See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.branding_and_customisation', _anchor='text-message-sender') }}">how to change the text message sender</a>.</p>
+
+  <p class="govuk-body">To change the text message sender from the default of ‘US Notify’:</p>
+
+  <ol class="list list-number">
+    <li>Go to the <b class="govuk-!-font-weight-bold">Text message settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
+    <li>Select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message senders</b> row.</li>
+    <li>Select <b class="govuk-!-font-weight-bold">Change</b> or <b class="govuk-!-font-weight-bold">Add text message sender</b>.</li>
+</ol>

  <h2 class="heading heading-medium">Pricing<h2>
    <p class="govuk-body">Each service you add has an annual allowance of free text messages.</p>
--- a/app/templates/views/get-started.html
+++ b/app/templates/views/get-started.html
@@ -34,19 +34,19 @@
  <li class="get-started-list__item">
    <h2 class="get-started-list__heading">Set up your service</h2>
    {% if not current_user.is_authenticated or not current_service %}
-    <p class="govuk-body">Review your settings to add message branding, reply-to addresses and sender information.</p>
+    <p class="govuk-body">Review your settings to add message branding and sender information.</p>
    <p class="govuk-body">Add team members and check their permissions.</p>
    {% else %}
-    <p class="govuk-body">Review your <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.service_settings', service_id=current_service.id) }}">settings</a> to add message branding, reply-to addresses and sender information.</p>
+    <p class="govuk-body">Review your <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.service_settings', service_id=current_service.id) }}">settings</a> to add message branding and sender information.</p>
    <p class="govuk-body">Add <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.manage_users', service_id=current_service.id) }}">team members</a> and check their permissions.</p>
    {% endif %}
  </li>

-  <li class="get-started-list__item">
+  <!-- <li class="get-started-list__item">
    <h2 class="get-started-list__heading">Set up an API integration (optional)</h2>
    <p class="govuk-body">You can use the Notify API to send messages automatically.</p>
    <p class="govuk-body">Our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.documentation') }}">documentation</a> explains how to integrate the API with a web application or back office system.</p>
-  </li>
+  </li> -->

  <li class="get-started-list__item">
    <h2 class="get-started-list__heading">Start sending messages</h2>
@@ -55,7 +55,7 @@
    {% else %}
    <p class="govuk-body">You should <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.request_to_go_live', service_id=current_service.id) }}">request to go live</a> when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.</p>
    {% endif %}
-    <p class="govuk-body">Check <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.how_to_pay') }}">how to pay</a> if you’re planning to send letters or exceed the <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.pricing', _anchor='text-messages') }}">free text message allowance</a>.</p>
+    <p class="govuk-body">Check <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.how_to_pay') }}">how to pay</a> if you’re planning to exceed the <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.pricing', _anchor='text-messages') }}">free text message allowance</a>.</p>
  </li>

 </ol>
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -45,7 +45,7 @@

  <p class="govuk-body">The text message sender tells your users who the message is from.</p>

-  <p class="govuk-body">To change the text message sender from the default of ‘GOVUK’:</p>
+  <p class="govuk-body">To change the text message sender from the default of ‘US Notify’:</p>

  <ol class="list list-number">
    <li>Go to the <b class="govuk-!-font-weight-bold">Text message settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -12,7 +12,7 @@
  <p class="govuk-body">Notify’s real-time dashboard lets you check the status of any message, to see when it was delivered.</p>
  <p class="govuk-body">For <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for("main.security") }}">security</a>, this information is only available for 7 days after a message has been sent. You can download a report, including a list of sent messages, for your own records.</p>
  <p class="govuk-body">This page describes the statuses you’ll see when you’re signed in to Notify.</p>
-  <p class="govuk-body">If you’re using the Notify API, read our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">documentation</a> for a list of API statuses.<p class="govuk-body">
+  <!-- <p class="govuk-body">If you’re using the Notify API, read our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">documentation</a> for a list of API statuses.<p class="govuk-body"> 

  <h2 id="email-statuses" class="heading-medium">Emails</h2>
  <div class="bottom-gutter-3-2">
@@ -41,7 +41,7 @@
  <p class="govuk-body">If an email is marked as spam, Notify receives a ‘complaint’ from the email provider. We’ll contact you if we receive a complaint about any of your emails. When this happens you should remove the recipient’s email address from your list.</p>

  <h3 id="open-rates" class="heading-small">Open rates and click-throughs</h3>
-  <p class="govuk-body">Notify cannot tell you if your users open an email or click on the links in an email. We do not track open rates and click-throughs because there are privacy issues. Tracking emails without asking permission from users could breach General Data Protection Regulations (GDPR).</p>
+  <p class="govuk-body">Notify cannot tell you if your users open an email or click on the links in an email. We do not track open rates and click-throughs because there are privacy issues. Tracking emails without asking permission from users could breach General Data Protection Regulations (GDPR).</p> -->

  <h2 id="text-message-statuses" class="heading-medium">Text messages</h2>
  <div class="bottom-gutter-3-2">
--- a/app/templates/views/privacy.html
+++ b/app/templates/views/privacy.html
@@ -13,7 +13,7 @@

    {{ content_metadata(
      data={
-        "Last updated": "1 October 2021"
+        "Last updated": "21 November 2022"
      }
    ) }}

@@ -22,14 +22,7 @@
    <p class="govuk-body">US Notify is a service that lets public service teams in the United States send text messages
      to users of their service.</p>

-    <p class="govuk-body">US Notify is provided by the Government Digital Service (GDS) which is part of the Cabinet Office.</p>
-
-    <p class="govuk-body">Organisations sending notifications using US Notify are the data controller and Cabinet Office is the data processor. The data controller must tell you about what they are doing with your personal data.</p>
-
-    <p class="govuk-body">For the credentials used to access US Notify, Cabinet Office is the data controller.</p>
-
-    <p class="govuk-body">For more information see the Information Commissioner’s Office (ICO) <a class="govuk-link govuk-link--no-visited-state" href="https://ico.org.uk/esdwebpages/search">Data Protection Public Register</a>.
-      The Cabinet Office registration number is: Z7414053</p>
+    <p class="govuk-body">US Notify is provided by the TTS Public Benefits Studio, which is part of the General Services Administration (GSA).</p>

    <h2 class="heading-medium" id="what-data-we-collect-from-you">What data we collect from you</h2>

@@ -39,12 +32,8 @@
        <li>your name</li>
        <li>your email address</li>
        <li>your mobile phone number</li>
-        <li>the IP address you use to access US Notify</li>
    </ul>

-    <p class="govuk-body">The legal basis for processing this data is ‘public task’ – allowing you to access US Notify to send notifications
-      to users of your public service.</p>
-
    <h2 class="heading-medium" id="why-we-need-your-data">Why we need your data</h2>

    <p class="govuk-body">We need your personal data to ensure that only legitimate users of US Notify can use it to send notifications.</p>
@@ -71,20 +60,17 @@
    <p class="govuk-body">We design, build and run our systems to make sure that your data is as safe as possible at any stage, both while it’s
      processed and when it’s stored.</p>

-    <p class="govuk-body">Your personal data will be processed both in the UK and the European Economic Area (EEA). Your data receives the same level of protection in the EEA as it does in the UK through the safeguard of <a class="govuk-link govuk-link--no-visited-state" href="https://ico.org.uk/for-organisations/dp-at-the-end-of-the-transition-period/data-protection-and-the-eu-in-detail/adequacy/">Adequacy Decisions</a>.</p>
+    <!-- <p class="govuk-body">Your personal data will be processed both in the UK and the European Economic Area (EEA). Your data receives the same level of protection in the EEA as it does in the UK through the safeguard of <a class="govuk-link govuk-link--no-visited-state" href="https://ico.org.uk/for-organisations/dp-at-the-end-of-the-transition-period/data-protection-and-the-eu-in-detail/adequacy/">Adequacy Decisions</a>.</p> -->
   
    <h2 class="heading-medium" id="how-we-protect-your-data">How we protect your data and keep it secure</h2>

-    <p class="govuk-body">We are committed to doing all that we can to keep your data secure. To prevent unauthorised access or disclosure we have
-      put in place technical and organisational procedures to secure the data we collect about you – for example, we protect your
-      data using varying levels of encryption. We also make sure that any third parties that we deal with have an obligation to
-      keep all personal data they process on our behalf secure.</p>
+    <p class="govuk-body">We are committed to doing all that we can to keep your data secure. To prevent unauthorized access or disclosure we have put in place technical and organizational procedures to secure the data we collect about you – for example, we protect your
+    data using varying levels of encryption. We also make sure that any third parties that we deal with have an obligation to
+    keep all personal data they process on our behalf secure.</p>

-    <h2 class="heading-medium" id="childrens-privacy-protection">Children’s privacy protection</h2>
+    <!-- <h2 class="heading-medium" id="childrens-privacy-protection">Children’s privacy protection</h2>

-    <p class="govuk-body">We understand the importance of protecting children’s privacy online. Our services are not designed for, or intentionally
-      targeted at, children 13 years of age or younger. It is not our policy to intentionally collect or maintain data about anyone
-      under the age of 13.</p>
+    <p class="govuk-body">We understand the importance of protecting children’s privacy online. Our services are not designed for, or intentionally targeted at, children 13 years of age or younger. It is not our policy to intentionally collect or maintain data about anyone under the age of 13.</p> 

    <h2 class="heading-medium" id="your-rights">What are your rights</h2>

@@ -104,54 +90,23 @@
      <li>ask that the processing of your personal data is restricted in certain circumstances</li>
    </ul>

-    <p class="govuk-body">If you have any of these requests, get in contact with our Data Protection Officer - you can find their contact details below.</p>
+    <p class="govuk-body">If you have any of these requests, get in contact with our Data Protection Officer - you can find their contact details below.</p> -->

    <h2 class="heading-medium" id="changes-to-this-notice">Changes to this notice</h2>

-    <p class="govuk-body">We may modify or amend this privacy notice at our discretion at any time. When we make changes to this notice, we will
-      amend the last modified date at the top of this page. Any modification or amendment to this privacy notice will be applied
-      to you and your data as of that revision date. We encourage you to periodically review this privacy notice to be informed
-      about how we are protecting your data.</p>
+    <p class="govuk-body">We may modify or amend this privacy notice at our discretion at any time. When we make changes to this notice, we will amend the last modified date at the top of this page. Any modification or amendment to this privacy notice will be applied
+    to you and your data as of that revision date. We encourage you to periodically review this privacy notice to be informed
+    about how we are protecting your data.</p>

    <h2 class="heading-medium" id="questions-and-complaints">Questions and complaints</h2>

-    <p class="govuk-body">Contact the GDS Privacy Team if you either:</p>
+    <p class="govuk-body">Contact the <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">TTS Public Benefits Studio</a> if you either:</p>

-    <ul class="list list-bullet">
+   <ul class="list list-bullet">
      <li>have questions about anything in this document</li>
      <li>think that your personal data has been misused or mishandled</li>
    </ul>

-    <p class="govuk-body">
-    GDS Privacy Team<br>
-    <a class="govuk-link govuk-link--no-visited-state" href="mailto:gds-privacy-office@digital.cabinet-office.gov.uk">gds-privacy-office@digital.cabinet-office.gov.uk</a>
-    </p>
-
-    <p class="govuk-body">
-    You can also contact the Cabinet Office Data Protection Officer.
-    </p>
-
-    <p class="govuk-body">
-    Data Protection Officer<br>
-    <a class="govuk-link govuk-link--no-visited-state" href="mailto:DPO@cabinetoffice.gov.uk">DPO@cabinetoffice.gov.uk</a><br>
-    Data Protection Officer<br>
-    Cabinet Office<br>
-    70 Whitehall<br>
-    London SW1A 2AS
-    </p>
-
-    <p class="govuk-body">If you have a complaint, you can also contact the <a class="govuk-link govuk-link--no-visited-state" href="https://ico.org.uk/">Information Commissioner's Office</a> (ICO). The ICO is an independent regulator set up to uphold information rights.</p>
-
-    <p class="govuk-body">
-    Information Commissioner’s Office<br>
-    <a class="govuk-link govuk-link--no-visited-state" href="mailto:icocasework@ico.org.uk">icocasework@ico.org.uk</a><br>
-    0303 123 1113</br>
-    Wycliffe House<br>
-    Water Lane<br>
-    Wilmslow<br>
-    Cheshire SK9 5AF
-    </p>
-

  </div>
 </div>
--- a/app/templates/views/security.html
+++ b/app/templates/views/security.html
@@ -22,15 +22,7 @@
    <li>when it’s stored on the service</li>
  </ul>
  <p class="govuk-body">Any recipient data you upload is only held for 7 days.</p>
-  <p class="govuk-body">If you <a class="govuk-link govuk-link--no-visited-state" href="/features/email#send-files">send a file by email</a>, the file will be available for the recipient to download for 18 months.</p>
-  <!-- <p class="govuk-body">The Cabinet Office acts as data processor for Notify. Your organisation is the data controller.</p> -->
-  <!-- <h3 class="heading-small">Data Protection Act</h3>
-  <p class="govuk-body">Notify complies with data protection law. To make sure it stays compliant, there are regular legal reviews of the service’s:</p>
-  <ul class="list list-bullet">
-    <li>privacy policy</li>
-    <li>terms of use</li>
-    <li>approach to data sharing</li>
-  </ul> -->
+  <!-- <p class="govuk-body">If you <a class="govuk-link govuk-link--no-visited-state" href="/features/email#send-files">send a file by email</a>, the file will be available for the recipient to download for 18 months.</p> -->

  <h2 class="heading-medium" id="technical-security">Technical security</h2>
  <!-- <p class="govuk-body">Other technical security controls on Notify include:</p>
--- a/app/templates/views/terms-of-use.html
+++ b/app/templates/views/terms-of-use.html
@@ -20,18 +20,16 @@
    <li>tell us immediately if you have any security breaches</li>
    <li>keep your API keys secure</li>
    <li>get the right levels of consent (to send messages and to use data)</li>
-    <li>not send unsolicited messages, only ones related to a transaction or something the user has subscribed to be updated about (<a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">check the Service Manual</a> if you’re not sure)</li>
-    <li>
-      send messages that meet the US NotifyService Manual standards for <a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">writing text messages and emails</a></li>
+    <li>not send unsolicited messages, only ones related to official government services and information</li>
    <li>check that the data you add to Notify is accurate and complies with data protection legislation</li>
  </ul>
  <p class="govuk-body">If you do not keep to these terms, we might have to stop sending your messages.</p>

-  <p class="govuk-body">Notify will:</p>
+  <p class="govuk-body"> US Notify will:</p>
  <ul class="list list-bullet">
    <li>send all the messages you pass to us, as long as they meet our guidelines</li>
    <li>
-      show how Notify is performing (through our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.performance') }}">performance</a> and <a class="govuk-link govuk-link--no-visited-state" href="https://status.notifications.service.gov.uk/">status</a> pages)
+      show how Notify is performing (through our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.performance') }}">performance</a> <!--and <a class="govuk-link govuk-link--no-visited-state" href="https://status.notifications.service.gov.uk/">status</a>-->page)
    </li>
    <li>keep your data <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.security') }}">secure</a></li>
    <li>give you one month’s notice by email if we change our terms of use or delivery providers</li>
--- a/tests/app/main/views/test_api_integration.py
+++ b/tests/app/main/views/test_api_integration.py
@@ -1,10 +1,12 @@
 import uuid
 from collections import OrderedDict
+from datetime import date
 from unittest.mock import call

 import pytest
 from flask import url_for

+from app.formatters import format_datetime_short
 from tests import sample_uuid, validate_route_permission
 from tests.conftest import (
    SERVICE_ONE_ID,
@@ -195,7 +197,7 @@ def test_should_show_api_keys_page(
    revoke_link = page.select_one('main tr a.govuk-link.govuk-link--destructive')

    assert rows[0] == 'API keys Action'
-    assert rows[1] == 'another key name Revoked 30 December at 7:00pm'
+    assert rows[1] == f"another key name Revoked {format_datetime_short(date.fromtimestamp(0).isoformat())}"
    assert rows[2] == 'some key name Revoke some key name'

    assert normalize_spaces(revoke_link.text) == 'Revoke some key name'
--- a/tests/app/main/views/test_index.py
+++ b/tests/app/main/views/test_index.py
@@ -183,7 +183,8 @@ def test_message_status_page_contains_message_status_ids(client_request):
    # so this test ensures we don't accidentally remove them
    page = client_request.get('main.message_status')

-    assert page.find(id='email-statuses')
+    # email-statuses is commented out in view
+    # assert page.find(id='email-statuses')
    assert page.find(id='text-message-statuses')


--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -253,7 +253,7 @@ def test_should_show_job_with_sending_limit_exceeded_status(
        'No messages to show yet…'
    )),
    # Created a while ago, started just within the last 24h
-    (datetime(2020, 1, 1, 12, 0, 0), datetime(2020, 1, 9, 6, 0, 1), (
+    (datetime(2020, 1, 1, 0, 0, 0), datetime(2020, 1, 9, 6, 0, 1), (
        'No messages to show yet…'
    )),
    # Created a while ago, started exactly 24h ago