From 37bc3c617189751f3f583ea7427fa3411e862bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?=
 <tt@kmycode.net>
Date: Wed, 3 Jan 2024 22:27:56 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20#397=20=E7=AE=A1=E7=90=86=E8=80=85?=
 =?UTF-8?q?=E3=82=84=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=8C=E3=82=B9?=
 =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=83=97=E6=A9=9F=E8=83=BD=E3=82=92=E7=84=A1?=
 =?UTF-8?q?=E5=8A=B9=E3=81=AB=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E3=81=A8?=
 =?UTF-8?q?=E3=81=8D=E3=81=AB=E3=80=81=E6=8A=95=E7=A8=BF=E3=81=AE=E3=83=9C?=
 =?UTF-8?q?=E3=82=BF=E3=83=B3=E7=BE=A4=E3=82=92=E4=BB=A5=E5=89=8D=E9=80=9A?=
 =?UTF-8?q?=E3=82=8A=E5=9D=87=E7=AD=89=E5=B9=85=E3=81=A7=E8=A9=B0=E3=82=81?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B=20(#411)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/mastodon/components/status_action_bar.jsx      | 4 ++--
 .../mastodon/features/status/components/action_bar.jsx        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index 965d2ceb6a..1f121d4e04 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -472,9 +472,9 @@ class StatusActionBar extends ImmutablePureComponent {
       <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={(
         <IconButton className='status__action-bar__button' title={intl.formatMessage(messages.emojiReaction)} icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
       )} />
-    )) || (
+    )) || (enableEmojiReaction && (
       <div className='status__action-bar__button__blank' />
-    );
+    )) || null;
 
     const isReply = status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);
 
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index 154b765384..e73856dd1a 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -382,9 +382,9 @@ class ActionBar extends PureComponent {
           <IconButton title={intl.formatMessage(messages.pickEmoji)} icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
         )} />
       </div>
-    )) || (
+    )) || (enableEmojiReaction && (
       <div className='detailed-status__button__blank' />
-    );
+    )) || null;
 
     return (
       <div className='detailed-status__action-bar'>