3 files changed, 15 insertions, 10 deletions

diff --git a/web/react/components/more_channels.jsx b/web/react/components/more_channels.jsx
index ba8be12b2..65cd40975 100644
--- a/web/react/components/more_channels.jsx
+++ b/web/react/components/more_channels.jsx
@@ -6,6 +6,7 @@ var client = require('../utils/client.jsx');
 var asyncClient = require('../utils/async_client.jsx');
 var ChannelStore = require('../stores/channel_store.jsx');
 var LoadingScreen = require('./loading_screen.jsx');
+var NewChannelFlow = require('./new_channel_flow.jsx');
 
 function getStateFromStores() {
     return {
@@ -25,6 +26,7 @@ export default class MoreChannels extends React.Component {
         var initState = getStateFromStores();
         initState.channelType = '';
         initState.joiningChannel = -1;
+        initState.showNewChannelModal = false;
         this.state = initState;
     }
     componentDidMount() {
@@ -66,6 +68,7 @@ export default class MoreChannels extends React.Component {
     }
     handleNewChannel() {
         $(React.findDOMNode(this.refs.modal)).modal('hide');
+        this.setState({showNewChannelModal: true});
     }
     render() {
         var serverError;
@@ -148,20 +151,22 @@ export default class MoreChannels extends React.Component {
                                 className='close'
                                 data-dismiss='modal'
                             >
-                                <span aria-hidden='true'>&times;</span>
-                                <span className='sr-only'>Close</span>
+                                <span aria-hidden='true'>{'×'}</span>
+                                <span className='sr-only'>{'Close'}</span>
                             </button>
-                            <h4 className='modal-title'>More Channels</h4>
+                            <h4 className='modal-title'>{'More Channels'}</h4>
                             <button
-                                data-toggle='modal'
-                                data-target='#new_channel'
-                                data-channeltype={this.state.channelType}
                                 type='button'
                                 className='btn btn-primary channel-create-btn'
                                 onClick={this.handleNewChannel}
                             >
-                                Create New Channel
+                                {'Create New Channel'}
                             </button>
+                            <NewChannelFlow
+                                show={this.state.showNewChannelModal}
+                                channelType={this.state.channelType}
+                                onModalDismissed={() => this.setState({showNewChannelModal: false})}
+                            />
                         </div>
                         <div className='modal-body'>
                             {moreChannels}
@@ -173,7 +178,7 @@ export default class MoreChannels extends React.Component {
                                 className='btn btn-default'
                                 data-dismiss='modal'
                             >
-                                Close
+                                {'Close'}
                             </button>
                         </div>
                     </div>
diff --git a/web/react/components/rhs_comment.jsx b/web/react/components/rhs_comment.jsx
index 73623179f..806f8e2bc 100644
--- a/web/react/components/rhs_comment.jsx
+++ b/web/react/components/rhs_comment.jsx
@@ -207,7 +207,7 @@ export default class RhsComment extends React.Component {
                     <div className='post-body'>
                         <p className={postClass}>
                             {loading}
-                            <span
+                            <div
                                 onClick={TextFormatting.handleClick}
                                 dangerouslySetInnerHTML={{__html: TextFormatting.formatText(post.message)}}
                             />
diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx
index 4ed97d00a..13da8101d 100644
--- a/web/react/components/rhs_root_post.jsx
+++ b/web/react/components/rhs_root_post.jsx
@@ -147,7 +147,7 @@ export default class RhsRootPost extends React.Component {
                         </li>
                     </ul>
                     <div className='post-body'>
-                        <p
+                        <div
                             onClick={TextFormatting.handleClick}
                             dangerouslySetInnerHTML={{__html: TextFormatting.formatText(post.message)}}
                         />