diff --git a/twistter-frontend/src/pages/directMessages.js b/twistter-frontend/src/pages/directMessages.js index eadadf9..2201ac6 100644 --- a/twistter-frontend/src/pages/directMessages.js +++ b/twistter-frontend/src/pages/directMessages.js @@ -377,7 +377,7 @@ export class directMessages extends Component { const open = Boolean(this.state.anchorEl); const id = open ? 'simple-popover' : undefined; - let dmListMarkup = this.state.dmData ? ( + let dmListMarkup = this.state.dmData ? ( this.state.dmData.map((channel) => ( - - - + + + @@ -572,13 +572,13 @@ export class directMessages extends Component { {dmListMarkup} - - - - {addDMMarkup} - - - + + + + {addDMMarkup} + + + @@ -596,30 +596,30 @@ export class directMessages extends Component { variant="outlined" multiline rows={2} - margin="dense" - value={this.state.drafts[this.state.selectedChannel.dmId] ? this.state.drafts[this.state.selectedChannel.dmId] : ""} - onChange={this.handleChangeMessage} + margin="dense" + value={this.state.drafts[this.state.selectedChannel.dmId] ? this.state.drafts[this.state.selectedChannel.dmId] : ""} + onChange={this.handleChangeMessage} /> - + - { - sendingDirectMessage && - - // Won't accept classes style for some reason - } + { + sendingDirectMessage && + + // Won't accept classes style for some reason + } )} - {!this.state.hasChannelSelected && + {!this.state.hasChannelSelected && this.state.dmData && Select a DM on the left}