diff options
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/email_verify.jsx | 12 | ||||
-rw-r--r-- | web/react/pages/verify.jsx | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/web/react/components/email_verify.jsx b/web/react/components/email_verify.jsx index 4d4d489bb..8d3f15525 100644 --- a/web/react/components/email_verify.jsx +++ b/web/react/components/email_verify.jsx @@ -10,14 +10,14 @@ export default class EmailVerify extends React.Component { this.state = {}; } handleResend() { - const newAddress = window.location.href.replace('?resend_success=true', '').replace('&resend_success=true', ''); + const newAddress = window.location.href.replace('&resend_success=true', ''); window.location.href = newAddress + '&resend=true'; } render() { var title = ''; var body = ''; var resend = ''; - let resendConfirm = ''; + var resendConfirm = ''; if (this.props.isVerified === 'true') { title = global.window.config.SiteName + ' Email Verified'; body = <p>Your email has been verified! Click <a href={this.props.teamURL + '?email=' + this.props.userEmail}>here</a> to log in.</p>; @@ -32,7 +32,7 @@ export default class EmailVerify extends React.Component { Resend Email </button> ); - if (window.location.href.indexOf('resend_success=true') > -1) { + if (this.props.resendSuccess) { resendConfirm = <div><br /><p className='alert alert-success'><i className='fa fa-check'></i>{' Verification email sent.'}</p></div>; } } @@ -57,10 +57,12 @@ export default class EmailVerify extends React.Component { EmailVerify.defaultProps = { isVerified: 'false', teamURL: '', - userEmail: '' + userEmail: '', + resendSuccess: 'false' }; EmailVerify.propTypes = { isVerified: React.PropTypes.string, teamURL: React.PropTypes.string, - userEmail: React.PropTypes.string + userEmail: React.PropTypes.string, + resendSuccess: React.PropTypes.string }; diff --git a/web/react/pages/verify.jsx b/web/react/pages/verify.jsx index e48471bbd..16a9846e5 100644 --- a/web/react/pages/verify.jsx +++ b/web/react/pages/verify.jsx @@ -9,6 +9,7 @@ global.window.setupVerifyPage = function setupVerifyPage(props) { isVerified={props.IsVerified} teamURL={props.TeamURL} userEmail={props.UserEmail} + resendSuccess={props.ResendSuccess} />, document.getElementById('verify') ); |