Skip to content

Commit 429c84d

Browse files
Gargronhiyuki2578
authored andcommitted
Fix "cancel follow request" button having unreadable text in web UI (mastodon#11521)
Fix mastodon#11478
1 parent 7655cb6 commit 429c84d

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

app/javascript/mastodon/components/button.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export default class Button extends React.PureComponent {
1212
secondary: PropTypes.bool,
1313
size: PropTypes.number,
1414
className: PropTypes.string,
15+
title: PropTypes.string,
1516
style: PropTypes.object,
1617
children: PropTypes.node,
1718
};
@@ -54,6 +55,7 @@ export default class Button extends React.PureComponent {
5455
onClick={this.handleClick}
5556
ref={this.setRef}
5657
style={style}
58+
title={this.props.title}
5759
>
5860
{this.props.text || this.props.children}
5961
</button>

app/javascript/mastodon/features/account/components/header.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
1515
const messages = defineMessages({
1616
unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
1717
follow: { id: 'account.follow', defaultMessage: 'Follow' },
18+
cancel_follow_request: { id: 'account.cancel_follow_request', defaultMessage: 'Cancel follow request' },
1819
requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
1920
unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
2021
edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
@@ -148,7 +149,7 @@ class Header extends ImmutablePureComponent {
148149
if (!account.get('relationship')) { // Wait until the relationship is loaded
149150
actionBtn = '';
150151
} else if (account.getIn(['relationship', 'requested'])) {
151-
actionBtn = <Button className='logo-button' text={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
152+
actionBtn = <Button className='logo-button' text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
152153
} else if (!account.getIn(['relationship', 'blocking'])) {
153154
actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames('logo-button', { 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={this.props.onFollow} />;
154155
} else if (account.getIn(['relationship', 'blocking'])) {

0 commit comments

Comments
 (0)