From c551fd43e0eb691bd8be9ef32798f12a09f12bcd Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Sat, 23 Apr 2016 16:11:41 +0100
Subject: [PATCH] Reword 2FA page to match email confirmation

---
 app/assets/stylesheets/components/textbox.scss |  2 +-
 app/templates/views/two-factor.html            | 12 ++++++------
 tests/app/main/views/test_two_factor.py        |  2 +-
 tests/app/main/views/test_verify.py            |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/components/textbox.scss b/app/assets/stylesheets/components/textbox.scss
index 1e5c769b1..ed0964103 100644
--- a/app/assets/stylesheets/components/textbox.scss
+++ b/app/assets/stylesheets/components/textbox.scss
@@ -83,7 +83,7 @@
 }
 
 .textbox-help-link {
-  margin: 5px 0 0 0;
+  margin: 10px 0 0 0;
 }
 
 .textbox-right-aligned {
diff --git a/app/templates/views/two-factor.html b/app/templates/views/two-factor.html
index f834b93e4..3be5e4ac8 100644
--- a/app/templates/views/two-factor.html
+++ b/app/templates/views/two-factor.html
@@ -11,20 +11,20 @@
 
 <div class="grid-row">
   <div class="column-two-thirds">
-    <h1 class="heading-large">Text verification</h1>
+    <h1 class="heading-large">Check your phone</h1>
 
-    <p>We've sent you a text message with a verification code.</p>
+    <p>We’ve sent you a text message with a verification code.</p>
 
     <form autocomplete="off" method="post">
       {{ textbox(
         form.sms_code,
         width='5em',
-        autofocus=True,
-        help_link=url_for('.verification_code_not_received'),
-        help_link_text='I haven’t received a text message'
+        autofocus=True
       ) }}
       {{ page_footer(
-        "Continue"
+        "Continue",
+        secondary_link=url_for('.verification_code_not_received'),
+        secondary_link_text='Not received a text message?'
       ) }}
     </form>
   </div>
diff --git a/tests/app/main/views/test_two_factor.py b/tests/app/main/views/test_two_factor.py
index fb7cf7fb7..d470963c1 100644
--- a/tests/app/main/views/test_two_factor.py
+++ b/tests/app/main/views/test_two_factor.py
@@ -15,7 +15,7 @@ def test_should_render_two_factor_page(app_,
                     'email': api_user_active.email_address}
         response = client.get(url_for('main.two_factor'))
         assert response.status_code == 200
-        assert '''We've sent you a text message with a verification code.''' in response.get_data(as_text=True)
+        assert '''We’ve sent you a text message with a verification code.''' in response.get_data(as_text=True)
 
 
 def test_should_login_user_and_redirect_to_service_dashboard(app_,
diff --git a/tests/app/main/views/test_verify.py b/tests/app/main/views/test_verify.py
index cf9a1a187..778df90dd 100644
--- a/tests/app/main/views/test_verify.py
+++ b/tests/app/main/views/test_verify.py
@@ -16,9 +16,9 @@ def test_should_return_verify_template(app_,
             assert response.status_code == 200
 
             page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-            assert page.h1.text == 'Text verification'
+            assert page.h1.text == 'Check your phone'
             message = page.find_all('p')[1].text
-            assert message == "We've sent you a text message with a verification code."
+            assert message == "We’ve sent you a text message with a verification code."
 
 
 def test_should_redirect_to_add_service_when_sms_code_is_correct(app_,