From 482745323264a125ba7839175b80c1174b03a832 Mon Sep 17 00:00:00 2001
From: "Khoa, Le Ngoc" <khoaln6@gmail.com>
Date: Tue, 2 Feb 2016 16:04:25 +0700
Subject: Added help text indicating valid email required when user sign up
 from link.

---
 web/react/components/signup_user_complete.jsx | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'web/react/components/signup_user_complete.jsx')

diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index 47ec58e98..bea10f0a4 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -150,9 +150,18 @@ class SignupUserComplete extends React.Component {
 
         // set up error labels
         var emailError = null;
+        var emailHelpText = (
+            <span className='help-block'>
+                <FormattedMessage
+                    id='signup_user_completed.emailHelp'
+                    defaultMessage="Valid email required for sign-up"
+                    />
+            </span>
+        );
         var emailDivStyle = 'form-group';
         if (this.state.emailError) {
             emailError = <label className='control-label'>{this.state.emailError}</label>;
+            emailHelpText = '';
             emailDivStyle += ' has-error';
         }
 
@@ -232,6 +241,7 @@ class SignupUserComplete extends React.Component {
                         spellCheck='false'
                     />
                     {emailError}
+                    {emailHelpText}
                 </div>
             </div>
         );
-- 
cgit v1.2.3-1-g7c22


From 4d70e1246bd12ee167525d9f92d673b617d4039b Mon Sep 17 00:00:00 2001
From: "Khoa, Le Ngoc" <khoaln6@gmail.com>
Date: Tue, 2 Feb 2016 16:29:14 +0700
Subject: Fixed Eslint validation.

---
 web/react/components/signup_user_complete.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/react/components/signup_user_complete.jsx')

diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index bea10f0a4..98a832542 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -154,8 +154,8 @@ class SignupUserComplete extends React.Component {
             <span className='help-block'>
                 <FormattedMessage
                     id='signup_user_completed.emailHelp'
-                    defaultMessage="Valid email required for sign-up"
-                    />
+                    defaultMessage='Valid email required for sign-up'
+                />
             </span>
         );
         var emailDivStyle = 'form-group';
-- 
cgit v1.2.3-1-g7c22

