From c2551b9e35f1baca57687c51890233cfa02a1200 Mon Sep 17 00:00:00 2001
From: Justin <dice.warrant-02@icloud.com>
Date: Thu, 9 Jun 2022 11:49:17 -0400
Subject: [PATCH 1/2] Revert commit for poll design

This reverts commit 2a29a050a60579d398ffc3ed80943249c1a91356.
---
 app/soapbox/components/status_content.tsx             | 6 ++----
 app/soapbox/features/compose/components/poll-form.tsx | 8 ++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/soapbox/components/status_content.tsx b/app/soapbox/components/status_content.tsx
index 87ec17298..9cbafa67f 100644
--- a/app/soapbox/components/status_content.tsx
+++ b/app/soapbox/components/status_content.tsx
@@ -273,13 +273,11 @@ const StatusContent: React.FC<IStatusContent> = ({ status, expanded = false, onE
       output.push(<ReadMoreButton onClick={onClick} key='read-more' />);
     }
 
-    const hasPoll = status.poll && typeof status.poll === 'string';
-
-    if (hasPoll) {
+    if (status.poll && typeof status.poll === 'string') {
       output.push(<Poll id={status.poll} key='poll' status={status.url} />);
     }
 
-    return <div className={classNames({ 'bg-gray-100 rounded-md p-4': hasPoll })}>{output}</div>;
+    return <>{output}</>;
   } else {
     const output = [
       <div
diff --git a/app/soapbox/features/compose/components/poll-form.tsx b/app/soapbox/features/compose/components/poll-form.tsx
index 8310e48d4..1edb555c5 100644
--- a/app/soapbox/features/compose/components/poll-form.tsx
+++ b/app/soapbox/features/compose/components/poll-form.tsx
@@ -140,12 +140,7 @@ const PollForm = (props: IPollForm) => {
   const maxOptions = pollLimits.get('max_options');
   const maxOptionChars = pollLimits.get('max_characters_per_option');
 
-  const handleAddOption = () => {
-    // autofocus on new input
-    // use streamfield
-    onAddOption('');
-  };
-
+  const handleAddOption = () => onAddOption('');
   const handleSelectDuration = (value: number) => onChangeSettings(value, isMultiple);
   const handleToggleMultiple = () => onChangeSettings(expiresIn, !isMultiple);
 
@@ -175,6 +170,7 @@ const PollForm = (props: IPollForm) => {
           {options.size < maxOptions && (
             <Button
               theme='secondary'
+              icon={require('@tabler/icons/icons/plus.svg')}
               onClick={handleAddOption}
               size='sm'
             >

From 7b9b0e9e342e00ef1fc281a7d521281ce50e76c0 Mon Sep 17 00:00:00 2001
From: Justin <dice.warrant-02@icloud.com>
Date: Thu, 9 Jun 2022 11:49:59 -0400
Subject: [PATCH 2/2] Remove icon from 'add poll answer' button

---
 app/soapbox/features/compose/components/poll-form.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/soapbox/features/compose/components/poll-form.tsx b/app/soapbox/features/compose/components/poll-form.tsx
index 1edb555c5..ae16b85e8 100644
--- a/app/soapbox/features/compose/components/poll-form.tsx
+++ b/app/soapbox/features/compose/components/poll-form.tsx
@@ -170,7 +170,6 @@ const PollForm = (props: IPollForm) => {
           {options.size < maxOptions && (
             <Button
               theme='secondary'
-              icon={require('@tabler/icons/icons/plus.svg')}
               onClick={handleAddOption}
               size='sm'
             >