Merge remote-tracking branch 'upstream/master' into PLT-637

Conflicts:
	web/react/utils/constants.jsx

1 files changed, 3 insertions, 3 deletions

diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index 98f862e69..f74c29d27 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -28,7 +28,7 @@ export default class SignupUserComplete extends React.Component {
     handleSubmit(e) {
         e.preventDefault();
 
-        const providedEmail = React.findDOMNode(this.refs.email).value.trim();
+        const providedEmail = ReactDOM.findDOMNode(this.refs.email).value.trim();
         if (!providedEmail) {
             this.setState({nameError: '', emailError: 'This field is required', passwordError: ''});
             return;
@@ -39,7 +39,7 @@ export default class SignupUserComplete extends React.Component {
             return;
         }
 
-        const providedUsername = React.findDOMNode(this.refs.name).value.trim().toLowerCase();
+        const providedUsername = ReactDOM.findDOMNode(this.refs.name).value.trim().toLowerCase();
         if (!providedUsername) {
             this.setState({nameError: 'This field is required', emailError: '', passwordError: '', serverError: ''});
             return;
@@ -59,7 +59,7 @@ export default class SignupUserComplete extends React.Component {
             return;
         }
 
-        const providedPassword = React.findDOMNode(this.refs.password).value.trim();
+        const providedPassword = ReactDOM.findDOMNode(this.refs.password).value.trim();
         if (!providedPassword || providedPassword.length < 5) {
             this.setState({nameError: '', emailError: '', passwordError: 'Please enter at least 5 characters', serverError: ''});
             return;