diff --git a/app/__init__.py b/app/__init__.py index cffa0297f..69ad58a25 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -365,7 +365,7 @@ def format_notification_status(status, template_type): 'failed': '', 'technical-failure': 'Technical failure', 'temporary-failure': '', - 'permanent-failure': 'Cancelled', + 'permanent-failure': '', 'delivered': '', 'received': '', 'accepted': '', diff --git a/app/templates/components/table.html b/app/templates/components/table.html index c5708512c..80e118059 100644 --- a/app/templates/components/table.html +++ b/app/templates/components/table.html @@ -144,7 +144,7 @@ {% macro notification_status_field(notification) %} - {% set displayed_on_single_line = notification.status in ['created', 'pending', 'pending-virus-check', 'sending', 'sent', 'delivered', 'returned-letter', 'accepted', 'received'] %} + {% set displayed_on_single_line = notification.status in ['created', 'pending', 'pending-virus-check', 'sending', 'sent', 'delivered', 'returned-letter', 'accepted', 'received', 'permanent-failure'] %} {% if not notification %} {% call field(align='right') %}{% endcall %} diff --git a/tests/app/main/views/test_activity.py b/tests/app/main/views/test_activity.py index bb7dd7546..54d8989fe 100644 --- a/tests/app/main/views/test_activity.py +++ b/tests/app/main/views/test_activity.py @@ -608,8 +608,8 @@ def test_big_numbers_and_search_dont_show_for_letters( ('letter', 'delivered', '27 September at 5:30pm', True), ('letter', 'received', '27 September at 5:30pm', True), ('letter', 'accepted', '27 September at 5:30pm', True), + ('letter', 'permanent-failure', '27 September at 5:31pm', True), ('letter', 'virus-scan-failed', 'Virus detected 27 September at 5:30pm', False), - ('letter', 'permanent-failure', 'Cancelled 27 September at 5:31pm', False), ('letter', 'validation-failed', 'Validation failed 27 September at 5:30pm', False), ('letter', 'technical-failure', 'Technical failure 27 September at 5:30pm', False), ]