tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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

2
app/javascript/mastodon/containers/account_container.js
View File

@ -32,7 +32,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> }} />,