summaryrefslogtreecommitdiffstats
path: root/web/react/components/activity_log_modal.jsx
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-01-27 10:07:26 -0500
committer=Corey Hulen <corey@hulen.com>2016-01-27 10:07:26 -0500
commit41013daa0b86a450ade9cdac911ccdb7722eb473 (patch)
tree7255d885adfa1bfb0d7955bca83b994fc907d1a4 /web/react/components/activity_log_modal.jsx
parentb7606da40f5403896dfbf930837530b4b22abacd (diff)
downloadchat-41013daa0b86a450ade9cdac911ccdb7722eb473.tar.gz
chat-41013daa0b86a450ade9cdac911ccdb7722eb473.tar.bz2
chat-41013daa0b86a450ade9cdac911ccdb7722eb473.zip
Fixing small issue with displaying activity log
Diffstat (limited to 'web/react/components/activity_log_modal.jsx')
-rw-r--r--web/react/components/activity_log_modal.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index eec4d8f8d..2c42f5971 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/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' ||