Merge pull request #1992 from matrix-org/t3chguy/focus_rte_after_when_uploadingFile

Upload File confirmation modal steals focus, send it back to composer

src/components/structures/RoomView.js

@@ -913,6 +913,8 @@ module.exports = React.createClass({
     },
 
     uploadFile: async function(file) {
+        dis.dispatch({action: 'focus_composer'});
+
         if (MatrixClientPeg.get().isGuest()) {
             dis.dispatch({action: 'view_set_mxid'});
             return;