summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/config.json2
-rw-r--r--web/react/components/more_direct_channels.jsx4
2 files changed, 5 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json
index a927620b5..dc35a369d 100644
--- a/config/config.json
+++ b/config/config.json
@@ -9,7 +9,7 @@
"EnableOutgoingWebhooks": true,
"EnablePostUsernameOverride": false,
"EnablePostIconOverride": false,
- "EnableTesting": false,
+ "EnableTesting": true,
"EnableSecurityFixAlert": true
},
"TeamSettings": {
diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx
index 40deb37f2..d1265f67e 100644
--- a/web/react/components/more_direct_channels.jsx
+++ b/web/react/components/more_direct_channels.jsx
@@ -50,6 +50,10 @@ export default class MoreDirectChannels extends React.Component {
handleFilterChange() {
const filter = ReactDOM.findDOMNode(this.refs.filter).value;
+ if ($(window).width() > 768) {
+ $(ReactDOM.findDOMNode(this.refs.userList)).scrollTop(0);
+ }
+
if (filter !== this.state.filter) {
this.setState({filter});
}