From c5f49a92dce9157debf3a68487dd30b6f0af6c4a Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Sat, 20 Apr 2019 23:27:20 +0200
Subject: [PATCH] Move PollForm from features/composer to features/compose

---
 .../glitch/features/compose/components/compose_form.js      | 6 ++----
 .../{composer/poll_form => compose}/components/poll_form.js | 0
 .../index.js => compose/containers/poll_form_container.js}  | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)
 rename app/javascript/flavours/glitch/features/{composer/poll_form => compose}/components/poll_form.js (100%)
 rename app/javascript/flavours/glitch/features/{composer/poll_form/index.js => compose/containers/poll_form_container.js} (87%)

diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.js b/app/javascript/flavours/glitch/features/compose/components/compose_form.js
index fdc4401f65..ccbcba571e 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.js
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.js
@@ -9,7 +9,7 @@ import ComposerOptions from '../../composer/options';
 import ComposerPublisher from '../../composer/publisher';
 import ComposerTextarea from '../../composer/textarea';
 import ComposerUploadForm from '../../composer/upload_form';
-import ComposerPollForm from '../../composer/poll_form';
+import PollFormContainer from '../containers/poll_form_container';
 import WarningContainer from '../containers/warning_container';
 import ReplyIndicatorContainer from '../containers/reply_indicator_container';
 
@@ -382,9 +382,7 @@ class ComposeForm extends ImmutablePureComponent {
               handleRef={handleRefUploadForm}
             />
           ) : null}
-          {!!poll && (
-            <ComposerPollForm />
-          )}
+          <PollFormContainer />
         </div>
         <ComposerOptions
           acceptContentTypes={acceptContentTypes}
diff --git a/app/javascript/flavours/glitch/features/composer/poll_form/components/poll_form.js b/app/javascript/flavours/glitch/features/compose/components/poll_form.js
similarity index 100%
rename from app/javascript/flavours/glitch/features/composer/poll_form/components/poll_form.js
rename to app/javascript/flavours/glitch/features/compose/components/poll_form.js
diff --git a/app/javascript/flavours/glitch/features/composer/poll_form/index.js b/app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js
similarity index 87%
rename from app/javascript/flavours/glitch/features/composer/poll_form/index.js
rename to app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js
index 5232c3b311..01df024c86 100644
--- a/app/javascript/flavours/glitch/features/composer/poll_form/index.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
-import PollForm from './components/poll_form';
-import { addPollOption, removePollOption, changePollOption, changePollSettings } from '../../../actions/compose';
+import PollForm from '../components/poll_form';
+import { addPollOption, removePollOption, changePollOption, changePollSettings } from 'flavours/glitch/actions/compose';
 
 const mapStateToProps = state => ({
   options: state.getIn(['compose', 'poll', 'options']),