From c226d00490749cb9ef00fde2904c75b9f1d19b15 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 25 Aug 2023 21:54:15 +0200
Subject: [PATCH] Fix interaction between CWs and hashtag bars

---
 app/javascript/flavours/glitch/components/status.jsx           | 2 +-
 .../glitch/features/status/components/detailed_status.jsx      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
index e5693a94df..f71fd40f77 100644
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@@ -781,7 +781,7 @@ class Status extends ImmutablePureComponent {
     }, 'focusable');
 
     const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
-    media.push(hashtagBar);
+    contentMedia.push(hashtagBar);
 
     return (
       <HotKeys handlers={handlers}>
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
index 99e6e63e04..bf41aa931d 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
@@ -305,6 +305,7 @@ class DetailedStatus extends ImmutablePureComponent {
     }
 
     const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
+    contentMedia.push(hashtagBar);
 
     return (
       <div style={outerStyle}>
@@ -331,8 +332,6 @@ class DetailedStatus extends ImmutablePureComponent {
             {...statusContentProps}
           />
 
-          {hashtagBar}
-
           <div className='detailed-status__meta'>
             <a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener noreferrer'>
               <FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />