Merge branch 'master' into PLT-340

2 files changed, 4 insertions, 10 deletions

diff --git a/web/react/components/admin_console/team_analytics.jsx b/web/react/components/admin_console/team_analytics.jsx
index dd8812ad0..a945a551c 100644
--- a/web/react/components/admin_console/team_analytics.jsx
+++ b/web/react/components/admin_console/team_analytics.jsx
@@ -56,6 +56,8 @@ export default class TeamAnalytics extends React.Component {
             teamId,
             'post_counts_day',
             (data) => {
+                data.reverse();
+
                 var chartData = {
                     labels: [],
                     datasets: [{
@@ -89,6 +91,8 @@ export default class TeamAnalytics extends React.Component {
             teamId,
             'user_counts_with_posts_day',
             (data) => {
+                data.reverse();
+
                 var chartData = {
                     labels: [],
                     datasets: [{
diff --git a/web/react/components/admin_console/team_users.jsx b/web/react/components/admin_console/team_users.jsx
index ffb412159..b44aba56e 100644
--- a/web/react/components/admin_console/team_users.jsx
+++ b/web/react/components/admin_console/team_users.jsx
@@ -33,14 +33,6 @@ export default class UserList extends React.Component {
         this.getTeamProfiles(this.props.team.id);
     }
 
-    // this.setState({
-    //     teamId: this.state.teamId,
-    //     users: this.state.users,
-    //     serverError: this.state.serverError,
-    //     showPasswordModal: this.state.showPasswordModal,
-    //     user: this.state.user
-    // });
-
     getTeamProfiles(teamId) {
         Client.getProfilesForTeam(
             teamId,
@@ -95,8 +87,6 @@ export default class UserList extends React.Component {
     }
 
     doPasswordResetDismiss() {
-        this.state.showPasswordModal = false;
-        this.state.user = null;
         this.setState({
             teamId: this.state.teamId,
             users: this.state.users,