summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-01-13 13:47:10 +0000
committerenahum <nahumhbl@gmail.com>2017-01-13 10:47:10 -0300
commit6c814c72ec8fc5ec5f17c657d2af8fafa67b1e33 (patch)
treec32177e218ef0fc62ee771e87cd10bbe12d62050 /webapp/components
parent0196137decd24957cb11b3d3875eac54359cada5 (diff)
downloadchat-6c814c72ec8fc5ec5f17c657d2af8fafa67b1e33.tar.gz
chat-6c814c72ec8fc5ec5f17c657d2af8fafa67b1e33.tar.bz2
chat-6c814c72ec8fc5ec5f17c657d2af8fafa67b1e33.zip
PLT-4317: Fix Desktop App platform in sessions list. (#5048)
Incidentally fixes displaying the Linux icon next to sessions on Linux at the same time.
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/activity_log_modal.jsx11
1 files changed, 11 insertions, 0 deletions
diff --git a/webapp/components/activity_log_modal.jsx b/webapp/components/activity_log_modal.jsx
index b907668f0..0789d8efc 100644
--- a/webapp/components/activity_log_modal.jsx
+++ b/webapp/components/activity_log_modal.jsx
@@ -134,6 +134,17 @@ export default class ActivityLogModal extends React.Component {
} else {
devicePicture = 'fa fa-linux';
}
+ } else if (currentSession.props.os.indexOf('Linux') !== -1) {
+ devicePicture = 'fa fa-linux';
+ }
+
+ if (currentSession.props.browser.indexOf('Desktop App') !== -1) {
+ devicePlatform = (
+ <FormattedMessage
+ id='activity_log_modal.desktop'
+ defaultMessage='Native Desktop App'
+ />
+ );
}
let moreInfo;