From baed52c2a7d8f91bae3c69150005fc528387785c Mon Sep 17 00:00:00 2001
From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Fri, 16 Apr 2021 17:06:42 +0900
Subject: [PATCH] Fix not to show follow button in global suggestion (#16045)
* Fix not to show follow button in global suggestion
* Fix style
---
app/javascript/mastodon/components/account.js | 6 ++++--
.../mastodon/features/compose/components/search_results.js | 6 +++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js
index 0e40ee1d6a..a85d683a7b 100644
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@@ -78,8 +78,10 @@ class Account extends ImmutablePureComponent {
let buttons;
- if (onActionClick && actionIcon) {
- buttons = <IconButton icon={actionIcon} title={actionTitle} onClick={this.handleAction} />;
+ if (actionIcon) {
+ if (onActionClick) {
+ buttons = <IconButton icon={actionIcon} title={actionTitle} onClick={this.handleAction} />;
+ }
} else if (account.get('id') !== me && account.get('relationship', null) !== null) {
const following = account.getIn(['relationship', 'following']);
const requested = account.getIn(['relationship', 'requested']);
diff --git a/app/javascript/mastodon/features/compose/components/search_results.js b/app/javascript/mastodon/features/compose/components/search_results.js
index c4e160b8a6..a8b31b677b 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.js
+++ b/app/javascript/mastodon/features/compose/components/search_results.js
@@ -55,9 +55,9 @@ class SearchResults extends ImmutablePureComponent {
<AccountContainer
key={suggestion.get('account')}
id={suggestion.get('account')}
- actionIcon={suggestion.get('source') === 'past_interaction' && 'times'}
- actionTitle={suggestion.get('source') === 'past_interaction' && intl.formatMessage(messages.dismissSuggestion)}
- onActionClick={suggestion.get('source') === 'past_interaction' && dismissSuggestion}
+ actionIcon={suggestion.get('source') === 'past_interaction' ? 'times' : null}
+ actionTitle={suggestion.get('source') === 'past_interaction' ? intl.formatMessage(messages.dismissSuggestion) : null}
+ onActionClick={dismissSuggestion}
/>
))}
</div>
--
GitLab