Merge pull request #1319 from benetech/feature/#1206

#1206 - integrate intercom custom attributes
benetech · Jul 22, 2020 · 45a6c8a · 45a6c8a
2 parents 02f377c + 65b57fa
commit 45a6c8a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/components/index.js b/src/components/index.js
@@ -467,6 +467,13 @@ class App extends Component {
         const {
             modal, problemList, problemStore, userProfile,
         } = this.props;
+        const { email, name } = userProfile;
+
+        const intercomAttributes = {
+            user_id: email,
+            email,
+            name,
+        };
         return (
             <React.Fragment>
                 <Helmet
@@ -561,7 +568,7 @@ class App extends Component {
                             <Route render={p => <NotFound {...p} />} />
                         </Switch>
                     </div>
-                    {['teacher', 'other'].includes(userProfile.info.userType) && <Intercom appID={process.env.INTERCOM_APP_ID} />}
+                    {['teacher', 'other'].includes(userProfile.info.userType) && <Intercom {...intercomAttributes} appID={process.env.INTERCOM_APP_ID} />}
                     <footer id="footer">
                         <h2 className="sROnly">
                             {' '}

diff --git a/src/redux/userProfile/sagas.js b/src/redux/userProfile/sagas.js
@@ -243,22 +243,10 @@ function* setUserProfileSaga() {
         });
         const {
             email,
-            name,
-            userType,
         } = payload;
         ReactGA.set({
             email,
         });
-        if (!['teacher', 'other'].includes(userType)) {
-            return;
-        }
-        if (yield call(waitForIntercomToBoot, 5)) {
-            IntercomAPI('update', {
-                user_id: email,
-                email,
-                name,
-            });
-        }
     });
 }