diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index 314f92c63..df5a21918 100644 --- 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", + # }, ] diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html index 649e3fafd..cc49c63da 100644 --- 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 @@

Notify makes it easy to:

-

You can also integrate with our API to send text messages automatically.

+

Show people who your texts are from

When you send a text message with Notify, the sender name tells people who it’s from.

-

See how to change the text message sender.

+ +

To change the text message sender from the default of ‘US Notify’:

+ +
    +
  1. Go to the Text message settings section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.
    2. +
  2. Select Manage on the Text message senders row.
    3. +
  3. Select Change or Add text message sender.
    4. +

Pricing

Each service you add has an annual allowance of free text messages.

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html index 0fd0804e3..db442faf9 100644 --- a/app/templates/views/guidance/branding-and-customisation.html +++ b/app/templates/views/guidance/branding-and-customisation.html @@ -45,7 +45,7 @@

The text message sender tells your users who the message is from.

-

To change the text message sender from the default of ‘GOVUK’:

+

To change the text message sender from the default of ‘US Notify’:

  1. Go to the Text message settings section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.
    2. diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index 08a6e2195..012eb6896 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -12,7 +12,7 @@

    Notify’s real-time dashboard lets you check the status of any message, to see when it was delivered.

    For security, 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.

    This page describes the statuses you’ll see when you’re signed in to Notify.

    -

    If you’re using the Notify API, read our documentation for a list of API statuses.

    +

    Text messages

    diff --git a/tests/app/main/views/test_api_integration.py b/tests/app/main/views/test_api_integration.py index d52eea3cf..3f3ef5ef1 100644 --- 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 1 January at 1:00am' + 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' diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py index 741f7cc06..934736b1c 100644 --- a/tests/app/main/views/test_index.py +++ b/tests/app/main/views/test_index.py @@ -184,7 +184,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') diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py index 0420bd38f..8899de1e9 100644 --- a/tests/app/main/views/test_jobs.py +++ b/tests/app/main/views/test_jobs.py @@ -259,7 +259,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, 0, 0, 0), datetime(2020, 1, 9, 1, 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