diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 81c15790a..7f47b081a 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -18,7 +18,8 @@ from app import ( billing_api_client, job_api_client, service_api_client, - template_statistics_client + template_statistics_client, + inbound_number_client, ) from app.statistics_utils import get_formatted_percentage, add_rate_to_job from app.utils import ( @@ -175,11 +176,17 @@ def get_inbox_partials(service_id): }: messages_to_show.append(message) + if not inbound_messages: + inbound_number = inbound_number_client.get_inbound_sms_number_for_service(service_id)['data']['number'] + else: + inbound_number = None + return {'messages': render_template( 'views/dashboard/_inbox_messages.html', messages=messages_to_show, count_of_messages=len(inbound_messages), count_of_users=len(messages_to_show), + inbound_number=inbound_number, )} diff --git a/app/templates/views/dashboard/_inbox_messages.html b/app/templates/views/dashboard/_inbox_messages.html index 95af9ffab..b0ca019dc 100644 --- a/app/templates/views/dashboard/_inbox_messages.html +++ b/app/templates/views/dashboard/_inbox_messages.html @@ -6,7 +6,7 @@ messages, caption="Inbox", caption_visible=False, - empty_message='When users text your service’s phone number ({}) you’ll see the messages here'.format(current_service.sms_sender), + empty_message='When users text your service’s phone number ({}) you’ll see the messages here'.format(inbound_number), field_headings=[ 'From', 'First two lines of message' diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 4a0074bd2..a9752e569 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -176,6 +176,7 @@ def test_empty_inbox( mock_get_template_statistics, mock_get_usage, mock_get_inbound_sms_with_no_messages, + mock_get_inbound_number_for_service, ): service_one['permissions'] = ['inbound_sms'] @@ -185,7 +186,7 @@ def test_empty_inbox( assert response.status_code == 200 assert normalize_spaces(page.select('tbody tr')) == ( - 'When users text your service’s phone number (GOVUK) you’ll see the messages here' + 'When users text your service’s phone number (0781239871) you’ll see the messages here' ) @@ -210,6 +211,7 @@ def test_anyone_can_see_inbox( service_one, mocker, mock_get_inbound_sms_with_no_messages, + mock_get_inbound_number_for_service, ): service_one['permissions'] = ['inbound_sms']