ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2026-03-10 21:25:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disable or enable Direct Messages

Browse Source
This commit is contained in:
Clayton Wilson
2019-11-27 23:06:25 -05:00
parent 0d8850c45d
commit fee2225745
4 changed files with 79 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
twistter-frontend/src/pages/directMessages.js
View File

@@ -366,7 +366,7 @@ export class directMessages extends Component {
}
render() {
const { classes } = this.props;
const { classes, user: { credentials: { dmEnabled } } } = this.props;
const loadingDirectMessages = this.props.UI.loading2;
const creatingDirectMessage = this.props.UI.loading3;
const sendingDirectMessage = this.props.UI.loading4;
@@ -563,7 +563,8 @@ export class directMessages extends Component {
);
return (
loadingDirectMessages ? <CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress> :
loadingDirectMessages ? <CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress> :
(dmEnabled !== undefined && dmEnabled !== null && !dmEnabled ? <Typography>Oops! It looks like you have DMs disabled. You can enable them on the Edit Profile page.</Typography> :
<Grid container className={classes.pageContainer}>
<Grid item className={classes.sidePadding} sm />
<Grid item className={classes.dmList}>
@@ -624,6 +625,7 @@ export class directMessages extends Component {
</Grid>
<Grid item className={classes.sidePadding} sm />
</Grid>
)
);
}
}