From cc282a5c6cd9f3d690de4bd3c94a0419e4ac0c44 Mon Sep 17 00:00:00 2001
From: unknown <clovis@bdx.town>
Date: Tue, 15 Aug 2023 17:48:16 +0200
Subject: [PATCH] Fix poll overriding content when collapse

---
 app/soapbox/components/status_content.tsx | 46 +++++++++++------------
 app/soapbox/locales/fr.json               |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/soapbox/components/status_content.tsx b/app/soapbox/components/status_content.tsx
index 176a26a5e..08f33edf6 100644
--- a/app/soapbox/components/status_content.tsx
+++ b/app/soapbox/components/status_content.tsx
@@ -294,29 +294,29 @@ const StatusContent: React.FC<IStatusContent> = ({ status, expanded = false, onE
         {
           // actual content
           !isHidden && (
-            <div
-              tabIndex={!isHidden ? 0 : undefined}
-              className={classNames('min-h-0 overflow-hidden text-ellipsis status__content__text', {
-                'status__content__text--visible': !isHidden,
-              })}
-              style={directionStyle}
-              dangerouslySetInnerHTML={content}
-              lang={status.language || undefined}
-            />
-          )
-        }
-        {
-          // post folded because too long
-          collapsed && onClick && (
-            <div>
-              <ReadMoreButton onClick={onClick} key='read-more' />
-            </div>
-          )
-        }
-        {
-          // post has a poll
-          status.poll && typeof status.poll === 'string' && (
-            <Poll id={status.poll} key='poll' status={status.url} />
+            <>
+              <div
+                tabIndex={!isHidden ? 0 : undefined}
+                className={classNames('min-h-0 overflow-hidden text-ellipsis status__content__text status__content__text--visible')}
+                style={directionStyle}
+                dangerouslySetInnerHTML={content}
+                lang={status.language || undefined}
+              />
+              {
+              // post folded because too long
+                collapsed && onClick && (
+                  <div>
+                    <ReadMoreButton onClick={onClick} key='read-more' />
+                  </div>
+                )
+              }
+              {
+              // post has a poll
+                !collapsed && status.poll && typeof status.poll === 'string' && (
+                  <Poll id={status.poll} key='poll' status={status.url} />
+                )
+              }
+            </>
           )
         }
       </div>
diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json
index 2ef5e281f..f4e35b9a3 100644
--- a/app/soapbox/locales/fr.json
+++ b/app/soapbox/locales/fr.json
@@ -813,7 +813,7 @@
   "patron.title": "Funding Goal",
   "pinned_accounts.title": "{name}’s choices",
   "pinned_statuses.none": "Aucun statut épinglé.",
-  "poll.chooseMultiple": "Choose as many as you'd like.",
+  "poll.chooseMultiple": "Choisissez autant d'options que vous voulez.",
   "poll.closed": "Fermé",
   "poll.non_anonymous": "Public poll",
   "poll.non_anonymous.label": "Other instances may display the options you voted for",