imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a feature flag for custom status messages

Browse source
This commit is contained in:
Travis Ralston 2018-12-18 15:11:08 -07:00
parent d20a934642
commit 04c9fff6ce
6 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/views/avatars/MemberStatusMessageAvatar.js
View file

@ -22,8 +22,9 @@ import MemberAvatar from '../avatars/MemberAvatar';
import classNames from 'classnames';
import * as ContextualMenu from "../../structures/ContextualMenu";
import StatusMessageContextMenu from "../context_menus/StatusMessageContextMenu";
import SettingsStore from "../../../settings/SettingsStore";
export default class MemberStatusMessageAvatar extends React.PureComponent {
export default class MemberStatusMessageAvatar extends React.Component {
static propTypes = {
member: PropTypes.object.isRequired,
width: PropTypes.number,
@ -92,6 +93,13 @@ export default class MemberStatusMessageAvatar extends React.PureComponent {
};
render() {
if (!SettingsStore.isFeatureEnabled("feature_custom_status")) {
return <MemberAvatar member={this.props.member}
width={this.props.width}
height={this.props.height}
resizeMethod={this.props.resizeMethod} />;
}
const hasStatus = this.props.member.user ? !!this.props.member.user._unstable_statusMessage : false;
const classes = classNames({