Fixing small issue with displaying activity log

web/react/components/activity_log_modal.jsx

@@ -100,10 +100,10 @@ export default class ActivityLogModal extends React.Component {
 
             if (currentSession.props.platform === 'Windows') {
                 devicePicture = 'fa fa-windows';
-            } else if (currentSession.device_id.indexOf('apple:') === 0) {
+            } else if (currentSession.device_id && currentSession.device_id.indexOf('apple:') === 0) {
                 devicePicture = 'fa fa-apple';
                 devicePlatform = 'iPhone Native App';
-            } else if (currentSession.device_id.indexOf('android:') === 0) {
+            } else if (currentSession.device_id && currentSession.device_id.indexOf('android:') === 0) {
                 devicePlatform = 'Android Native App';
                 devicePicture = 'fa fa-android';
             } else if (currentSession.props.platform === 'Macintosh' ||

web/react/components/error_bar.jsx

@@ -82,6 +82,7 @@ export default class ErrorBar extends React.Component {
             e.preventDefault();
         }
 
+        ErrorStore.clearLastError();
         this.setState({message: null});
     }