diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-02 20:44:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-02 20:44:41 +0200 |
| commit | d3b67461735f9a1c38a7eee655a8131bcf6a0cbf (patch) | |
| tree | 3228ad4c8a815867c0ddd6e4f2806686636d2292 /app/javascript/mastodon/features/account_timeline/containers/header_container.js | |
| parent | 2a5d1d5a1b2a3c152f2deadac3308f655b6e96be (diff) | |
Make "unfollow" undo pending outgoing follow request too (#4781)
* 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
Diffstat (limited to 'app/javascript/mastodon/features/account_timeline/containers/header_container.js')
| -rw-r--r-- | app/javascript/mastodon/features/account_timeline/containers/header_container.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.js b/app/javascript/mastodon/features/account_timeline/containers/header_container.js index baa81bbc2..dcee78b3e 100644 --- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js +++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js @@ -38,7 +38,7 @@ const makeMapStateToProps = () => { const mapDispatchToProps = (dispatch, { intl }) => ({ onFollow (account) { - if (account.getIn(['relationship', 'following'])) { + if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) { if (this.unfollowModal) { dispatch(openModal('CONFIRM', { message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />, |