Change report modal to include category selection in web UI (#17565)
* Change report modal to include category selection in web UI * Various fixes and improvements - Change thank you text to be different based on category - Change starting headline to be different for account and status reports - Change toggle components to have a checkmark when checked - Fix report dialog being cut off on small screens - Fix thank you screen offering mute or block if already muted or blocked - Refactor toggle components in report dialog into one component * Change wording on final screen * Change checkboxes to be square when multiple options are possible
This commit is contained in:
		
							
								
								
									
										84
									
								
								app/javascript/mastodon/features/report/thanks.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										84
									
								
								app/javascript/mastodon/features/report/thanks.js
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,84 @@
 | 
			
		||||
import React from 'react';
 | 
			
		||||
import PropTypes from 'prop-types';
 | 
			
		||||
import ImmutablePropTypes from 'react-immutable-proptypes';
 | 
			
		||||
import { FormattedMessage } from 'react-intl';
 | 
			
		||||
import Button from 'mastodon/components/button';
 | 
			
		||||
import { connect } from 'react-redux';
 | 
			
		||||
import {
 | 
			
		||||
  unfollowAccount,
 | 
			
		||||
  muteAccount,
 | 
			
		||||
  blockAccount,
 | 
			
		||||
} from 'mastodon/actions/accounts';
 | 
			
		||||
 | 
			
		||||
const mapStateToProps = () => ({});
 | 
			
		||||
 | 
			
		||||
export default @connect(mapStateToProps)
 | 
			
		||||
class Thanks extends React.PureComponent {
 | 
			
		||||
 | 
			
		||||
  static propTypes = {
 | 
			
		||||
    submitted: PropTypes.bool,
 | 
			
		||||
    onClose: PropTypes.func.isRequired,
 | 
			
		||||
    account: ImmutablePropTypes.map.isRequired,
 | 
			
		||||
    dispatch: PropTypes.func.isRequired,
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  handleCloseClick = () => {
 | 
			
		||||
    const { onClose } = this.props;
 | 
			
		||||
    onClose();
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  handleUnfollowClick = () => {
 | 
			
		||||
    const { dispatch, account, onClose } = this.props;
 | 
			
		||||
    dispatch(unfollowAccount(account.get('id')));
 | 
			
		||||
    onClose();
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  handleMuteClick = () => {
 | 
			
		||||
    const { dispatch, account, onClose } = this.props;
 | 
			
		||||
    dispatch(muteAccount(account.get('id')));
 | 
			
		||||
    onClose();
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  handleBlockClick = () => {
 | 
			
		||||
    const { dispatch, account, onClose } = this.props;
 | 
			
		||||
    dispatch(blockAccount(account.get('id')));
 | 
			
		||||
    onClose();
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  render () {
 | 
			
		||||
    const { account, submitted } = this.props;
 | 
			
		||||
 | 
			
		||||
    return (
 | 
			
		||||
      <React.Fragment>
 | 
			
		||||
        <h3 className='report-dialog-modal__title'>{submitted ? <FormattedMessage id='report.thanks.title_actionable' defaultMessage="Thanks for reporting, we'll look into this." /> : <FormattedMessage id='report.thanks.title' defaultMessage="Don't want to see this?" />}</h3>
 | 
			
		||||
        <p className='report-dialog-modal__lead'>{submitted ? <FormattedMessage id='report.thanks.take_action_actionable' defaultMessage='While we review this, you can take action against @{name}:' values={{ name: account.get('username') }} /> : <FormattedMessage id='report.thanks.take_action' defaultMessage='Here are your options for controlling what you see on Mastodon:' />}</p>
 | 
			
		||||
 | 
			
		||||
        {account.getIn(['relationship', 'following']) && (
 | 
			
		||||
          <React.Fragment>
 | 
			
		||||
            <h4 className='report-dialog-modal__subtitle'><FormattedMessage id='report.unfollow' defaultMessage='Unfollow @{name}' values={{ name: account.get('username') }} /></h4>
 | 
			
		||||
            <p className='report-dialog-modal__lead'><FormattedMessage id='report.unfollow_explanation' defaultMessage='You are following this account. To not see their posts in your home feed anymore, unfollow them.' /></p>
 | 
			
		||||
            <Button secondary onClick={this.handleUnfollowClick}><FormattedMessage id='account.unfollow' defaultMessage='Unfollow' /></Button>
 | 
			
		||||
            <hr />
 | 
			
		||||
          </React.Fragment>
 | 
			
		||||
        )}
 | 
			
		||||
 | 
			
		||||
        <h4 className='report-dialog-modal__subtitle'><FormattedMessage id='account.mute' defaultMessage='Mute @{name}' values={{ name: account.get('username') }} /></h4>
 | 
			
		||||
        <p className='report-dialog-modal__lead'><FormattedMessage id='report.mute_explanation' defaultMessage='You will not see their posts. They can still follow you and see your posts and will not know that they are muted.' /></p>
 | 
			
		||||
        <Button secondary onClick={this.handleMuteClick}>{!account.getIn(['relationship', 'muting']) ? <FormattedMessage id='report.mute' defaultMessage='Mute' /> : <FormattedMessage id='account.muted' defaultMessage='Muted' />}</Button>
 | 
			
		||||
 | 
			
		||||
        <hr />
 | 
			
		||||
 | 
			
		||||
        <h4 className='report-dialog-modal__subtitle'><FormattedMessage id='account.block' defaultMessage='Block @{name}' values={{ name: account.get('username') }} /></h4>
 | 
			
		||||
        <p className='report-dialog-modal__lead'><FormattedMessage id='report.block_explanation' defaultMessage='You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.' /></p>
 | 
			
		||||
        <Button secondary onClick={this.handleBlockClick}>{!account.getIn(['relationship', 'blocking']) ? <FormattedMessage id='report.block' defaultMessage='Block' /> : <FormattedMessage id='account.blocked' defaultMessage='Blocked' />}</Button>
 | 
			
		||||
 | 
			
		||||
        <div className='flex-spacer' />
 | 
			
		||||
 | 
			
		||||
        <div className='report-dialog-modal__actions'>
 | 
			
		||||
          <Button onClick={this.handleCloseClick}><FormattedMessage id='report.close' defaultMessage='Done' /></Button>
 | 
			
		||||
        </div>
 | 
			
		||||
      </React.Fragment>
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user