Merge remote-tracking branch 'origin/develop' into jryans/id-change-red

src/components/views/rooms/AuxPanel.js

@@ -27,6 +27,7 @@ import { _t } from '../../../languageHandler';
 import classNames from 'classnames';
 import RateLimitedFunc from '../../../ratelimitedfunc';
 import SettingsStore from "../../../settings/SettingsStore";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 
 
 export default createReactClass({
@@ -264,14 +265,14 @@ export default createReactClass({
         }
 
         return (
-            <div className={classes} style={style} >
+            <AutoHideScrollbar className={classes} style={style} >
                 { stateViews }
                 { appsDrawer }
                 { fileDropTarget }
                 { callView }
                 { conferenceCallNotification }
                 { this.props.children }
-            </div>
+            </AutoHideScrollbar>
         );
     },
 });

src/components/views/rooms/RoomTile.js

@@ -37,7 +37,7 @@ import E2EIcon from './E2EIcon';
 import InviteOnlyIcon from './InviteOnlyIcon';
 // eslint-disable-next-line camelcase
 import rate_limited_func from '../../../ratelimitedfunc';
-import { shieldStatusForMembership } from '../../../utils/ShieldUtils';
+import { shieldStatusForRoom } from '../../../utils/ShieldUtils';
 
 export default createReactClass({
     displayName: 'RoomTile',
@@ -157,7 +157,7 @@ export default createReactClass({
 
         /* At this point, the user has encryption on and cross-signing on */
         this.setState({
-            e2eStatus: await shieldStatusForMembership(cli, this.props.room),
+            e2eStatus: await shieldStatusForRoom(cli, this.props.room),
         });
     },
 

src/components/views/rooms/SendMessageComposer.js

@@ -131,8 +131,13 @@ export default class SendMessageComposer extends React.Component {
             this.onVerticalArrow(event, false);
         } else if (this._prepareToEncrypt) {
             this._prepareToEncrypt();
+        } else if (event.key === Key.ESCAPE) {
+            dis.dispatch({
+                action: 'reply_to_event',
+                event: null,
+            });
         }
-    }
+    };
 
     onVerticalArrow(e, up) {
         // arrows from an initial-caret composer navigates recent messages to edit