Guard calls to componentDidMount with a check for existence.

Fix tag on username step.

src/components/join-flow/birthdate-step.jsx

@@ -55,8 +55,10 @@ class BirthDateStep extends React.Component {
         ]);
     }
     componentDidMount () {
+        if (this.props.sendAnalytics) {
             this.props.sendAnalytics('join-birthdate');
         }
+    }
 
     validateSelect (selection) {
         if (selection === 'null') {

src/components/join-flow/country-step.jsx

@@ -23,7 +23,9 @@ class CountryStep extends React.Component {
         this.countryOptions = [];
     }
     componentDidMount () {
+        if (this.props.sendAnalytics) {
             this.props.sendAnalytics('join-country');
+        }
         this.setCountryOptions();
     }
     setCountryOptions () {

src/components/join-flow/email-step.jsx

@@ -35,7 +35,9 @@ class EmailStep extends React.Component {
         this.emailRemoteCache = {};
     }
     componentDidMount () {
+        if (this.props.sendAnalytics) {
             this.props.sendAnalytics('join-email');
+        }
         // automatically start with focus on username field
         if (this.emailInput) this.emailInput.focus();
 

src/components/join-flow/gender-step.jsx

@@ -62,8 +62,10 @@ class GenderStep extends React.Component {
         ]);
     }
     componentDidMount () {
+        if (this.props.sendAnalytics) {
             this.props.sendAnalytics('join-gender');
         }
+    }
     handleSetCustomRef (customInputRef) {
         this.customInput = customInputRef;
     }

src/components/join-flow/registration-error-step.jsx

@@ -16,8 +16,10 @@ class RegistrationErrorStep extends React.Component {
         ]);
     }
     componentDidMount () {
+        if (this.props.sendAnalytics) {
             this.props.sendAnalytics('join-error');
         }
+    }
     handleSubmit (e) {
         // JoinFlowStep includes a <form> that handles a submit action.
         // But here, we're not really submitting, so we need to prevent

src/components/join-flow/username-step.jsx

@@ -40,7 +40,9 @@ class UsernameStep extends React.Component {
         // Send info to analytics when we aren't on the standalone page.
         // If we are on the standalone join page, the page load will take care of this.
         if (!window.location.pathname.includes('/join')) {
-            this.props.sendAnalytics('join-email');
+            if (this.props.sendAnalytics) {
+                this.props.sendAnalytics('join-username-modal');
+            }
         }
 
         // automatically start with focus on username field

test/unit/components/username-step.test.jsx

@@ -80,7 +80,7 @@ describe('UsernameStep test', () => {
             <UsernameStep
                 sendAnalytics={sendAnalyticsFn}
             />);
-        expect(sendAnalyticsFn).toHaveBeenCalledWith('join-email');
+        expect(sendAnalyticsFn).toHaveBeenCalledWith('join-username-modal');
     });
 
     test('handleValidSubmit passes formData to next step', () => {