fix JS errors on system console and channel intro message (mattermost…

…#2907)

components/admin_console/help_text.jsx

@@ -12,7 +12,10 @@ export default class HelpText extends React.PureComponent {
  static propTypes = {
  isMarkdown: PropTypes.bool,
  isTranslated: PropTypes.bool,
- text: PropTypes.string.isRequired,
+ text: PropTypes.oneOfType([
+ PropTypes.string,
+ PropTypes.object,
+ ]).isRequired,
  textDefault: PropTypes.string,
  textValues: PropTypes.object,
  };
@@ -22,21 +25,32 @@ export default class HelpText extends React.PureComponent {
  };
 
  renderTranslated = () => {
- if (this.props.isMarkdown) {
+ const {
+ isMarkdown,
+ text,
+ textDefault,
+ textValues,
+ } = this.props;
+
+ if (typeof text === 'object') {
+ return text;
+ }
+
+ if (isMarkdown) {
  return (
  <FormattedMarkdownMessage
- id={this.props.text}
- defaultMessage={this.props.textDefault}
- values={this.props.textValues}
+ id={text}
+ defaultMessage={textDefault}
+ values={textValues}
  />
  );
  }
 
  return (
  <FormattedMessage
- id={this.props.text}
- values={this.props.textValues}
- defaultMessage={this.props.textDefault}
+ id={text}
+ values={textValues}
+ defaultMessage={textDefault}
  />
  );
  };

components/post_view/channel_intro_message/channel_intro_message.jsx

@@ -33,7 +33,7 @@ export default class ChannelIntroMessage extends React.PureComponent {
  channelProfiles: PropTypes.array.isRequired,
  enableUserCreation: PropTypes.bool,
  isReadOnly: PropTypes.bool,
- teamIsGroupConstrained: PropTypes.bool.isRequired,
+ teamIsGroupConstrained: PropTypes.bool,
  };
 
  render() {