From 70e5d8a1ed9aa230c929e67def59fc7edd607cce Mon Sep 17 00:00:00 2001 From: KMY Date: Mon, 16 Oct 2023 17:14:53 +0900 Subject: [PATCH] =?UTF-8?q?=E5=8D=98=E3=81=AB=E3=83=AD=E3=83=BC=E3=83=89?= =?UTF-8?q?=E4=B8=AD=E3=81=AB=E3=83=87=E3=83=BC=E3=82=BF=E5=8F=82=E7=85=A7?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=81=A0=E3=81=91=E3=81=A7=E3=81=AF=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mastodon/features/about/index.jsx | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/app/javascript/mastodon/features/about/index.jsx b/app/javascript/mastodon/features/about/index.jsx index b58c438e3652ac..6a248973190631 100644 --- a/app/javascript/mastodon/features/about/index.jsx +++ b/app/javascript/mastodon/features/about/index.jsx @@ -127,10 +127,9 @@ class About extends PureComponent { const { multiColumn, intl, server, extendedDescription, domainBlocks } = this.props; const isLoading = server.get('isLoading'); - const fedibirdCapabilities = server.get('fedibird_capabilities') || []; + const fedibirdCapabilities = server.get('fedibird_capabilities') || []; // thinking about isLoading is true const isPublicUnlistedVisibility = fedibirdCapabilities.includes('kmyblue_visibility_public_unlisted'); const isEmojiReaction = fedibirdCapabilities.includes('emoji_reaction'); - const capabilitiesError = !server.get('fedibird_capabilities'); return ( @@ -193,22 +192,16 @@ class About extends PureComponent {
- {capabilitiesError ? ( -

- ) : ( - <> -

- {!isLoading && ( -
    -
  1. - {intl.formatMessage(messages.emojiReaction)}: {intl.formatMessage(isEmojiReaction ? messages.enabled : messages.disabled)} -
  2. -
  3. - {intl.formatMessage(messages.publicUnlistedVisibility)}: {intl.formatMessage(isPublicUnlistedVisibility ? messages.enabled : messages.disabled)} -
  4. -
- )} - +

+ {!isLoading && ( +
    +
  1. + {intl.formatMessage(messages.emojiReaction)}: {intl.formatMessage(isEmojiReaction ? messages.enabled : messages.disabled)} +
  2. +
  3. + {intl.formatMessage(messages.publicUnlistedVisibility)}: {intl.formatMessage(isPublicUnlistedVisibility ? messages.enabled : messages.disabled)} +
  4. +
)}