diff --git a/app/javascript/mastodon/components/follow_button.tsx b/app/javascript/mastodon/components/follow_button.tsx index 059f49c6560..15a9046848f 100644 --- a/app/javascript/mastodon/components/follow_button.tsx +++ b/app/javascript/mastodon/components/follow_button.tsx @@ -94,14 +94,14 @@ export const FollowButton: React.FC<{ if (accountId === me) { return; + } else if (relationship.muting) { + dispatch(unmuteAccount(accountId)); } else if (account && (relationship.following || relationship.requested)) { dispatch( openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }), ); } else if (relationship.blocking) { dispatch(unblockAccount(accountId)); - } else if (relationship.muting) { - dispatch(unmuteAccount(accountId)); } else { dispatch(followAccount(accountId)); } @@ -124,12 +124,12 @@ export const FollowButton: React.FC<{ label = intl.formatMessage(messages.editProfile); } else if (!relationship) { label = ; + } else if (relationship.muting) { + label = intl.formatMessage(messages.unmute); } else if (relationship.following) { label = intl.formatMessage(messages.unfollow); } else if (relationship.blocking) { label = intl.formatMessage(messages.unblock); - } else if (relationship.muting) { - label = intl.formatMessage(messages.unmute); } else if (relationship.requested) { label = intl.formatMessage(messages.followRequestCancel); } else if (relationship.followed_by && !account?.locked) {