Show letters in basic view

We were taking letters away from basic view because there’s no one-off
sending of letters.

But now that basic view isn’t an opt-in thing but something we’re
rolling out to all users who only have the ‘send’ permission it feels
like too drastic a change to remove letters.

app/main/views/templates.py

@@ -111,10 +111,7 @@ def start_tour(service_id, template_id):
 def choose_template(service_id, template_type='all'):
     templates = service_api_client.get_service_templates(service_id)['data']
 
-    letters_available = (
+    letters_available = current_service.has_permission('letter')
-        current_service.has_permission('letter') and
-        current_user.has_permissions('view_activity')
-    )
 
     available_template_types = list(filter(None, (
         'email',

tests/app/main/views/test_templates.py

@@ -74,19 +74,21 @@ from tests.conftest import single_letter_contact_block
             active_caseworking_user,
             'Templates',
             {},
-            ['Text message', 'Email'],
+            ['Text message', 'Email', 'Letter'],
             [
                 'sms_template_one',
                 'sms_template_two',
                 'email_template_one',
                 'email_template_two',
+                'letter_template_one',
+                'letter_template_two',
             ],
         ),
         (
             active_caseworking_user,
             'Templates',
             {'template_type': 'email'},
-            ['All', 'Text message'],
+            ['All', 'Text message', 'Letter'],
             ['email_template_one', 'email_template_two'],
         ),
     ]