2 files changed, 30 insertions, 9 deletions

diff --git a/web/react/components/admin_console/analytics.jsx b/web/react/components/admin_console/analytics.jsx
index 0a159d2e3..ec9ad4da0 100644
--- a/web/react/components/admin_console/analytics.jsx
+++ b/web/react/components/admin_console/analytics.jsx
@@ -1,7 +1,6 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import * as Utils from '../../utils/utils.jsx';
 import Constants from '../../utils/constants.jsx';
 import LineChart from './line_chart.jsx';
 import DoughnutChart from './doughnut_chart.jsx';
@@ -10,7 +9,7 @@ import StatisticCount from './statistic_count.jsx';
 var Tooltip = ReactBootstrap.Tooltip;
 var OverlayTrigger = ReactBootstrap.OverlayTrigger;
 
-import {injectIntl, intlShape, defineMessages, FormattedMessage} from 'mm-intl';
+import {injectIntl, intlShape, defineMessages, FormattedMessage, FormattedDate} from 'mm-intl';
 
 const holders = defineMessages({
     analyticsTotalUsers: {
@@ -75,10 +74,12 @@ export default class Analytics extends React.Component {
         }
 
         let loading = (
-            <FormattedMessage
-                id='admin.analytics.loading'
-                defaultMessage='Loading...'
-            />
+            <h5>
+                <FormattedMessage
+                    id='admin.analytics.loading'
+                    defaultMessage='Loading...'
+                />
+            </h5>
         );
 
         let firstRow;
@@ -322,7 +323,17 @@ export default class Analytics extends React.Component {
                                                     </time>
                                                 </OverlayTrigger>
                                             </td>
-                                            <td>{Utils.displayDateTime(user.last_activity_at)}</td>
+                                            <td>
+                                                <FormattedDate
+                                                    value={user.last_activity_at}
+                                                    day='numeric'
+                                                    month='long'
+                                                    year='numeric'
+                                                    hour12={true}
+                                                    hour='2-digit'
+                                                    minute='2-digit'
+                                                />
+                                            </td>
                                         </tr>
                                     );
                                 })
@@ -378,7 +389,17 @@ export default class Analytics extends React.Component {
                                                     </time>
                                                 </OverlayTrigger>
                                             </td>
-                                            <td>{Utils.displayDateTime(user.create_at)}</td>
+                                            <td>
+                                                <FormattedDate
+                                                    value={user.create_at}
+                                                    day='numeric'
+                                                    month='long'
+                                                    year='numeric'
+                                                    hour12={true}
+                                                    hour='2-digit'
+                                                    minute='2-digit'
+                                                />
+                                            </td>
                                         </tr>
                                     );
                                 })
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 005a82209..8fc3cd63d 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -419,7 +419,7 @@ export default class ChannelHeader extends React.Component {
                                         </ul>
                                     </div>
                                     <OverlayTrigger
-                                        trigger={['hover', 'focus']}
+                                        trigger={'click'}
                                         placement='bottom'
                                         overlay={popoverContent}
                                         ref='headerOverlay'