moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'blocked_message_when_blocked' into 'develop' 

State why you can't follow someone, don't just disable the button

See merge request soapbox-pub/soapbox-fe!1010
This commit is contained in:
Alex Gleason 2022-02-05 20:36:26 +00:00
parent a229f77f5d bf0a7d7bae
commit eb3fc815d9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/soapbox/features/ui/components/action_button.js
View File

@ -25,6 +25,7 @@ const messages = defineMessages({
requested_small: { id: 'account.requested_small', defaultMessage: 'Awaiting approval' }, requested_small: { id: 'account.requested_small', defaultMessage: 'Awaiting approval' },
unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' }, unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' }, edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
blocked: { id: 'account.blocked', defaultMessage: 'Blocked' },
}); });
const mapStateToProps = state => { const mapStateToProps = state => {
@ -132,8 +133,9 @@ class ActionButton extends ImmutablePureComponent {
return <Button className='logo-button' text={small ? intl.formatMessage(messages.requested_small) : intl.formatMessage(messages.requested)} onClick={this.handleFollow} />; return <Button className='logo-button' text={small ? intl.formatMessage(messages.requested_small) : intl.formatMessage(messages.requested)} onClick={this.handleFollow} />;
} else if (!account.getIn(['relationship', 'blocking'])) { } else if (!account.getIn(['relationship', 'blocking'])) {
// Follow & Unfollow // Follow & Unfollow
const blocked_by = account.getIn(['relationship', 'blocked_by']);
return (<Button return (<Button
disabled={account.getIn(['relationship', 'blocked_by'])} disabled={blocked_by}
className={classNames('button--follow', { className={classNames('button--follow', {
'button--destructive': account.getIn(['relationship', 'following']), 'button--destructive': account.getIn(['relationship', 'following']),
})} })}
@ -143,8 +145,8 @@ class ActionButton extends ImmutablePureComponent {
intl.formatMessage(messages.unfollow) intl.formatMessage(messages.unfollow)
) : ( ) : (
<> <>
{intl.formatMessage(messages.follow)} { intl.formatMessage(blocked_by ? messages.blocked : messages.follow)}
<Icon src={require('@tabler/icons/icons/plus.svg')} /> <Icon src={blocked_by ? require('@tabler/icons/icons/ban.svg') : require('@tabler/icons/icons/plus.svg')} />
</> </>
)} )}
</Button>); </Button>);