diff options
author | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
commit | 7f266c19511171f509ae8a60170de10c8d10b41e (patch) | |
tree | 04cd68ac4722313abec3ea47cc7cda229e463b1d /webapp/components/activity_log_modal.jsx | |
parent | bfae88e60c7a623afae82e06ce1421ca778c06e7 (diff) | |
parent | 8568afe5b4fb4d26b14fbc0d21f088eaa490b314 (diff) | |
download | chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.gz chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.bz2 chat-7f266c19511171f509ae8a60170de10c8d10b41e.zip |
Merge branch 'release-3.7' into master.
Diffstat (limited to 'webapp/components/activity_log_modal.jsx')
-rw-r--r-- | webapp/components/activity_log_modal.jsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webapp/components/activity_log_modal.jsx b/webapp/components/activity_log_modal.jsx index cd369f742..05c09ab88 100644 --- a/webapp/components/activity_log_modal.jsx +++ b/webapp/components/activity_log_modal.jsx @@ -102,7 +102,7 @@ export default class ActivityLogModal extends React.Component { if (currentSession.props.platform === 'Windows') { devicePicture = 'fa fa-windows'; - } else if (currentSession.device_id && currentSession.device_id.indexOf('apple:') === 0) { + } else if (currentSession.device_id && currentSession.device_id.indexOf('apple') === 0) { devicePicture = 'fa fa-apple'; devicePlatform = ( <FormattedMessage @@ -110,7 +110,7 @@ export default class ActivityLogModal extends React.Component { defaultMessage='iPhone Native App' /> ); - } else if (currentSession.device_id && currentSession.device_id.indexOf('android:') === 0) { + } else if (currentSession.device_id && currentSession.device_id.indexOf('android') === 0) { devicePlatform = ( <FormattedMessage id='activity_log_modal.androidNativeApp' @@ -275,6 +275,7 @@ export default class ActivityLogModal extends React.Component { return ( <Modal + dialogClassName='modal--scroll' show={this.state.show} onHide={this.onHide} onExited={this.props.onHide} |