Updating files after merge

app/javascript/gabsocial/features/compose/components/compose_form/compose_form.js

@@ -4,6 +4,7 @@ import { length } from 'stringz';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import classNames from 'classnames';
 import CharacterCounter from '../character_counter';
+import UploadForm from '../upload_form';
 import ReplyIndicatorContainer from '../../containers/reply_indicator_container';
 import AutosuggestTextbox from '../../../../components/autosuggest_textbox';
 import PollButtonContainer from '../../containers/poll_button_container';
@@ -12,19 +13,16 @@ import SpoilerButtonContainer from '../../containers/spoiler_button_container';
 import PrivacyDropdownContainer from '../../containers/privacy_dropdown_container';
 import EmojiPickerDropdown from '../../containers/emoji_picker_dropdown_container';
 import PollFormContainer from '../../containers/poll_form_container';
-import UploadForm from '../upload_form/upload_form';
 import WarningContainer from '../../containers/warning_container';
-import { isMobile } from '../../../../utils/is_mobile';
-import { countableText } from '../../util/counter';
+import SchedulePostDropdownContainer from '../../containers/schedule_post_dropdown_container';
+import QuotedStatusPreviewContainer from '../../containers/quoted_status_preview_container';
 import Icon from '../../../../components/icon';
 import Button from '../../../../components/button';
-import SchedulePostDropdownContainer from '../containers/schedule_post_dropdown_container';
-import UploadFormContainer from '../containers/upload_form_container';
-import QuotedStatusPreviewContainer from '../containers/quoted_status_preview_container';
+import { isMobile } from '../../../../utils/is_mobile';
+import { countableText } from '../../util/counter';
 
 import './compose_form.scss';
 
-
 const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 const maxPostCharacterCount = 3000;
 
@@ -286,7 +284,7 @@ class ComposeForm extends ImmutablePureComponent {
           {
             !condensed &&
             <div className='compose-form__modifiers'>
-              <UploadFormContainer />
+              <UploadForm />
               {!edit && <PollFormContainer />}
             </div>
           }

app/javascript/gabsocial/features/compose/components/quoted_status_preview.js

@@ -1,26 +1,21 @@
-import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import DisplayName from '../../../components/display_name';
 import StatusContent from '../../../components/status_content';
 
 export default class QuotedStatusPreview extends React.PureComponent {
-    static propTypes = {
-        status: ImmutablePropTypes.map,
-        account: ImmutablePropTypes.map,
-    }
-    
-    render() {
-        const { status, account } = this.props;
+  static propTypes = {
+    status: ImmutablePropTypes.map,
+    account: ImmutablePropTypes.map,
+  }
 
-        return (
-            <div className='compose-form__quote-preview'>
-                <DisplayName account={account} />
+  render() {
+    const { status, account } = this.props;
 
-                <StatusContent
-                    status={status}
-                    expanded={false}
-                />
-            </div>
-        );
-    }
+    return (
+      <div className='compose-form__quote-preview'>
+        <DisplayName account={account} />
+        <StatusContent status={status} expanded={false} />
+      </div>
+    );
+  }
 }

app/javascript/gabsocial/features/compose/components/schedule_post_dropdown.js

@@ -1,9 +1,7 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import { injectIntl, defineMessages } from 'react-intl';
 import DatePicker from 'react-datepicker';
 import IconButton from '../../../components/icon_button';
-import { isMobile } from '../../../is_mobile';
+import { isMobile } from '../../../utils/is_mobile';
 
 import "react-datepicker/dist/react-datepicker.css";
 

app/javascript/gabsocial/features/compose/components/search_results/search_results.js

@@ -1,10 +1,10 @@
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import Hashtag from '../../../components/hashtag';
-import Icon from 'gabsocial/components/icon';
-import WhoToFollowPanel from '../../ui/components/who_to_follow_panel';
+import TrendingItem from '../../../../components/trending_item';
+import Icon from '../../../../components/icon';
+import { WhoToFollowPanel } from '../../../../components/panel';
 // import TrendsPanel from '../../ui/components/trends_panel';
-import GroupListItem from 'gabsocial/components/group_list_item';
+import GroupListItem from '../../../../components/group_list_item';
 
 export default
 @injectIntl
@@ -71,7 +71,7 @@ class SearchResults extends ImmutablePureComponent {
       hashtags = (
         <div className='search-results__section'>
           <h5><Icon id='hashtag' fixedWidth /><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></h5>
-          {results.get('hashtags').slice(0, size).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
+          {results.get('hashtags').slice(0, size).map(hashtag => <TrendingItem key={hashtag.get('name')} hashtag={hashtag} />)}
         </div>
       );
     }

app/javascript/gabsocial/features/compose/containers/quoted_status_preview_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import QuotedStatusPreview from '../components/quoted_status_preview';
 
 const mapStateToProps = (state, { id }) => ({

app/javascript/gabsocial/features/compose/containers/schedule_post_dropdown_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import SchedulePostDropdown from '../components/schedule_post_dropdown';
 import { changeScheduledAt } from '../../../actions/compose';
 import { openModal } from '../../../actions/modal';