Merge branch 'hotfix/v1.3.1' into dev

Author: Parth Shah

src/actions/loadUser.js

@@ -66,12 +66,13 @@ export function loadUserSuccess(dispatch, token) {
             firstName: currentUser.firstName,
             lastName: currentUser.lastName,
             email: currentUser.email,
-            createdAt: currentUser.createdAt
+            createdAt: currentUser.createdAt,
+            avatar: currentUser.photoURL
           }
         }
       }]
-      if (window.analytics) {
-        const anonymousId = window.analtyics.user().anonymousId()
+      if (window.analytics && window.analytics.user()) {
+        const anonymousId = window.analytics.user().anonymousId()
         if (anonymousId) {
           analyticsEvents.push({
             eventType: EventTypes.alias,

src/components/Layout/Layout.jsx

@@ -25,7 +25,7 @@ const Layout = (props) => {
   if (isLoadingUser) {
     return (<div />)
   } else if (MAINTENANCE_MODE) {
-    return (<Maintenance />)
+    return <Maintenance />
   } else {
     return (
       <div>