Merge branch 'riri' into 'master'

apdet issue

See merge request !220

src/container/ForgotPassword.js

@@ -41,7 +41,7 @@ class ForgotPassword extends Component {
       if (this.state.email.trim() == "") {
           this.setState({ errorEmail: true, msgEmail: 'Email Cannot be Empty.' })
       } else if (!isEmail) {
-          this.setState({ errorEmail: true, msgEmail: 'Email Format is Not Correct.' })
+          this.setState({ errorEmail: true, msgEmail: 'Please enter a valid email address.' })
       } else {
           this.verification()
       }

src/container/Login.js

@@ -77,7 +77,7 @@ class Login extends Component {
     if (this.state.email.trim() == "") {
       this.setState({ errorEmail: true, msgEmail: 'Email Cannot be Empty.' })
     } else if (!isEmail) {
-      this.setState({ errorEmail: true, msgEmail: 'Email Format is Not Correct.' })
+      this.setState({ errorEmail: true, msgEmail: 'Please enter a valid email address.' })
     } else if (this.state.password.trim() == "") {
       this.setState({ errorPassword: true, msgPassword: 'Password Cannot be Empty.' })
     } else {

src/container/ResetPassword.js

@@ -70,15 +70,15 @@ class ResetPassword extends Component {
     if (this.state.password.trim() == "") {
       this.setState({ errorPassword: true, msgPassword: 'New Password Cannot be Empty.' })
     } else if (this.state.password.length < 8) {
-      this.setState({ errorPassword: true, msgPassword: 'New Password Minimum 8 Characters.' })
+      this.setState({ errorPassword: true, msgPassword: 'Invalid password. Minimum length : 8.' })
     } else if (this.isEmail(this.state.password)) {
-      this.setState({ errorPassword: true, msgPassword: 'New Password Format Should Not Use Email.' })
+      this.setState({ errorPassword: true, msgPassword: 'Invalid password. Should not be same as Email Address.' })
     } else if (!this.isRegex(this.state.password)) {
-      this.setState({ errorPassword: true, msgPassword: 'New Password Must be a Combination of Characters, Letters and Numbers.' })
+      this.setState({ errorPassword: true, msgPassword: 'Invalid password. Must using combination of characters, letters and numbers.' })
     } else if (this.state.confirmPassword.trim() == "") {
       this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password Confirmation Cannot be Empty.' })
     } else if (this.state.password !== this.state.confirmPassword) {
-      this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password Does Not Match.' })
+      this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'The password and password confirmation do not match.' })
     } else {
       this.confirmPassword()
     }

src/container/SetPassword.js

@@ -70,15 +70,15 @@ class SetPassword extends Component {
     if (this.state.password.trim() == "") {
       this.setState({ errorPassword: true, msgPassword: 'New Password Cannot be Empty.' })
     } else if (this.state.password.length < 8) {
-      this.setState({ errorPassword: true, msgPassword: 'New Password Minimum 8 Characters.' })
+      this.setState({ errorPassword: true, msgPassword: 'Invalid password. Minimum length : 8.' })
     } else if (this.isEmail(this.state.password)) {
-      this.setState({ errorPassword: true, msgPassword: 'New Password Format Should Not Use Email.' })
+      this.setState({ errorPassword: true, msgPassword: 'Invalid password. Should not be same as Email Address.' })
     } else if (!this.isRegex(this.state.password)) {
-      this.setState({ errorPassword: true, msgPassword: 'New Password Must be a Combination of Characters, Letters and Numbers.' })
+      this.setState({ errorPassword: true, msgPassword: 'Invalid password. Must using combination of characters, letters and numbers.' })
     } else if (this.state.confirmPassword.trim() == "") {
       this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password Confirmation Cannot be Empty.' })
     } else if (this.state.password !== this.state.confirmPassword) {
-      this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password Does Not Match.' })
+      this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'The password and password confirmation do not match.' })
     } else {
       this.confirmPassword()
     }