diff --git a/app/templates/views/dashboard/_usage.html b/app/templates/views/dashboard/_usage.html index 57b7a35ae3..e7f9e5f071 100644 --- a/app/templates/views/dashboard/_usage.html +++ b/app/templates/views/dashboard/_usage.html @@ -3,7 +3,7 @@
- +
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index 3838da9bd9..280aa8b675 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -30,10 +30,10 @@

{{ ajax_block(partials, updates_url, 'template-statistics') }} -

Usage

+

Usage

Daily

Across all services

-
Daily
+
@@ -54,7 +54,7 @@

Daily

Daily
{% if current_user.has_permissions('manage_service') %} -

2023

+

2023

{{ ajax_block(partials, updates_url, 'usage') }} {{ show_more( url_for(".usage", service_id=current_service['id']), diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 1e2efd6709..ae997077b8 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -471,7 +471,7 @@ def test_should_show_recent_templates_on_dashboard( headers = [ header.text.strip() for header in page.find_all("h2") + page.find_all("h1") ] - assert "In the last seven days" in headers + assert "Messages sent" in headers table_rows = page.find_all("tbody")[0].find_all("tr") @@ -1522,6 +1522,8 @@ def test_service_dashboard_shows_usage( page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID) assert normalize_spaces(page.select_one("[data-key=usage]").text) == ( + "Daily Usage Remaining " + "40,000 " "$29.85 " "spent on text messages" # Disabled for pilot @@ -1556,4 +1558,4 @@ def test_service_dashboard_shows_free_allowance( usage_text = normalize_spaces(page.select_one("[data-key=usage]").text) assert "spent on text messages" not in usage_text - assert "249,000 free text messages left" in usage_text + assert "Daily Usage Remaining -209,000 249,000" in usage_text