Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Make "unfollow" undo pending outgoing follow request too (#4781)

Browse source 
* Make "unfollow" undo pending outgoing follow request too

* Add cancel button to web UI when awaiting follow request approval

* Make the hourglass button do the cancelling
This commit is contained in:
Eugen Rochko 2017-09-02 20:44:41 +02:00 • committed by GitHub
parent 2a5d1d5a1b
commit d3b6746173
8 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/account/components/header.js
View file

@ -11,7 +11,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
const messages = defineMessages({
unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
follow: { id: 'account.follow', defaultMessage: 'Follow' },
requested: { id: 'account.requested', defaultMessage: 'Awaiting approval' },
requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
});
const makeMapStateToProps = () => {
@ -102,7 +102,7 @@ export default class Header extends ImmutablePureComponent {
if (account.getIn(['relationship', 'requested'])) {
actionBtn = (
<div className='account--action-button'>
<IconButton size={26} disabled icon='hourglass' title={intl.formatMessage(messages.requested)} />
<IconButton size={26} active icon='hourglass' title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />
</div>
);
} else if (!account.getIn(['relationship', 'blocking'])) {