diff --git a/app/javascript/gabsocial/components/about_sidebar.js b/app/javascript/gabsocial/components/about_sidebar.js
index 6bafbee0..158f637d 100644
--- a/app/javascript/gabsocial/components/about_sidebar.js
+++ b/app/javascript/gabsocial/components/about_sidebar.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { injectIntl, defineMessages } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/account.js b/app/javascript/gabsocial/components/account.js
index e26597ec..30256b9f 100644
--- a/app/javascript/gabsocial/components/account.js
+++ b/app/javascript/gabsocial/components/account.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { NavLink } from 'react-router-dom'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { defineMessages, injectIntl } from 'react-intl'
@@ -123,10 +123,10 @@ class Account extends ImmutablePureComponent {
 
     if (isHidden) {
       return (
-        <Fragment>
+        <React.Fragment>
           {account.get('display_name')}
           {`@${account.get('username')}`}
-        </Fragment>
+        </React.Fragment>
       )
     }
 
diff --git a/app/javascript/gabsocial/components/account_action_button.js b/app/javascript/gabsocial/components/account_action_button.js
index aec0191f..2c3bf1ae 100644
--- a/app/javascript/gabsocial/components/account_action_button.js
+++ b/app/javascript/gabsocial/components/account_action_button.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { injectIntl, defineMessages } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/account_authorize.js b/app/javascript/gabsocial/components/account_authorize.js
index 6888722d..70a5578e 100644
--- a/app/javascript/gabsocial/components/account_authorize.js
+++ b/app/javascript/gabsocial/components/account_authorize.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/autosuggest_account.js b/app/javascript/gabsocial/components/autosuggest_account.js
index 6d124f1b..ce570bfe 100644
--- a/app/javascript/gabsocial/components/autosuggest_account.js
+++ b/app/javascript/gabsocial/components/autosuggest_account.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { makeGetAccount } from '../selectors'
diff --git a/app/javascript/gabsocial/components/autosuggest_emoji.js b/app/javascript/gabsocial/components/autosuggest_emoji.js
index 38b60101..3f3fb5aa 100644
--- a/app/javascript/gabsocial/components/autosuggest_emoji.js
+++ b/app/javascript/gabsocial/components/autosuggest_emoji.js
@@ -1,9 +1,10 @@
+import React from 'react'
 import unicodeMapping from './emoji/emoji_unicode_mapping_light'
 import Text from './text'
 
 const assetHost = process.env.CDN_HOST || ''
 
-export default class AutosuggestEmoji extends PureComponent {
+export default class AutosuggestEmoji extends React.PureComponent {
 
   static propTypes = {
     emoji: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/autosuggest_textbox.js b/app/javascript/gabsocial/components/autosuggest_textbox.js
index 6a32159e..a61da099 100644
--- a/app/javascript/gabsocial/components/autosuggest_textbox.js
+++ b/app/javascript/gabsocial/components/autosuggest_textbox.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import isObject from 'lodash.isobject'
 import ImmutablePureComponent from 'react-immutable-pure-component'
@@ -249,7 +249,7 @@ export default class AutosuggestTextbox extends ImmutablePureComponent {
     })
 
     return (
-      <Fragment>
+      <React.Fragment>
         <div className={textareaContainerClasses}>
           <label htmlFor={id} className={_s.visiblyHidden}>
             {placeholder}
@@ -302,7 +302,7 @@ export default class AutosuggestTextbox extends ImmutablePureComponent {
             {suggestions.map(this.renderSuggestion)}
           </div>
         }
-      </Fragment>
+      </React.Fragment>
     )
   }
 
diff --git a/app/javascript/gabsocial/components/avatar.js b/app/javascript/gabsocial/components/avatar.js
index e92c6e09..45dbb633 100644
--- a/app/javascript/gabsocial/components/avatar.js
+++ b/app/javascript/gabsocial/components/avatar.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import debounce from 'lodash.debounce'
diff --git a/app/javascript/gabsocial/components/back_button.js b/app/javascript/gabsocial/components/back_button.js
index a8265aa9..8b56622e 100644
--- a/app/javascript/gabsocial/components/back_button.js
+++ b/app/javascript/gabsocial/components/back_button.js
@@ -1,7 +1,8 @@
+import React from 'react'
 import { CX } from '../constants'
 import Button from './button'
 
-export default class BackButton extends PureComponent {
+export default class BackButton extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
diff --git a/app/javascript/gabsocial/components/block.js b/app/javascript/gabsocial/components/block.js
index b95f2891..80d7e063 100644
--- a/app/javascript/gabsocial/components/block.js
+++ b/app/javascript/gabsocial/components/block.js
@@ -1,7 +1,9 @@
+import React from 'react'
+
 /**
  * Renders a block component
  */
-export default class Block extends PureComponent {
+export default class Block extends React.PureComponent {
 
   static propTypes = {
     children: PropTypes.any,
diff --git a/app/javascript/gabsocial/components/block_heading.js b/app/javascript/gabsocial/components/block_heading.js
index 468ee27b..4d6eef13 100644
--- a/app/javascript/gabsocial/components/block_heading.js
+++ b/app/javascript/gabsocial/components/block_heading.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import Heading from './heading'
 
-export default class BlockHeading extends PureComponent {
+export default class BlockHeading extends React.PureComponent {
 
   static propTypes = {
     title: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/bundle_column_error.js b/app/javascript/gabsocial/components/bundle_column_error.js
index 597b7602..cf0c129b 100644
--- a/app/javascript/gabsocial/components/bundle_column_error.js
+++ b/app/javascript/gabsocial/components/bundle_column_error.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, FormattedMessage, injectIntl } from 'react-intl'
 import {
   source_url,
@@ -20,7 +21,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class BundleColumnError extends PureComponent {
+class BundleColumnError extends React.PureComponent {
 
   static propTypes = {
     onRetry: PropTypes.func.isRequired,
diff --git a/app/javascript/gabsocial/components/button.js b/app/javascript/gabsocial/components/button.js
index 5edf7f57..e9f590c7 100644
--- a/app/javascript/gabsocial/components/button.js
+++ b/app/javascript/gabsocial/components/button.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { NavLink } from 'react-router-dom'
 import classNames from 'classnames/bind'
 import Icon from './icon'
@@ -45,7 +45,7 @@ const COLORS = {
  * @param {bool} [props.type] - `type` attribute for button
  * @param {bool} [props.underlineOnHover] - if the button has underline on hover
  */
-export default class Button extends PureComponent {
+export default class Button extends React.PureComponent {
 
   static propTypes = {
     backgroundColor: PropTypes.string,
@@ -204,10 +204,10 @@ export default class Button extends PureComponent {
     ) : undefined
 
     const theChildren = !!icon ? (
-      <Fragment>
+      <React.Fragment>
         {theIcon}
         {children}
-      </Fragment>
+      </React.Fragment>
     ) : children
 
     const handlers = {
diff --git a/app/javascript/gabsocial/components/character_counter.js b/app/javascript/gabsocial/components/character_counter.js
index 08042a2b..44326cef 100644
--- a/app/javascript/gabsocial/components/character_counter.js
+++ b/app/javascript/gabsocial/components/character_counter.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { length } from 'stringz'
 
 /**
@@ -5,7 +6,7 @@ import { length } from 'stringz'
  * @param {string} props.text - text to use to measure
  * @param {number} props.max - max text allowed
  */
-export default class CharacterCounter extends PureComponent {
+export default class CharacterCounter extends React.PureComponent {
 
   static propTypes = {
     text: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/column_indicator.js b/app/javascript/gabsocial/components/column_indicator.js
index 904fae9b..b02e3ad0 100644
--- a/app/javascript/gabsocial/components/column_indicator.js
+++ b/app/javascript/gabsocial/components/column_indicator.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import Icon from './icon'
 import Text from './text'
@@ -9,7 +10,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class ColumnIndicator extends PureComponent {
+class ColumnIndicator extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/comment.js b/app/javascript/gabsocial/components/comment.js
index a1efcb42..48c0d209 100644
--- a/app/javascript/gabsocial/components/comment.js
+++ b/app/javascript/gabsocial/components/comment.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { NavLink } from 'react-router-dom'
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
@@ -247,7 +248,7 @@ class Comment extends ImmutablePureComponent {
 
 }
 
-class CommentButton extends PureComponent {
+class CommentButton extends React.PureComponent {
 
   static propTypes = {
     onClick: PropTypes.func.isRequired,
diff --git a/app/javascript/gabsocial/components/comment_header.js b/app/javascript/gabsocial/components/comment_header.js
index 2b39958f..0788db00 100644
--- a/app/javascript/gabsocial/components/comment_header.js
+++ b/app/javascript/gabsocial/components/comment_header.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { NavLink } from 'react-router-dom'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
@@ -87,7 +87,7 @@ class CommentHeader extends ImmutablePureComponent {
 
           {
             !!status.get('group') &&
-            <Fragment>
+            <React.Fragment>
               <DotTextSeperator />
               <Button
                 isText
@@ -101,12 +101,12 @@ class CommentHeader extends ImmutablePureComponent {
                   {status.getIn(['group', 'title'])}
                 </Text>
               </Button>
-            </Fragment>
+            </React.Fragment>
           }
 
           {
             status.get('revised_at') !== null &&
-            <Fragment>
+            <React.Fragment>
               <DotTextSeperator />
               <Button
                 isText
@@ -120,12 +120,12 @@ class CommentHeader extends ImmutablePureComponent {
                   {intl.formatMessage(messages.edited)}
                 </Text>
               </Button>
-            </Fragment>
+            </React.Fragment>
           }
 
           {
             favoriteCount > 0 &&
-            <Fragment>
+            <React.Fragment>
               <DotTextSeperator />
                 <Button
                   isText
@@ -141,12 +141,12 @@ class CommentHeader extends ImmutablePureComponent {
                   })}
                 </Text>
               </Button>
-            </Fragment>
+            </React.Fragment>
           }
 
           {
             repostCount > 0 &&
-            <Fragment>
+            <React.Fragment>
               <DotTextSeperator />
                 <Button
                   isText
@@ -162,7 +162,7 @@ class CommentHeader extends ImmutablePureComponent {
                   })}
                 </Text>
               </Button>
-            </Fragment>
+            </React.Fragment>
           }
 
           <DotTextSeperator />
diff --git a/app/javascript/gabsocial/components/comment_list.js b/app/javascript/gabsocial/components/comment_list.js
index 6ebcf1cb..ca540fef 100644
--- a/app/javascript/gabsocial/components/comment_list.js
+++ b/app/javascript/gabsocial/components/comment_list.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import Button from './button'
@@ -31,7 +31,7 @@ export default class CommentList extends ImmutablePureComponent {
     const Wrapper = !commentsLimited ? ScrollableList : Dummy
 
     return (
-      <Fragment>
+      <React.Fragment>
         <Wrapper scrollKey='comments'>
           {
             descendants.slice(0, max).map((descendant, i) => (
@@ -67,7 +67,7 @@ export default class CommentList extends ImmutablePureComponent {
             </div>
           </div>
         }
-      </Fragment>
+      </React.Fragment>
     )
   }
 
diff --git a/app/javascript/gabsocial/components/composer.js b/app/javascript/gabsocial/components/composer.js
index f6a7411b..55125711 100644
--- a/app/javascript/gabsocial/components/composer.js
+++ b/app/javascript/gabsocial/components/composer.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import {
   getDefaultKeyBinding,
   Editor,
@@ -110,7 +111,7 @@ const GROUP_HANDLE_REGEX = /\g\/[\w]+/g
 const HANDLE_REGEX = /\@[\w]+/g
 const HASHTAG_REGEX = /\#[\w\u0590-\u05ff]+/g
 
-export default class Composer extends PureComponent {
+export default class Composer extends React.PureComponent {
 
   static propTypes = {
     inputRef: PropTypes.func,
diff --git a/app/javascript/gabsocial/components/display_name.js b/app/javascript/gabsocial/components/display_name.js
index d30744fb..5ded6ad1 100644
--- a/app/javascript/gabsocial/components/display_name.js
+++ b/app/javascript/gabsocial/components/display_name.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import debounce from 'lodash.debounce'
diff --git a/app/javascript/gabsocial/components/divider.js b/app/javascript/gabsocial/components/divider.js
index c50a998d..dc3a248b 100644
--- a/app/javascript/gabsocial/components/divider.js
+++ b/app/javascript/gabsocial/components/divider.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { CX } from '../constants'
 
 /**
@@ -5,7 +6,7 @@ import { CX } from '../constants'
  * @param {bool} [props.isInvisible] - to style the tab bar larger
  * @param {bool} [props.isSmall] - if item is active
  */
-export default class Divider extends PureComponent {
+export default class Divider extends React.PureComponent {
 
   static propTypes = {
     isInvisible: PropTypes.bool,
diff --git a/app/javascript/gabsocial/components/dot_text_seperator.js b/app/javascript/gabsocial/components/dot_text_seperator.js
index f3a587d8..494e6b08 100644
--- a/app/javascript/gabsocial/components/dot_text_seperator.js
+++ b/app/javascript/gabsocial/components/dot_text_seperator.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import Text from './text'
 
-export default class DotTextSeperator extends PureComponent {
+export default class DotTextSeperator extends React.PureComponent {
 
   render() {
     return (
diff --git a/app/javascript/gabsocial/components/dummy.js b/app/javascript/gabsocial/components/dummy.js
index b7a25d75..a9c8708b 100644
--- a/app/javascript/gabsocial/components/dummy.js
+++ b/app/javascript/gabsocial/components/dummy.js
@@ -1,4 +1,6 @@
-export default class Dummy extends PureComponent {
+import React from 'react'
+
+export default class Dummy extends React.PureComponent {
 
   render() {
     return (
diff --git a/app/javascript/gabsocial/components/error_boundary.js b/app/javascript/gabsocial/components/error_boundary.js
index 89205692..c9694b83 100644
--- a/app/javascript/gabsocial/components/error_boundary.js
+++ b/app/javascript/gabsocial/components/error_boundary.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { FormattedMessage } from 'react-intl'
 import {
   source_url,
@@ -13,7 +14,7 @@ import Divider from './divider'
 import Icon from './icon'
 import Text from './text'
 
-export default class ErrorBoundary extends PureComponent {
+export default class ErrorBoundary extends React.PureComponent {
 
   static propTypes = {
     children: PropTypes.node,
diff --git a/app/javascript/gabsocial/components/extended_video_player.js b/app/javascript/gabsocial/components/extended_video_player.js
index 70c27491..eb8f14b8 100644
--- a/app/javascript/gabsocial/components/extended_video_player.js
+++ b/app/javascript/gabsocial/components/extended_video_player.js
@@ -1,4 +1,6 @@
-export default class ExtendedVideoPlayer extends PureComponent {
+import React from 'react'
+
+export default class ExtendedVideoPlayer extends React.PureComponent {
 
   static propTypes = {
     src: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/file_input.js b/app/javascript/gabsocial/components/file_input.js
index 8d255659..03ebe43f 100644
--- a/app/javascript/gabsocial/components/file_input.js
+++ b/app/javascript/gabsocial/components/file_input.js
@@ -1,9 +1,10 @@
+import React from 'react'
 import { CX } from '../constants'
 import Icon from './icon'
 import Image from './image'
 import Text from './text'
 
-export default class FileInput extends PureComponent {
+export default class FileInput extends React.PureComponent {
 
   static propTypes = {
     onChange: PropTypes.func,
diff --git a/app/javascript/gabsocial/components/floating_action_button.js b/app/javascript/gabsocial/components/floating_action_button.js
index d80e723b..e8c09dc0 100644
--- a/app/javascript/gabsocial/components/floating_action_button.js
+++ b/app/javascript/gabsocial/components/floating_action_button.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { me } from '../initial_state'
 import { CX } from '../constants'
@@ -15,7 +16,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(null, mapDispatchToProps)
-class FloatingActionButton extends PureComponent {
+class FloatingActionButton extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/footer_bar.js b/app/javascript/gabsocial/components/footer_bar.js
index cbe7ae9e..de401e10 100644
--- a/app/javascript/gabsocial/components/footer_bar.js
+++ b/app/javascript/gabsocial/components/footer_bar.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { withRouter } from 'react-router-dom'
 import { me } from '../initial_state'
 import { CX } from '../constants'
@@ -11,7 +12,7 @@ const mapStateToProps = (state) => ({
 export default
 @withRouter
 @connect(mapStateToProps)
-class FooterBar extends PureComponent {
+class FooterBar extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
diff --git a/app/javascript/gabsocial/components/form.js b/app/javascript/gabsocial/components/form.js
index 9df03b40..9a0bbf23 100644
--- a/app/javascript/gabsocial/components/form.js
+++ b/app/javascript/gabsocial/components/form.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import Text from './text'
 
-export default class Form extends PureComponent {
+export default class Form extends React.PureComponent {
 
   static propTypes = {
     children: PropTypes.any,
diff --git a/app/javascript/gabsocial/components/global_footer.js b/app/javascript/gabsocial/components/global_footer.js
index 6f49a7ee..8bfd2f24 100644
--- a/app/javascript/gabsocial/components/global_footer.js
+++ b/app/javascript/gabsocial/components/global_footer.js
@@ -1,10 +1,11 @@
+import React from 'react'
 import Button from './button'
 import Heading from './heading'
 import Icon from './icon'
 import Text from './text'
 import ResponsiveClassesComponent from '../features/ui/util/responsive_classes_component'
 
-export default class GlobalFooter extends PureComponent {
+export default class GlobalFooter extends React.PureComponent {
 
   render() {
 
@@ -158,7 +159,7 @@ export default class GlobalFooter extends PureComponent {
 
 }
 
-class GlobalFooterColumn extends PureComponent {
+class GlobalFooterColumn extends React.PureComponent {
 
   static propTypes = {
     title: PropTypes.string,
diff --git a/app/javascript/gabsocial/components/group_collection_item.js b/app/javascript/gabsocial/components/group_collection_item.js
index 6c902455..e1ce821b 100644
--- a/app/javascript/gabsocial/components/group_collection_item.js
+++ b/app/javascript/gabsocial/components/group_collection_item.js
@@ -1,6 +1,6 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
-import { Fragment } from 'react'
 import { NavLink } from 'react-router-dom'
 import { defineMessages, injectIntl } from 'react-intl'
 import classNames from 'classnames/bind'
@@ -52,11 +52,11 @@ class GroupCollectionItem extends ImmutablePureComponent {
 
     if (isHidden) {
       return (
-        <Fragment>
+        <React.Fragment>
           {group.get('title')}
           {isMember && intl.formatMessage(messages.member)}
           {isAdmin && intl.formatMessage(messages.admin)}
-        </Fragment>
+        </React.Fragment>
       )
     }
 
diff --git a/app/javascript/gabsocial/components/group_header.js b/app/javascript/gabsocial/components/group_header.js
index 3134d3c4..44339b12 100644
--- a/app/javascript/gabsocial/components/group_header.js
+++ b/app/javascript/gabsocial/components/group_header.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/group_list_item.js b/app/javascript/gabsocial/components/group_list_item.js
index 3481a44b..bc20cba9 100644
--- a/app/javascript/gabsocial/components/group_list_item.js
+++ b/app/javascript/gabsocial/components/group_list_item.js
@@ -1,6 +1,6 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
-import { Fragment } from 'react'
 import { NavLink } from 'react-router-dom'
 import { defineMessages, injectIntl } from 'react-intl'
 import { joinGroup, leaveGroup } from '../actions/groups'
@@ -83,9 +83,9 @@ class GroupListItem extends ImmutablePureComponent {
     
     if (isHidden) {
       return (
-        <Fragment>
+        <React.Fragment>
           {group.get('title')}
-        </Fragment>
+        </React.Fragment>
       )
     }
     
diff --git a/app/javascript/gabsocial/components/group_sort_block.js b/app/javascript/gabsocial/components/group_sort_block.js
index b0e29a77..452d952f 100644
--- a/app/javascript/gabsocial/components/group_sort_block.js
+++ b/app/javascript/gabsocial/components/group_sort_block.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { openPopover } from '../actions/popover'
 import {
@@ -53,7 +54,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class GroupSortBlock extends PureComponent {
+class GroupSortBlock extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/hashtag_item.js b/app/javascript/gabsocial/components/hashtag_item.js
index c51225c2..da91e3fb 100644
--- a/app/javascript/gabsocial/components/hashtag_item.js
+++ b/app/javascript/gabsocial/components/hashtag_item.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { FormattedMessage } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
diff --git a/app/javascript/gabsocial/components/heading.js b/app/javascript/gabsocial/components/heading.js
index 2c3b2610..20115342 100644
--- a/app/javascript/gabsocial/components/heading.js
+++ b/app/javascript/gabsocial/components/heading.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import classNames from 'classnames/bind'
 
 // Bind CSS Modules global variable `_s` to classNames module
@@ -27,7 +28,7 @@ const ARIA_LEVELS = {
  * @param {bool} [props.isCentered] - if text is centered within the element
  * @param {string} [props.size='h1'] - the size of the heading
  */
-export default class Heading extends PureComponent {
+export default class Heading extends React.PureComponent {
 
   static propTypes = {
     children: PropTypes.any,
diff --git a/app/javascript/gabsocial/components/icon.js b/app/javascript/gabsocial/components/icon.js
index a7362fa8..03072ea5 100644
--- a/app/javascript/gabsocial/components/icon.js
+++ b/app/javascript/gabsocial/components/icon.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import { CX } from '../constants'
 
-export default class Icon extends PureComponent {
+export default class Icon extends React.PureComponent {
 
   static propTypes = {
     className: PropTypes.string,
diff --git a/app/javascript/gabsocial/components/image.js b/app/javascript/gabsocial/components/image.js
index da4962d3..9c9e8674 100644
--- a/app/javascript/gabsocial/components/image.js
+++ b/app/javascript/gabsocial/components/image.js
@@ -1,8 +1,9 @@
+import React from 'react'
 import classNames from 'classnames/bind'
 
 const cx = classNames.bind(_s)
 
-export default class Image extends PureComponent {
+export default class Image extends React.PureComponent {
 
   static propTypes = {
     alt: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/image_loader.js b/app/javascript/gabsocial/components/image_loader.js
index 49e9cc02..233675bd 100644
--- a/app/javascript/gabsocial/components/image_loader.js
+++ b/app/javascript/gabsocial/components/image_loader.js
@@ -1,8 +1,9 @@
+import React from 'react'
 import { LoadingBar } from 'react-redux-loading-bar'
 import { CX  } from '../constants'
 import ZoomableImage from './zoomable_image'
 
-export default class ImageLoader extends PureComponent {
+export default class ImageLoader extends React.PureComponent {
 
   static propTypes = {
     alt: PropTypes.string,
diff --git a/app/javascript/gabsocial/components/input.js b/app/javascript/gabsocial/components/input.js
index 01661ef3..05e081e3 100644
--- a/app/javascript/gabsocial/components/input.js
+++ b/app/javascript/gabsocial/components/input.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import classNames from 'classnames/bind'
 import Button from './button'
 import Icon from './icon'
@@ -6,7 +6,7 @@ import Text from './text'
 
 const cx = classNames.bind(_s)
 
-export default class Input extends PureComponent {
+export default class Input extends React.PureComponent {
 
   static propTypes = {
     placeholder: PropTypes.string,
@@ -80,7 +80,7 @@ export default class Input extends PureComponent {
     })
 
     return (
-      <Fragment>
+      <React.Fragment>
         {
           !!title && !hideLabel &&
           <div className={[_s.default, _s.mb10, _s.pl15].join(' ')}>
@@ -128,7 +128,7 @@ export default class Input extends PureComponent {
             />
           }
         </div>
-      </Fragment>
+      </React.Fragment>
     )
   }
 }
\ No newline at end of file
diff --git a/app/javascript/gabsocial/components/intersection_observer_article.js b/app/javascript/gabsocial/components/intersection_observer_article.js
index 0f124d5d..2d0a85dc 100644
--- a/app/javascript/gabsocial/components/intersection_observer_article.js
+++ b/app/javascript/gabsocial/components/intersection_observer_article.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { is } from 'immutable'
 import { setHeight } from '../actions/height_cache'
 import scheduleIdleTask from '../utils/schedule_idle_task'
diff --git a/app/javascript/gabsocial/components/link_footer.js b/app/javascript/gabsocial/components/link_footer.js
index efb0dc4a..b85fe0d9 100644
--- a/app/javascript/gabsocial/components/link_footer.js
+++ b/app/javascript/gabsocial/components/link_footer.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import {
   FormattedMessage,
   defineMessages,
@@ -36,7 +37,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @connect(null, mapDispatchToProps)
 @injectIntl
-class LinkFooter extends PureComponent {
+class LinkFooter extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/list.js b/app/javascript/gabsocial/components/list.js
index c12be045..00fc0c9f 100644
--- a/app/javascript/gabsocial/components/list.js
+++ b/app/javascript/gabsocial/components/list.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import Block from './block'
diff --git a/app/javascript/gabsocial/components/list_item.js b/app/javascript/gabsocial/components/list_item.js
index 61706828..034cfe15 100644
--- a/app/javascript/gabsocial/components/list_item.js
+++ b/app/javascript/gabsocial/components/list_item.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import classNames from 'classnames/bind'
 import Button from './button'
 import Icon from './icon'
@@ -7,7 +7,7 @@ import Text from './text'
 
 const cx = classNames.bind(_s)
 
-export default class ListItem extends PureComponent {
+export default class ListItem extends React.PureComponent {
 
   static propTypes = {
     icon: PropTypes.string,
@@ -59,9 +59,9 @@ export default class ListItem extends PureComponent {
 
     if (isHidden) {
       return (
-        <Fragment>
+        <React.Fragment>
           {title}
-        </Fragment>
+        </React.Fragment>
       )
     }
 
diff --git a/app/javascript/gabsocial/components/load_more.js b/app/javascript/gabsocial/components/load_more.js
index d29f18f8..28a74533 100644
--- a/app/javascript/gabsocial/components/load_more.js
+++ b/app/javascript/gabsocial/components/load_more.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import Button from './button'
 import Text from './text'
@@ -8,7 +9,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class LoadMore extends PureComponent {
+class LoadMore extends React.PureComponent {
 
   static propTypes = {
     onClick: PropTypes.func,
diff --git a/app/javascript/gabsocial/components/loading_bar.js b/app/javascript/gabsocial/components/loading_bar.js
index 39d54802..93bc43b3 100644
--- a/app/javascript/gabsocial/components/loading_bar.js
+++ b/app/javascript/gabsocial/components/loading_bar.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import LoadingBar from 'react-redux-loading-bar'
 
 const mapStateToProps = (state, ownProps) => ({
diff --git a/app/javascript/gabsocial/components/logged_out_navigation_bar.js b/app/javascript/gabsocial/components/logged_out_navigation_bar.js
index b1e577d3..4be567f0 100644
--- a/app/javascript/gabsocial/components/logged_out_navigation_bar.js
+++ b/app/javascript/gabsocial/components/logged_out_navigation_bar.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { BREAKPOINT_EXTRA_SMALL } from '../constants'
 import Button from './button'
 import NavigationBarButton from './navigation_bar_button'
@@ -6,7 +7,7 @@ import Text from './text'
 import ResponsiveComponent from '../features/ui/util/responsive_component'
 import ResponsiveClassesComponent from '../features/ui/util/responsive_classes_component'
 
-export default class LoggedOutNavigationBar extends PureComponent {
+export default class LoggedOutNavigationBar extends React.PureComponent {
 
   static propTypes = {
     isProfile: PropTypes.bool,
diff --git a/app/javascript/gabsocial/components/logged_out_sidebar.js b/app/javascript/gabsocial/components/logged_out_sidebar.js
index 52f14a09..4e563267 100644
--- a/app/javascript/gabsocial/components/logged_out_sidebar.js
+++ b/app/javascript/gabsocial/components/logged_out_sidebar.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { me } from '../initial_state'
 import SidebarSectionTitle from './sidebar_section_title'
@@ -12,7 +13,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class Sidebar extends PureComponent {
+class Sidebar extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/media_gallery.js b/app/javascript/gabsocial/components/media_gallery.js
index cbd4602d..1c48ee52 100644
--- a/app/javascript/gabsocial/components/media_gallery.js
+++ b/app/javascript/gabsocial/components/media_gallery.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { is } from 'immutable';
@@ -238,7 +239,7 @@ class Item extends ImmutablePureComponent {
 
 export default
 @injectIntl
-class MediaGallery extends PureComponent {
+class MediaGallery extends React.PureComponent {
 
   static propTypes = {
     sensitive: PropTypes.bool,
diff --git a/app/javascript/gabsocial/components/media_item.js b/app/javascript/gabsocial/components/media_item.js
index c741c296..4bfb1f66 100644
--- a/app/javascript/gabsocial/components/media_item.js
+++ b/app/javascript/gabsocial/components/media_item.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { NavLink } from 'react-router-dom'
diff --git a/app/javascript/gabsocial/components/modal/block_account_modal.js b/app/javascript/gabsocial/components/modal/block_account_modal.js
index 52d7b43d..269bcc7c 100644
--- a/app/javascript/gabsocial/components/modal/block_account_modal.js
+++ b/app/javascript/gabsocial/components/modal/block_account_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { makeGetAccount } from '../../selectors'
 import { blockAccount } from '../../actions/accounts'
@@ -26,7 +27,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-class BlockAccountModal extends PureComponent {
+class BlockAccountModal extends React.PureComponent {
 
   static propTypes = {
     account: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/modal/boost_modal.js b/app/javascript/gabsocial/components/modal/boost_modal.js
index 4527c651..0de33b5b 100644
--- a/app/javascript/gabsocial/components/modal/boost_modal.js
+++ b/app/javascript/gabsocial/components/modal/boost_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/modal/bundle_error_modal.js b/app/javascript/gabsocial/components/modal/bundle_error_modal.js
index c006cb8b..f1d5b7ea 100644
--- a/app/javascript/gabsocial/components/modal/bundle_error_modal.js
+++ b/app/javascript/gabsocial/components/modal/bundle_error_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ConfirmationModal from './confirmation_modal'
 
@@ -9,7 +10,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class BundleErrorModal extends PureComponent {
+class BundleErrorModal extends React.PureComponent {
 
   static propTypes = {
     onRetry: PropTypes.func.isRequired,
diff --git a/app/javascript/gabsocial/components/modal/community_timeline_settings_modal.js b/app/javascript/gabsocial/components/modal/community_timeline_settings_modal.js
index 05b654d0..4220d8e0 100644
--- a/app/javascript/gabsocial/components/modal/community_timeline_settings_modal.js
+++ b/app/javascript/gabsocial/components/modal/community_timeline_settings_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/modal/compose_modal.js b/app/javascript/gabsocial/components/modal/compose_modal.js
index 54c297c2..3ad685c7 100644
--- a/app/javascript/gabsocial/components/modal/compose_modal.js
+++ b/app/javascript/gabsocial/components/modal/compose_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { openModal } from '../../actions/modal'
diff --git a/app/javascript/gabsocial/components/modal/confirmation_modal.js b/app/javascript/gabsocial/components/modal/confirmation_modal.js
index 22557956..1f693fd1 100644
--- a/app/javascript/gabsocial/components/modal/confirmation_modal.js
+++ b/app/javascript/gabsocial/components/modal/confirmation_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, FormattedMessage } from 'react-intl'
 import Block from '../block'
 import Button from '../button'
@@ -6,7 +7,7 @@ import Text from '../text'
 
 export default
 @injectIntl
-class ConfirmationModal extends PureComponent {
+class ConfirmationModal extends React.PureComponent {
 
   static propTypes = {
     title: PropTypes.any.isRequired,
diff --git a/app/javascript/gabsocial/components/modal/display_options_modal.js b/app/javascript/gabsocial/components/modal/display_options_modal.js
index e44f9d8e..8ff8e5e6 100644
--- a/app/javascript/gabsocial/components/modal/display_options_modal.js
+++ b/app/javascript/gabsocial/components/modal/display_options_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
@@ -198,7 +199,7 @@ class DisplayOptionsModal extends ImmutablePureComponent {
 
 }
 
-class ThemeBlock extends PureComponent {
+class ThemeBlock extends React.PureComponent {
 
   static propTypes = {
     checked: PropTypes.bool,
diff --git a/app/javascript/gabsocial/components/modal/edit_profile_modal.js b/app/javascript/gabsocial/components/modal/edit_profile_modal.js
index bf036acf..fe6b6801 100644
--- a/app/javascript/gabsocial/components/modal/edit_profile_modal.js
+++ b/app/javascript/gabsocial/components/modal/edit_profile_modal.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
@@ -183,7 +183,7 @@ class EditProfileModal extends ImmutablePureComponent {
               <div className={[_s.default, _s.py5, _s.px15, _s.mt5, _s.mb15, _s.width100PC].join(' ')}>
                 {
                   !isVerified &&
-                  <Fragment>
+                  <React.Fragment>
                     <Input
                       id='display-name'
                       title='Display name'
@@ -192,7 +192,7 @@ class EditProfileModal extends ImmutablePureComponent {
                       onBlur={this.handleDisplayNameBlur}
                     />
                     <Divider isInvisible />
-                  </Fragment>
+                  </React.Fragment>
                 }
 
                 <Textarea
diff --git a/app/javascript/gabsocial/components/modal/edit_shortcuts_modal.js b/app/javascript/gabsocial/components/modal/edit_shortcuts_modal.js
index 9572013b..68fde80d 100644
--- a/app/javascript/gabsocial/components/modal/edit_shortcuts_modal.js
+++ b/app/javascript/gabsocial/components/modal/edit_shortcuts_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/modal/embed_modal.js b/app/javascript/gabsocial/components/modal/embed_modal.js
index da71eaa6..75e8eeda 100644
--- a/app/javascript/gabsocial/components/modal/embed_modal.js
+++ b/app/javascript/gabsocial/components/modal/embed_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl } from 'react-intl'
 import api from '../../api'
diff --git a/app/javascript/gabsocial/components/modal/feature_modal.js b/app/javascript/gabsocial/components/modal/feature_modal.js
index c0ce5363..fd33d9f3 100644
--- a/app/javascript/gabsocial/components/modal/feature_modal.js
+++ b/app/javascript/gabsocial/components/modal/feature_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { FormattedMessage } from 'react-intl';
diff --git a/app/javascript/gabsocial/components/modal/gif_picker_modal.js b/app/javascript/gabsocial/components/modal/gif_picker_modal.js
index a1348466..4af1eaf6 100644
--- a/app/javascript/gabsocial/components/modal/gif_picker_modal.js
+++ b/app/javascript/gabsocial/components/modal/gif_picker_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import {
   fetchGifCategories,
@@ -64,7 +65,7 @@ const mapDispatchToProps = (dispatch, { onClose }) => ({
 export default
 @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-class GifPickerModal extends PureComponent {
+class GifPickerModal extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
@@ -165,7 +166,7 @@ class GifPickerModal extends PureComponent {
   }
 }
 
-class GifResultsCollectionColumn extends PureComponent {
+class GifResultsCollectionColumn extends React.PureComponent {
 
   static propTypes = {
     results: PropTypes.array.isRequired,
@@ -201,7 +202,7 @@ class GifResultsCollectionColumn extends PureComponent {
 
 }
 
-class GifResultsCollection extends PureComponent {
+class GifResultsCollection extends React.PureComponent {
 
   static propTypes = {
     results: PropTypes.array.isRequired,
@@ -234,7 +235,7 @@ class GifResultsCollection extends PureComponent {
   }
 }
 
-class GifCategoriesCollection extends PureComponent {
+class GifCategoriesCollection extends React.PureComponent {
   static propTypes = {
     categories: PropTypes.array.isRequired,
     handleSelectCategory: PropTypes.func.isRequired,
diff --git a/app/javascript/gabsocial/components/modal/group_create_modal.js b/app/javascript/gabsocial/components/modal/group_create_modal.js
index 8e43314a..dbf19676 100644
--- a/app/javascript/gabsocial/components/modal/group_create_modal.js
+++ b/app/javascript/gabsocial/components/modal/group_create_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ModalLayout from './modal_layout'
 import GroupCreate from '../../features/group_create'
@@ -9,7 +10,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class GroupCreateModal extends PureComponent {
+class GroupCreateModal extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/modal/group_delete_modal.js b/app/javascript/gabsocial/components/modal/group_delete_modal.js
index 880093f0..af028d14 100644
--- a/app/javascript/gabsocial/components/modal/group_delete_modal.js
+++ b/app/javascript/gabsocial/components/modal/group_delete_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { makeGetAccount } from '../../selectors'
 import { blockAccount } from '../../actions/accounts'
@@ -18,7 +19,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @connect(null, mapDispatchToProps)
 @injectIntl
-class GroupDeleteModal extends PureComponent {
+class GroupDeleteModal extends React.PureComponent {
 
   static propTypes = {
     group: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/modal/group_timeline_settings_modal.js b/app/javascript/gabsocial/components/modal/group_timeline_settings_modal.js
index ce60a840..8fda0793 100644
--- a/app/javascript/gabsocial/components/modal/group_timeline_settings_modal.js
+++ b/app/javascript/gabsocial/components/modal/group_timeline_settings_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import Button from '../button'
diff --git a/app/javascript/gabsocial/components/modal/hashtag_timeline_settings_modal.js b/app/javascript/gabsocial/components/modal/hashtag_timeline_settings_modal.js
index 052fc4e5..cbcba645 100644
--- a/app/javascript/gabsocial/components/modal/hashtag_timeline_settings_modal.js
+++ b/app/javascript/gabsocial/components/modal/hashtag_timeline_settings_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/modal/home_timeline_settings_modal.js b/app/javascript/gabsocial/components/modal/home_timeline_settings_modal.js
index 9abe6376..198af1c3 100644
--- a/app/javascript/gabsocial/components/modal/home_timeline_settings_modal.js
+++ b/app/javascript/gabsocial/components/modal/home_timeline_settings_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/modal/hotkeys_modal.js b/app/javascript/gabsocial/components/modal/hotkeys_modal.js
index 8bceac98..176493b5 100644
--- a/app/javascript/gabsocial/components/modal/hotkeys_modal.js
+++ b/app/javascript/gabsocial/components/modal/hotkeys_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ModalLayout from './modal_layout'
@@ -126,7 +127,7 @@ class HotkeysModal extends ImmutablePureComponent {
 
 }
 
-class HotKeysModalRow extends PureComponent {
+class HotKeysModalRow extends React.PureComponent {
   static propTypes = {
     hotkey: PropTypes.string.isRequired,
     action: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/modal/list_add_user_modal.js b/app/javascript/gabsocial/components/modal/list_add_user_modal.js
index 8bd00a43..9c5b0167 100644
--- a/app/javascript/gabsocial/components/modal/list_add_user_modal.js
+++ b/app/javascript/gabsocial/components/modal/list_add_user_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/modal/list_create_modal.js b/app/javascript/gabsocial/components/modal/list_create_modal.js
index e2d70c56..87cd5503 100644
--- a/app/javascript/gabsocial/components/modal/list_create_modal.js
+++ b/app/javascript/gabsocial/components/modal/list_create_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ModalLayout from './modal_layout'
diff --git a/app/javascript/gabsocial/components/modal/list_delete_modal.js b/app/javascript/gabsocial/components/modal/list_delete_modal.js
index c6a8692b..d3099430 100644
--- a/app/javascript/gabsocial/components/modal/list_delete_modal.js
+++ b/app/javascript/gabsocial/components/modal/list_delete_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { injectIntl, defineMessages } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/modal/list_editor_modal.js b/app/javascript/gabsocial/components/modal/list_editor_modal.js
index c4e589da..936ed898 100644
--- a/app/javascript/gabsocial/components/modal/list_editor_modal.js
+++ b/app/javascript/gabsocial/components/modal/list_editor_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ModalLayout from './modal_layout'
diff --git a/app/javascript/gabsocial/components/modal/list_timeline_settings_modal.js b/app/javascript/gabsocial/components/modal/list_timeline_settings_modal.js
index ddccf381..b31ec255 100644
--- a/app/javascript/gabsocial/components/modal/list_timeline_settings_modal.js
+++ b/app/javascript/gabsocial/components/modal/list_timeline_settings_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/modal/loading_modal.js b/app/javascript/gabsocial/components/modal/loading_modal.js
index d230f8cf..6d9cdfd6 100644
--- a/app/javascript/gabsocial/components/modal/loading_modal.js
+++ b/app/javascript/gabsocial/components/modal/loading_modal.js
@@ -1,7 +1,8 @@
+import React from 'react'
 import Block from '../block'
 import ColumnIndicator from '../column_indicator'
 
-export default class LoadingModal extends PureComponent {
+export default class LoadingModal extends React.PureComponent {
 
   render() {
     return (
diff --git a/app/javascript/gabsocial/components/modal/media_modal.js b/app/javascript/gabsocial/components/modal/media_modal.js
index 491ef9ff..c31c264e 100644
--- a/app/javascript/gabsocial/components/modal/media_modal.js
+++ b/app/javascript/gabsocial/components/modal/media_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ReactSwipeableViews from 'react-swipeable-views'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/modal/modal_base.js b/app/javascript/gabsocial/components/modal/modal_base.js
index c7edac23..c95f7ab5 100644
--- a/app/javascript/gabsocial/components/modal/modal_base.js
+++ b/app/javascript/gabsocial/components/modal/modal_base.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { injectIntl, FormattedMessage, defineMessages } from 'react-intl'
 import { getWindowDimension } from '../../utils/is_mobile'
 import { openModal } from '../../actions/modal'
@@ -33,7 +33,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-class ModalBase extends PureComponent {
+class ModalBase extends React.PureComponent {
 
   static propTypes = {
     children: PropTypes.node,
@@ -167,7 +167,7 @@ class ModalBase extends PureComponent {
       <div ref={this.setRef} className={containerClasses}>
         {
           !!visible &&
-          <Fragment>
+          <React.Fragment>
             <div
               role='presentation'
               className={[_s.default, _s.bgBlackOpaque, _s.posFixed, _s.z3, _s.top0, _s.right0, _s.bottom0, _s.left0].join(' ')}
@@ -180,7 +180,7 @@ class ModalBase extends PureComponent {
             >
               {children}
             </div>
-          </Fragment>
+          </React.Fragment>
         }
       </div>
     )
diff --git a/app/javascript/gabsocial/components/modal/modal_layout.js b/app/javascript/gabsocial/components/modal/modal_layout.js
index dc1a6232..b0bbe962 100644
--- a/app/javascript/gabsocial/components/modal/modal_layout.js
+++ b/app/javascript/gabsocial/components/modal/modal_layout.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import classNames from 'classnames/bind'
 import Button from '../button'
@@ -12,7 +13,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class ModalLayout extends PureComponent {
+class ModalLayout extends React.PureComponent {
 
   static propTypes = {
     title: PropTypes.string,
diff --git a/app/javascript/gabsocial/components/modal/modal_root.js b/app/javascript/gabsocial/components/modal/modal_root.js
index e478547d..d587db9b 100644
--- a/app/javascript/gabsocial/components/modal/modal_root.js
+++ b/app/javascript/gabsocial/components/modal/modal_root.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { closeModal } from '../../actions/modal'
 import { cancelReplyCompose } from '../../actions/compose'
 import Bundle from '../../features/ui/util/bundle'
@@ -130,7 +131,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export default
 @connect(mapStateToProps, mapDispatchToProps)
-class ModalRoot extends PureComponent {
+class ModalRoot extends React.PureComponent {
 
   static propTypes = {
     type: PropTypes.string,
diff --git a/app/javascript/gabsocial/components/modal/mute_modal.js b/app/javascript/gabsocial/components/modal/mute_modal.js
index da529464..c41d8a16 100644
--- a/app/javascript/gabsocial/components/modal/mute_modal.js
+++ b/app/javascript/gabsocial/components/modal/mute_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { makeGetAccount } from '../../selectors'
 import { muteAccount } from '../../actions/accounts'
@@ -26,7 +27,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-class MuteModal extends PureComponent {
+class MuteModal extends React.PureComponent {
 
   static propTypes = {
     account: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/modal/pro_upgrade_modal.js b/app/javascript/gabsocial/components/modal/pro_upgrade_modal.js
index 9ca44e07..f3c56089 100644
--- a/app/javascript/gabsocial/components/modal/pro_upgrade_modal.js
+++ b/app/javascript/gabsocial/components/modal/pro_upgrade_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import {
diff --git a/app/javascript/gabsocial/components/modal/report_modal.js b/app/javascript/gabsocial/components/modal/report_modal.js
index 69b0381d..3f6201f3 100644
--- a/app/javascript/gabsocial/components/modal/report_modal.js
+++ b/app/javascript/gabsocial/components/modal/report_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { OrderedSet } from 'immutable'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/modal/status_likes_modal.js b/app/javascript/gabsocial/components/modal/status_likes_modal.js
index 384f9cd6..5ea7e7cf 100644
--- a/app/javascript/gabsocial/components/modal/status_likes_modal.js
+++ b/app/javascript/gabsocial/components/modal/status_likes_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/modal/status_reposts_modal.js b/app/javascript/gabsocial/components/modal/status_reposts_modal.js
index 146f2305..8ea3f95b 100644
--- a/app/javascript/gabsocial/components/modal/status_reposts_modal.js
+++ b/app/javascript/gabsocial/components/modal/status_reposts_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/modal/status_revisions_modal.js b/app/javascript/gabsocial/components/modal/status_revisions_modal.js
index 2ad6634b..9821d711 100644
--- a/app/javascript/gabsocial/components/modal/status_revisions_modal.js
+++ b/app/javascript/gabsocial/components/modal/status_revisions_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
diff --git a/app/javascript/gabsocial/components/modal/unauthorized_modal.js b/app/javascript/gabsocial/components/modal/unauthorized_modal.js
index 7bb4439f..b176dcbc 100644
--- a/app/javascript/gabsocial/components/modal/unauthorized_modal.js
+++ b/app/javascript/gabsocial/components/modal/unauthorized_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ModalLayout from './modal_layout'
diff --git a/app/javascript/gabsocial/components/modal/unfollow_modal.js b/app/javascript/gabsocial/components/modal/unfollow_modal.js
index 4fa268f3..7f55e0c4 100644
--- a/app/javascript/gabsocial/components/modal/unfollow_modal.js
+++ b/app/javascript/gabsocial/components/modal/unfollow_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { FormattedMessage } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/modal/video_modal.js b/app/javascript/gabsocial/components/modal/video_modal.js
index 844eecc8..02a0be4f 100644
--- a/app/javascript/gabsocial/components/modal/video_modal.js
+++ b/app/javascript/gabsocial/components/modal/video_modal.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { FormattedMessage } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/moved_note.js b/app/javascript/gabsocial/components/moved_note.js
index 83620d01..b486bc9a 100644
--- a/app/javascript/gabsocial/components/moved_note.js
+++ b/app/javascript/gabsocial/components/moved_note.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { FormattedMessage } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
diff --git a/app/javascript/gabsocial/components/navigation_bar.js b/app/javascript/gabsocial/components/navigation_bar.js
index d6c340fd..20022ce9 100644
--- a/app/javascript/gabsocial/components/navigation_bar.js
+++ b/app/javascript/gabsocial/components/navigation_bar.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { openSidebar } from '../actions/sidebar'
@@ -233,7 +234,7 @@ class NavigationBar extends ImmutablePureComponent {
 
 }
 
-class NavigationBarButtonDivider extends PureComponent {
+class NavigationBarButtonDivider extends React.PureComponent {
 
   render() {
     return (
diff --git a/app/javascript/gabsocial/components/navigation_bar_button.js b/app/javascript/gabsocial/components/navigation_bar_button.js
index deb01181..48a78ee3 100644
--- a/app/javascript/gabsocial/components/navigation_bar_button.js
+++ b/app/javascript/gabsocial/components/navigation_bar_button.js
@@ -1,9 +1,10 @@
+import React from 'react'
 import { CX } from '../constants'
 import Button from './button'
 import Icon from './icon'
 import Text from './text'
 
-export default class NavigationBarButton extends PureComponent {
+export default class NavigationBarButton extends React.PureComponent {
 
   static propTypes = {
     title: PropTypes.string,
diff --git a/app/javascript/gabsocial/components/notification.js b/app/javascript/gabsocial/components/notification.js
index f2ef4656..fe25f5b4 100644
--- a/app/javascript/gabsocial/components/notification.js
+++ b/app/javascript/gabsocial/components/notification.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { NavLink } from 'react-router-dom'
 import { injectIntl, defineMessages } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
@@ -103,14 +103,14 @@ class Notification extends ImmutablePureComponent {
 
     if (isHidden) {
       return (
-        <Fragment>
+        <React.Fragment>
           {
             accounts && accounts.slice(0, 1).map((account, i) => (
               <DisplayName key={i} account={account} noUsername />
             ))
           }
           {message}
-        </Fragment>
+        </React.Fragment>
       )
     }
 
@@ -164,12 +164,12 @@ class Notification extends ImmutablePureComponent {
                   </Text>
                   {
                     !!createdAt &&
-                    <Fragment>
+                    <React.Fragment>
                       <DotTextSeperator />
                       <Text size='small' color='tertiary' className={_s.ml5}>
                         <RelativeTimestamp timestamp={createdAt} />
                       </Text>
-                    </Fragment>
+                    </React.Fragment>
                   }
                 </div>
               </div>
diff --git a/app/javascript/gabsocial/components/pagination.js b/app/javascript/gabsocial/components/pagination.js
index f9b1738d..beb98c4b 100644
--- a/app/javascript/gabsocial/components/pagination.js
+++ b/app/javascript/gabsocial/components/pagination.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { CX } from '../constants'
 
 const COLORS = {
@@ -5,7 +6,7 @@ const COLORS = {
   brand: 'brand',
 }
 
-class Pagination extends PureComponent {
+class Pagination extends React.PureComponent {
 
   handleClickIndex = (i) => {
     this.props.onClick(i)
diff --git a/app/javascript/gabsocial/components/panel/group_info_panel.js b/app/javascript/gabsocial/components/panel/group_info_panel.js
index 1174a3fd..aff72749 100644
--- a/app/javascript/gabsocial/components/panel/group_info_panel.js
+++ b/app/javascript/gabsocial/components/panel/group_info_panel.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
@@ -72,7 +72,7 @@ class GroupInfoPanel extends ImmutablePureComponent {
         <div className={[_s.default].join(' ')}>
           {
             !!group &&
-            <Fragment>
+            <React.Fragment>
               <Heading isCentered>
                 {group.get('title')}
               </Heading>
@@ -103,7 +103,7 @@ class GroupInfoPanel extends ImmutablePureComponent {
                   {intl.formatMessage(messages.members)}
                 </Text>
               </div>
-            </Fragment>
+            </React.Fragment>
           }
         </div>
       )
@@ -113,7 +113,7 @@ class GroupInfoPanel extends ImmutablePureComponent {
       <PanelLayout title={intl.formatMessage(messages.title)}>
         {
           !!group &&
-          <Fragment>
+          <React.Fragment>
 
             <Text className={_s.mb5}>
               {group.get('description')}
@@ -185,7 +185,7 @@ class GroupInfoPanel extends ImmutablePureComponent {
             
             {
               !!tags &&
-              <Fragment>
+              <React.Fragment>
                 <Divider isSmall />
                 <GroupInfoPanelRow title={intl.formatMessage(messages.tags)} icon='shop'>
                   <div className={[_s.default, _s.flexRow, _s.justifyContentEnd, _s.flexWrap, _s.pl5].join(' ')}>
@@ -200,17 +200,17 @@ class GroupInfoPanel extends ImmutablePureComponent {
                     }
                   </div>
                 </GroupInfoPanelRow>
-              </Fragment>
+              </React.Fragment>
             }
 
-          </Fragment>
+          </React.Fragment>
         }
       </PanelLayout>
     )
   }
 }
 
-class GroupInfoPanelRow extends PureComponent {
+class GroupInfoPanelRow extends React.PureComponent {
 
   static propTypes = {
     icon: PropTypes.string,
diff --git a/app/javascript/gabsocial/components/panel/groups_panel.js b/app/javascript/gabsocial/components/panel/groups_panel.js
index e11c491c..cd3f6266 100644
--- a/app/javascript/gabsocial/components/panel/groups_panel.js
+++ b/app/javascript/gabsocial/components/panel/groups_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/panel/list_details_panel.js b/app/javascript/gabsocial/components/panel/list_details_panel.js
index 38258e7f..dbdb65f7 100644
--- a/app/javascript/gabsocial/components/panel/list_details_panel.js
+++ b/app/javascript/gabsocial/components/panel/list_details_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/panel/lists_panel.js b/app/javascript/gabsocial/components/panel/lists_panel.js
index 073d81ba..85f74fa8 100644
--- a/app/javascript/gabsocial/components/panel/lists_panel.js
+++ b/app/javascript/gabsocial/components/panel/lists_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/panel/media_gallery_panel.js b/app/javascript/gabsocial/components/panel/media_gallery_panel.js
index 92b869b2..b3fe56b9 100644
--- a/app/javascript/gabsocial/components/panel/media_gallery_panel.js
+++ b/app/javascript/gabsocial/components/panel/media_gallery_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/panel/notification_filter_panel.js b/app/javascript/gabsocial/components/panel/notification_filter_panel.js
index 3ba30759..f2b93af7 100644
--- a/app/javascript/gabsocial/components/panel/notification_filter_panel.js
+++ b/app/javascript/gabsocial/components/panel/notification_filter_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/panel/panel_layout.js b/app/javascript/gabsocial/components/panel/panel_layout.js
index f91ae1c1..91929d10 100644
--- a/app/javascript/gabsocial/components/panel/panel_layout.js
+++ b/app/javascript/gabsocial/components/panel/panel_layout.js
@@ -1,9 +1,10 @@
+import React from 'react'
 import Block from '../block'
 import Heading from '../heading'
 import Button from '../button'
 import Text from '../text'
 
-export default class PanelLayout extends PureComponent {
+export default class PanelLayout extends React.PureComponent {
 
   static propTypes = {
     title: PropTypes.string,
diff --git a/app/javascript/gabsocial/components/panel/pro_panel.js b/app/javascript/gabsocial/components/panel/pro_panel.js
index da27c810..113c9e9e 100644
--- a/app/javascript/gabsocial/components/panel/pro_panel.js
+++ b/app/javascript/gabsocial/components/panel/pro_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { URL_GAB_PRO } from '../../constants'
 import PanelLayout from './panel_layout';
@@ -12,7 +13,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class ProPanel extends PureComponent {
+class ProPanel extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/panel/profile_info_panel.js b/app/javascript/gabsocial/components/panel/profile_info_panel.js
index 5814c82f..ab9fb308 100644
--- a/app/javascript/gabsocial/components/panel/profile_info_panel.js
+++ b/app/javascript/gabsocial/components/panel/profile_info_panel.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
@@ -60,10 +60,10 @@ class ProfileInfoPanel extends ImmutablePureComponent {
         <div className={[_s.default].join(' ')}>
           {
             hasNote &&
-            <Fragment>
+            <React.Fragment>
               <div className={_s.dangerousContent} dangerouslySetInnerHTML={content} />
               <Divider isSmall />
-            </Fragment>
+            </React.Fragment>
           }
 
           <div className={[_s.default, _s.flexRow, _s.alignItemsCenter].join(' ')}>
@@ -83,7 +83,7 @@ class ProfileInfoPanel extends ImmutablePureComponent {
             
           {
             hasBadges &&
-            <Fragment>
+            <React.Fragment>
               <Divider isSmall />
               <div className={[_s.default, _s.flexRow, _s.alignItemsCenter].join(' ')}>
                 { 
@@ -105,7 +105,7 @@ class ProfileInfoPanel extends ImmutablePureComponent {
                   </div>
                 }
               </div>
-            </Fragment>
+            </React.Fragment>
           }
 
           {
@@ -113,7 +113,7 @@ class ProfileInfoPanel extends ImmutablePureComponent {
             <div className={[_s.default]}>
               {
                 fields.map((pair, i) => (
-                  <Fragment>
+                  <React.Fragment>
                     <Divider isSmall />
                     <dl className={[_s.default, _s.flexRow, _s.alignItemsCenter].join(' ')} key={`profile-field-${i}`}>
                       <dt
@@ -127,7 +127,7 @@ class ProfileInfoPanel extends ImmutablePureComponent {
                         dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }}
                       />
                     </dl>
-                  </Fragment>
+                  </React.Fragment>
                 ))
               }
             </div>
diff --git a/app/javascript/gabsocial/components/panel/profile_stats_panel.js b/app/javascript/gabsocial/components/panel/profile_stats_panel.js
index 8386cb8c..b7420559 100644
--- a/app/javascript/gabsocial/components/panel/profile_stats_panel.js
+++ b/app/javascript/gabsocial/components/panel/profile_stats_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/panel/progress_panel.js b/app/javascript/gabsocial/components/panel/progress_panel.js
index 8f4360fa..3638fcad 100644
--- a/app/javascript/gabsocial/components/panel/progress_panel.js
+++ b/app/javascript/gabsocial/components/panel/progress_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { monthlyExpensesComplete } from '../../initial_state'
 import {
@@ -18,7 +19,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class ProgressPanel extends PureComponent {
+class ProgressPanel extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/panel/search_filter_panel.js b/app/javascript/gabsocial/components/panel/search_filter_panel.js
index f51241d9..dd5622e2 100644
--- a/app/javascript/gabsocial/components/panel/search_filter_panel.js
+++ b/app/javascript/gabsocial/components/panel/search_filter_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/panel/shop_panel.js b/app/javascript/gabsocial/components/panel/shop_panel.js
index 7c6d40a0..702113c2 100644
--- a/app/javascript/gabsocial/components/panel/shop_panel.js
+++ b/app/javascript/gabsocial/components/panel/shop_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { fetchFeaturedProducts } from '../../actions/shop'
 import { URL_DISSENTER_SHOP } from '../../constants'
@@ -21,7 +22,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-class ShopPanel extends PureComponent {
+class ShopPanel extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/panel/sign_up_log_in_panel.js b/app/javascript/gabsocial/components/panel/sign_up_log_in_panel.js
index 8a3f0614..2a811408 100644
--- a/app/javascript/gabsocial/components/panel/sign_up_log_in_panel.js
+++ b/app/javascript/gabsocial/components/panel/sign_up_log_in_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { me } from '../../initial_state'
 import { CX } from '../../constants'
@@ -13,7 +14,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class SignUpLogInPanel extends PureComponent {
+class SignUpLogInPanel extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/panel/sign_up_panel.js b/app/javascript/gabsocial/components/panel/sign_up_panel.js
index 4f893be1..92567c20 100644
--- a/app/javascript/gabsocial/components/panel/sign_up_panel.js
+++ b/app/javascript/gabsocial/components/panel/sign_up_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { me } from '../../initial_state'
 import Button from '../button'
@@ -13,7 +14,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class SignUpPanel extends PureComponent {
+class SignUpPanel extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/panel/status_promotion_panel.js b/app/javascript/gabsocial/components/panel/status_promotion_panel.js
index 4ab896f9..ea724991 100644
--- a/app/javascript/gabsocial/components/panel/status_promotion_panel.js
+++ b/app/javascript/gabsocial/components/panel/status_promotion_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { NavLink } from 'react-router-dom'
 import { injectIntl, defineMessages } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/panel/trends_panel.js b/app/javascript/gabsocial/components/panel/trends_panel.js
index 2694aee5..f2d462fa 100644
--- a/app/javascript/gabsocial/components/panel/trends_panel.js
+++ b/app/javascript/gabsocial/components/panel/trends_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/panel/user_panel.js b/app/javascript/gabsocial/components/panel/user_panel.js
index 0622b99d..482d40f3 100644
--- a/app/javascript/gabsocial/components/panel/user_panel.js
+++ b/app/javascript/gabsocial/components/panel/user_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { NavLink } from 'react-router-dom'
 import { injectIntl, defineMessages } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/panel/verified_accounts_panel.js b/app/javascript/gabsocial/components/panel/verified_accounts_panel.js
index 0168eab1..1ce90f17 100644
--- a/app/javascript/gabsocial/components/panel/verified_accounts_panel.js
+++ b/app/javascript/gabsocial/components/panel/verified_accounts_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { fetchPopularSuggestions } from '../../actions/suggestions'
 import ImmutablePureComponent from 'react-immutable-pure-component'
diff --git a/app/javascript/gabsocial/components/panel/who_to_follow_panel.js b/app/javascript/gabsocial/components/panel/who_to_follow_panel.js
index db0d983b..cea106b5 100644
--- a/app/javascript/gabsocial/components/panel/who_to_follow_panel.js
+++ b/app/javascript/gabsocial/components/panel/who_to_follow_panel.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import {
   fetchRelatedSuggestions,
diff --git a/app/javascript/gabsocial/components/pill_item.js b/app/javascript/gabsocial/components/pill_item.js
index 616700e0..9ac1c075 100644
--- a/app/javascript/gabsocial/components/pill_item.js
+++ b/app/javascript/gabsocial/components/pill_item.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { withRouter } from 'react-router-dom'
 import { CX } from '../constants'
 import Button from './button'
@@ -5,7 +6,7 @@ import Text from './text'
 
 export default
 @withRouter
-class PillItem extends PureComponent {
+class PillItem extends React.PureComponent {
 
   static propTypes = {
     icon: PropTypes.string,
diff --git a/app/javascript/gabsocial/components/pills.js b/app/javascript/gabsocial/components/pills.js
index b9b5603e..e0d19443 100644
--- a/app/javascript/gabsocial/components/pills.js
+++ b/app/javascript/gabsocial/components/pills.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ResponsiveClassesComponent from '../features/ui/util/responsive_classes_component'
 import PillItem from './pill_item'
 
@@ -5,7 +6,7 @@ import PillItem from './pill_item'
  * Renders pills components
  * @param {array} [props.pills] - tab bar data for creating `TabBarItem`
  */
-export default class Pills extends PureComponent {
+export default class Pills extends React.PureComponent {
 
   static propTypes = {
     pills: PropTypes.array,
diff --git a/app/javascript/gabsocial/components/placeholder/account_placeholder.js b/app/javascript/gabsocial/components/placeholder/account_placeholder.js
index 3f548186..09ba1bdf 100644
--- a/app/javascript/gabsocial/components/placeholder/account_placeholder.js
+++ b/app/javascript/gabsocial/components/placeholder/account_placeholder.js
@@ -1,8 +1,9 @@
+import React from 'react'
 import { CX } from '../../constants'
 import { getRandomInt } from '../../utils/numbers'
 import PlaceholderLayout from './placeholder_layout'
 
-class AccountPlaceholder extends PureComponent {
+class AccountPlaceholder extends React.PureComponent {
 
   render() {
     const { isLast, isSmall } = this.props
diff --git a/app/javascript/gabsocial/components/placeholder/comment_placeholder.js b/app/javascript/gabsocial/components/placeholder/comment_placeholder.js
index 7d7d382f..855892ad 100644
--- a/app/javascript/gabsocial/components/placeholder/comment_placeholder.js
+++ b/app/javascript/gabsocial/components/placeholder/comment_placeholder.js
@@ -1,8 +1,9 @@
+import React from 'react'
 import { CX } from '../../constants'
 import { getRandomInt } from '../../utils/numbers'
 import PlaceholderLayout from './placeholder_layout'
 
-export default class CommentPlaceholder extends PureComponent {
+export default class CommentPlaceholder extends React.PureComponent {
   
   render() {
     const classes = CX({
diff --git a/app/javascript/gabsocial/components/placeholder/group_list_item_placeholder.js b/app/javascript/gabsocial/components/placeholder/group_list_item_placeholder.js
index f223f283..fb8a4467 100644
--- a/app/javascript/gabsocial/components/placeholder/group_list_item_placeholder.js
+++ b/app/javascript/gabsocial/components/placeholder/group_list_item_placeholder.js
@@ -1,8 +1,9 @@
+import React from 'react'
 import { CX } from '../../constants'
 import { getRandomInt } from '../../utils/numbers'
 import PlaceholderLayout from './placeholder_layout'
 
-class GroupListItemPlaceholder extends PureComponent {
+class GroupListItemPlaceholder extends React.PureComponent {
   
   render() {
     const { isLast } = this.props
diff --git a/app/javascript/gabsocial/components/placeholder/list_item_placeholder.js b/app/javascript/gabsocial/components/placeholder/list_item_placeholder.js
index 0aef0b4e..fb78953d 100644
--- a/app/javascript/gabsocial/components/placeholder/list_item_placeholder.js
+++ b/app/javascript/gabsocial/components/placeholder/list_item_placeholder.js
@@ -1,9 +1,10 @@
+import React from 'react'
 import { CX } from '../../constants'
 import { getRandomInt } from '../../utils/numbers'
 import PlaceholderLayout from './placeholder_layout'
 import ResponsiveClassesComponent from '../../features/ui/util/responsive_classes_component'
 
-class ListItemPlaceholder extends PureComponent {
+class ListItemPlaceholder extends React.PureComponent {
 
   render() {
     const { isLast } = this.props
diff --git a/app/javascript/gabsocial/components/placeholder/media_gallery_panel_placeholder.js b/app/javascript/gabsocial/components/placeholder/media_gallery_panel_placeholder.js
index a08babed..ffda28cb 100644
--- a/app/javascript/gabsocial/components/placeholder/media_gallery_panel_placeholder.js
+++ b/app/javascript/gabsocial/components/placeholder/media_gallery_panel_placeholder.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import PlaceholderLayout from './placeholder_layout'
 
-export default class MediaGalleryPanelPlaceholder extends PureComponent {
+export default class MediaGalleryPanelPlaceholder extends React.PureComponent {
   
   render() {
     return (
diff --git a/app/javascript/gabsocial/components/placeholder/media_gallery_placeholder.js b/app/javascript/gabsocial/components/placeholder/media_gallery_placeholder.js
index cc93bc48..102a6c25 100644
--- a/app/javascript/gabsocial/components/placeholder/media_gallery_placeholder.js
+++ b/app/javascript/gabsocial/components/placeholder/media_gallery_placeholder.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import PlaceholderLayout from './placeholder_layout'
 
-export default class MediaGalleryPlaceholder extends PureComponent {
+export default class MediaGalleryPlaceholder extends React.PureComponent {
 
   render() {
     return (
diff --git a/app/javascript/gabsocial/components/placeholder/notification_placeholder.js b/app/javascript/gabsocial/components/placeholder/notification_placeholder.js
index 43d84409..73536e7c 100644
--- a/app/javascript/gabsocial/components/placeholder/notification_placeholder.js
+++ b/app/javascript/gabsocial/components/placeholder/notification_placeholder.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import {
   CX,
   BREAKPOINT_EXTRA_SMALL,
@@ -7,7 +7,7 @@ import { getRandomInt } from '../../utils/numbers'
 import ResponsiveComponent from '../../features/ui/util/responsive_component'
 import PlaceholderLayout from './placeholder_layout'
 
-class NotificationPlaceholder extends PureComponent {
+class NotificationPlaceholder extends React.PureComponent {
 
   render() {
     const { isLast } = this.props
@@ -33,7 +33,7 @@ class NotificationPlaceholder extends PureComponent {
     const left = width2 + 30
 
     return (
-      <Fragment>
+      <React.Fragment>
         <ResponsiveComponent min={BREAKPOINT_EXTRA_SMALL}>
           <div className={classes}>
             <div className={[_s.default, _s.py2, _s.px2].join(' ')}>
@@ -77,7 +77,7 @@ class NotificationPlaceholder extends PureComponent {
             </div>
           </div>
         </ResponsiveComponent>
-      </Fragment>
+      </React.Fragment>
     )
   }
 
diff --git a/app/javascript/gabsocial/components/placeholder/placeholder_layout.js b/app/javascript/gabsocial/components/placeholder/placeholder_layout.js
index 8139e4dc..b93c5046 100644
--- a/app/javascript/gabsocial/components/placeholder/placeholder_layout.js
+++ b/app/javascript/gabsocial/components/placeholder/placeholder_layout.js
@@ -1,8 +1,9 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ContentLoader from 'react-content-loader'
 import { DEFAULT_THEME } from '../../constants'
 
-class PlaceholderLayout extends PureComponent {
+class PlaceholderLayout extends React.PureComponent {
   
   render() {
     const {
diff --git a/app/javascript/gabsocial/components/placeholder/profile_header_xs_placeholder.js b/app/javascript/gabsocial/components/placeholder/profile_header_xs_placeholder.js
index 117a70d8..8925e10c 100644
--- a/app/javascript/gabsocial/components/placeholder/profile_header_xs_placeholder.js
+++ b/app/javascript/gabsocial/components/placeholder/profile_header_xs_placeholder.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import PlaceholderLayout from './placeholder_layout'
 
-export default class ProfileHeaderXSPlaceholder extends PureComponent {
+export default class ProfileHeaderXSPlaceholder extends React.PureComponent {
   
   render() {
     return (
diff --git a/app/javascript/gabsocial/components/placeholder/profile_info_panel_placeholder.js b/app/javascript/gabsocial/components/placeholder/profile_info_panel_placeholder.js
index 4cecca84..64419590 100644
--- a/app/javascript/gabsocial/components/placeholder/profile_info_panel_placeholder.js
+++ b/app/javascript/gabsocial/components/placeholder/profile_info_panel_placeholder.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import PlaceholderLayout from './placeholder_layout'
 
-export default class ProfileInfoPanelPlaceholder extends PureComponent {
+export default class ProfileInfoPanelPlaceholder extends React.PureComponent {
   
   render() {
     return (
diff --git a/app/javascript/gabsocial/components/placeholder/profile_stats_panel_placeholder.js b/app/javascript/gabsocial/components/placeholder/profile_stats_panel_placeholder.js
index 90c76deb..d71cff5e 100644
--- a/app/javascript/gabsocial/components/placeholder/profile_stats_panel_placeholder.js
+++ b/app/javascript/gabsocial/components/placeholder/profile_stats_panel_placeholder.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import PlaceholderLayout from './placeholder_layout'
 
-export default class ProfileStatsPanelPlaceholder extends PureComponent {
+export default class ProfileStatsPanelPlaceholder extends React.PureComponent {
 
   render() {
     return (
diff --git a/app/javascript/gabsocial/components/placeholder/status_placeholder.js b/app/javascript/gabsocial/components/placeholder/status_placeholder.js
index f50e5c53..29589ef6 100644
--- a/app/javascript/gabsocial/components/placeholder/status_placeholder.js
+++ b/app/javascript/gabsocial/components/placeholder/status_placeholder.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import {
   CX,
   BREAKPOINT_EXTRA_SMALL,
@@ -7,7 +7,7 @@ import { getRandomInt } from '../../utils/numbers'
 import ResponsiveComponent from '../../features/ui/util/responsive_component'
 import PlaceholderLayout from './placeholder_layout'
 
-export default class StatusPlaceholder extends PureComponent {
+export default class StatusPlaceholder extends React.PureComponent {
 
   render() {
     const containerClasses = CX({
@@ -38,7 +38,7 @@ export default class StatusPlaceholder extends PureComponent {
     const width3 = getRandomInt(120, 260)
 
     return (
-      <Fragment>
+      <React.Fragment>
         <ResponsiveComponent min={BREAKPOINT_EXTRA_SMALL}>
           <div className={containerClasses}>
             <PlaceholderLayout viewBox='0 0 476 136'>
@@ -63,7 +63,7 @@ export default class StatusPlaceholder extends PureComponent {
             </PlaceholderLayout>
           </div>
         </ResponsiveComponent>
-      </Fragment>
+      </React.Fragment>
     )
 
   }
diff --git a/app/javascript/gabsocial/components/placeholder/trends_item_placeholder.js b/app/javascript/gabsocial/components/placeholder/trends_item_placeholder.js
index a860c218..88c2a708 100644
--- a/app/javascript/gabsocial/components/placeholder/trends_item_placeholder.js
+++ b/app/javascript/gabsocial/components/placeholder/trends_item_placeholder.js
@@ -1,7 +1,8 @@
+import React from 'react'
 import { getRandomInt } from '../../utils/numbers'
 import PlaceholderLayout from './placeholder_layout'
 
-export default class TrendsItemPlaceholder extends PureComponent {
+export default class TrendsItemPlaceholder extends React.PureComponent {
   
   render() {
     const title1Width = getRandomInt(280, 330)
diff --git a/app/javascript/gabsocial/components/poll.js b/app/javascript/gabsocial/components/poll.js
index 9b2937ab..6f42e76c 100644
--- a/app/javascript/gabsocial/components/poll.js
+++ b/app/javascript/gabsocial/components/poll.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'
@@ -226,12 +226,12 @@ class Poll extends ImmutablePureComponent {
             />
             {
               poll.get('expires_at') &&
-              <Fragment>
+              <React.Fragment>
                 <DotTextSeperator />
                 <Text color='secondary' className={_s.ml5}>
                   {timeRemaining}
                 </Text>
-              </Fragment>
+              </React.Fragment>
             }
           </Text>
         </div>
diff --git a/app/javascript/gabsocial/components/popover/comment_sorting_options_popover.js b/app/javascript/gabsocial/components/popover/comment_sorting_options_popover.js
index 3ed34716..4dc5d056 100644
--- a/app/javascript/gabsocial/components/popover/comment_sorting_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/comment_sorting_options_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { closePopover } from '../../actions/popover'
 import { changeSetting, saveSettings } from '../../actions/settings'
@@ -34,7 +35,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class CommentSortingOptionsPopover extends PureComponent {
+class CommentSortingOptionsPopover extends React.PureComponent {
 
   static propTypes = {
     commentSorting: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/popover/date_picker_popover.js b/app/javascript/gabsocial/components/popover/date_picker_popover.js
index eb6cdc45..030ebf18 100644
--- a/app/javascript/gabsocial/components/popover/date_picker_popover.js
+++ b/app/javascript/gabsocial/components/popover/date_picker_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import DatePicker from 'react-datepicker'
 import { FormattedMessage } from 'react-intl'
 import moment from 'moment-mini'
@@ -36,7 +37,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export default
 @connect(mapStateToProps, mapDispatchToProps)
-class DatePickerPopover extends PureComponent {
+class DatePickerPopover extends React.PureComponent {
 
   static propTypes = {
     date: PropTypes.instanceOf(Date),
diff --git a/app/javascript/gabsocial/components/popover/emoji_picker_popover.js b/app/javascript/gabsocial/components/popover/emoji_picker_popover.js
index 0154d4e8..e48218f4 100644
--- a/app/javascript/gabsocial/components/popover/emoji_picker_popover.js
+++ b/app/javascript/gabsocial/components/popover/emoji_picker_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
diff --git a/app/javascript/gabsocial/components/popover/error_popover.js b/app/javascript/gabsocial/components/popover/error_popover.js
index bddb62a7..003c41ef 100644
--- a/app/javascript/gabsocial/components/popover/error_popover.js
+++ b/app/javascript/gabsocial/components/popover/error_popover.js
@@ -1,7 +1,8 @@
+import React from 'react'
 import PopoverLayout from './popover_layout'
 import ColumnIndicator from '../column_indicator'
 
-export default class ErrorPopover extends PureComponent {
+export default class ErrorPopover extends React.PureComponent {
 
   static defaultProps = {
     isXS: PropTypes.bool,
diff --git a/app/javascript/gabsocial/components/popover/group_list_sort_options_popover.js b/app/javascript/gabsocial/components/popover/group_list_sort_options_popover.js
index d3ba7200..a2a5f0ab 100644
--- a/app/javascript/gabsocial/components/popover/group_list_sort_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/group_list_sort_options_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { closePopover } from '../../actions/popover'
 import { sortGroups } from '../../actions/groups'
 import {
@@ -14,7 +15,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export default
 @connect(null, mapDispatchToProps)
-class GroupListSortOptionsPopover extends PureComponent {
+class GroupListSortOptionsPopover extends React.PureComponent {
 
   static defaultProps = {
     tab: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/popover/group_member_options_popover.js b/app/javascript/gabsocial/components/popover/group_member_options_popover.js
index 8a2bc91c..a345bb91 100644
--- a/app/javascript/gabsocial/components/popover/group_member_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/group_member_options_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { closePopover } from '../../actions/popover'
 import {
 	updateRole,
@@ -20,7 +21,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export default
 @connect(null, mapDispatchToProps)
-class GroupMemberOptionsPopover extends PureComponent {
+class GroupMemberOptionsPopover extends React.PureComponent {
 
   static defaultProps = {
     accountId: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/popover/group_options_popover.js b/app/javascript/gabsocial/components/popover/group_options_popover.js
index 569069c0..226903c6 100644
--- a/app/javascript/gabsocial/components/popover/group_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/group_options_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/popover/group_timeline_sort_options_popover.js b/app/javascript/gabsocial/components/popover/group_timeline_sort_options_popover.js
index 12005417..47a5fb30 100644
--- a/app/javascript/gabsocial/components/popover/group_timeline_sort_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/group_timeline_sort_options_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import isObject from 'lodash.isobject'
 import { closePopover } from '../../actions/popover'
@@ -37,7 +38,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class GroupTimelineSortOptionsPopover extends PureComponent {
+class GroupTimelineSortOptionsPopover extends React.PureComponent {
 
   static propTypes = {
     sorting: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/popover/group_timeline_sort_top_options_popover.js b/app/javascript/gabsocial/components/popover/group_timeline_sort_top_options_popover.js
index bfbadae6..047b8a74 100644
--- a/app/javascript/gabsocial/components/popover/group_timeline_sort_top_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/group_timeline_sort_top_options_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { closePopover } from '../../actions/popover'
 import { setGroupTimelineTopSort } from '../../actions/groups'
@@ -34,7 +35,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class GroupTimelineSortTopOptionsPopover extends PureComponent {
+class GroupTimelineSortTopOptionsPopover extends React.PureComponent {
 
   static propTypes = {
     sortByTopValue: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/popover/loading_popover.js b/app/javascript/gabsocial/components/popover/loading_popover.js
index 9cbc1927..2488d379 100644
--- a/app/javascript/gabsocial/components/popover/loading_popover.js
+++ b/app/javascript/gabsocial/components/popover/loading_popover.js
@@ -1,7 +1,8 @@
+import React from 'react'
 import PopoverLayout from './popover_layout'
 import ColumnIndicator from '../column_indicator'
 
-export default class LoadingPopover extends PureComponent {
+export default class LoadingPopover extends React.PureComponent {
 
   static defaultProps = {
     isXS: PropTypes.bool,
diff --git a/app/javascript/gabsocial/components/popover/nav_settings_popover.js b/app/javascript/gabsocial/components/popover/nav_settings_popover.js
index 9afd62e0..e360360b 100644
--- a/app/javascript/gabsocial/components/popover/nav_settings_popover.js
+++ b/app/javascript/gabsocial/components/popover/nav_settings_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { closePopover } from '../../actions/popover'
 import { meUsername } from '../../initial_state'
@@ -21,7 +22,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(null, mapDispatchToProps)
-class NavSettingsPopover extends PureComponent {
+class NavSettingsPopover extends React.PureComponent {
   
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/popover/popover_base.js b/app/javascript/gabsocial/components/popover/popover_base.js
index cc4bcd35..9050bd83 100644
--- a/app/javascript/gabsocial/components/popover/popover_base.js
+++ b/app/javascript/gabsocial/components/popover/popover_base.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import detectPassiveEvents from 'detect-passive-events'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
diff --git a/app/javascript/gabsocial/components/popover/popover_layout.js b/app/javascript/gabsocial/components/popover/popover_layout.js
index 5663267b..4d82d587 100644
--- a/app/javascript/gabsocial/components/popover/popover_layout.js
+++ b/app/javascript/gabsocial/components/popover/popover_layout.js
@@ -1,9 +1,10 @@
+import React from 'react'
 import Block from '../block'
 import Button from '../button'
 import Heading from '../heading'
 import Text from '../text'
 
-export default class PopoverLayout extends PureComponent {
+export default class PopoverLayout extends React.PureComponent {
 
   static propTypes = {
     children: PropTypes.node,
diff --git a/app/javascript/gabsocial/components/popover/popover_root.js b/app/javascript/gabsocial/components/popover/popover_root.js
index 1229f850..3640bd5a 100644
--- a/app/javascript/gabsocial/components/popover/popover_root.js
+++ b/app/javascript/gabsocial/components/popover/popover_root.js
@@ -38,6 +38,7 @@ import {
   VideoStatsPopover,
 } from '../../features/ui/util/async_components'
 
+import React from 'react'
 import { closePopover } from '../../actions/popover'
 import { getWindowDimension } from '../../utils/is_mobile'
 import Bundle from '../../features/ui/util/bundle'
@@ -78,7 +79,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export default
 @connect(mapStateToProps, mapDispatchToProps)
-class PopoverRoot extends PureComponent {
+class PopoverRoot extends React.PureComponent {
 
   static propTypes = {
     type: PropTypes.string,
diff --git a/app/javascript/gabsocial/components/popover/profile_options_popover.js b/app/javascript/gabsocial/components/popover/profile_options_popover.js
index 4f0239e7..e0ddba47 100644
--- a/app/javascript/gabsocial/components/popover/profile_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/profile_options_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import {
   followAccount,
@@ -134,7 +135,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class ProfileOptionsPopover extends PureComponent {
+class ProfileOptionsPopover extends React.PureComponent {
 
   static defaultProps = {
     isXS: PropTypes.bool,
diff --git a/app/javascript/gabsocial/components/popover/search_popover.js b/app/javascript/gabsocial/components/popover/search_popover.js
index 2f691286..c822270a 100644
--- a/app/javascript/gabsocial/components/popover/search_popover.js
+++ b/app/javascript/gabsocial/components/popover/search_popover.js
@@ -1,4 +1,6 @@
-export default class SearchPopover extends PureComponent {
+import React from 'react'
+
+export default class SearchPopover extends React.PureComponent {
   render() {
     // : todo :
     // <div className='search-popout-container' style={{ ...style, position: 'absolute', zIndex: 1000 }}>
diff --git a/app/javascript/gabsocial/components/popover/sidebar_more_popover.js b/app/javascript/gabsocial/components/popover/sidebar_more_popover.js
index 301be55c..c6456804 100644
--- a/app/javascript/gabsocial/components/popover/sidebar_more_popover.js
+++ b/app/javascript/gabsocial/components/popover/sidebar_more_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import {  MODAL_DISPLAY_OPTIONS } from '../../constants'
 import { openModal } from '../../actions/modal'
@@ -24,7 +25,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(null, mapDispatchToProps)
-class SidebarMorePopover extends PureComponent {
+class SidebarMorePopover extends React.PureComponent {
   
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/popover/status_expiration_options_popover.js b/app/javascript/gabsocial/components/popover/status_expiration_options_popover.js
index 1a1b82c9..b582437c 100644
--- a/app/javascript/gabsocial/components/popover/status_expiration_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/status_expiration_options_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { closePopover } from '../../actions/popover'
 import { changeExpiresAt } from '../../actions/compose'
@@ -34,7 +35,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class StatusExpirationOptionsPopover extends PureComponent {
+class StatusExpirationOptionsPopover extends React.PureComponent {
 
   static defaultProps = {
     expiresAtValue: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/popover/status_options_popover.js b/app/javascript/gabsocial/components/popover/status_options_popover.js
index 19e6a436..aac82bcb 100644
--- a/app/javascript/gabsocial/components/popover/status_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/status_options_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/popover/status_visibility_popover.js b/app/javascript/gabsocial/components/popover/status_visibility_popover.js
index 9e9d54e2..3fe1053f 100644
--- a/app/javascript/gabsocial/components/popover/status_visibility_popover.js
+++ b/app/javascript/gabsocial/components/popover/status_visibility_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import classNames from 'classnames/bind'
 import { changeComposeVisibility } from '../../actions/compose'
@@ -34,7 +35,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-class StatusVisibilityDropdown extends PureComponent {
+class StatusVisibilityDropdown extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/popover/user_info_popover.js b/app/javascript/gabsocial/components/popover/user_info_popover.js
index 49daedfa..4da4cc1e 100644
--- a/app/javascript/gabsocial/components/popover/user_info_popover.js
+++ b/app/javascript/gabsocial/components/popover/user_info_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { NavLink } from 'react-router-dom'
diff --git a/app/javascript/gabsocial/components/popover/video_stats_popover.js b/app/javascript/gabsocial/components/popover/video_stats_popover.js
index 1cc78565..1ccd7124 100644
--- a/app/javascript/gabsocial/components/popover/video_stats_popover.js
+++ b/app/javascript/gabsocial/components/popover/video_stats_popover.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl } from 'react-intl'
@@ -120,7 +121,7 @@ class VideoStatsPopover extends ImmutablePureComponent {
 
 }
 
-class VideoStatLine extends PureComponent {
+class VideoStatLine extends React.PureComponent {
 
   static propTypes = {
     isXS: PropTypes.bool.isRequired,
diff --git a/app/javascript/gabsocial/components/profile_header.js b/app/javascript/gabsocial/components/profile_header.js
index 0afa5c0f..74c7a1d9 100644
--- a/app/javascript/gabsocial/components/profile_header.js
+++ b/app/javascript/gabsocial/components/profile_header.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/profile_navigation_bar.js b/app/javascript/gabsocial/components/profile_navigation_bar.js
index 4a05fb43..4d204c78 100644
--- a/app/javascript/gabsocial/components/profile_navigation_bar.js
+++ b/app/javascript/gabsocial/components/profile_navigation_bar.js
@@ -1,7 +1,8 @@
+import React from 'react'
 import BackButton from './back_button'
 import Heading from './heading'
 
-export default class ProfileNavigationBar extends PureComponent {
+export default class ProfileNavigationBar extends React.PureComponent {
 
   static propTypes = {
     titleHTML: PropTypes.string,
diff --git a/app/javascript/gabsocial/components/progress_bar.js b/app/javascript/gabsocial/components/progress_bar.js
index daeeb3ee..b35597c6 100644
--- a/app/javascript/gabsocial/components/progress_bar.js
+++ b/app/javascript/gabsocial/components/progress_bar.js
@@ -1,8 +1,9 @@
+import React from 'react'
 import { CX } from '../constants'
 import Button from './button'
 import Text from './text'
 
-export default class ProgressBar extends PureComponent {
+export default class ProgressBar extends React.PureComponent {
 
   static propTypes = {
     progress: PropTypes.oneOfType([
diff --git a/app/javascript/gabsocial/components/pull_to_refresher.js b/app/javascript/gabsocial/components/pull_to_refresher.js
index e5f41e47..93d12092 100644
--- a/app/javascript/gabsocial/components/pull_to_refresher.js
+++ b/app/javascript/gabsocial/components/pull_to_refresher.js
@@ -1,9 +1,10 @@
+import React from 'react'
 import { BREAKPOINT_EXTRA_SMALL } from '../constants'
 import Responsive from '../features/ui//util/responsive_component'
 import Icon from './icon'
 import Text from './text'
 
-export default class PullToRefresher extends PureComponent {
+export default class PullToRefresher extends React.PureComponent {
 
   render() {
     return (
diff --git a/app/javascript/gabsocial/components/recursive_comment.js b/app/javascript/gabsocial/components/recursive_comment.js
index 53abcfe2..f2285e8a 100644
--- a/app/javascript/gabsocial/components/recursive_comment.js
+++ b/app/javascript/gabsocial/components/recursive_comment.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { NavLink } from 'react-router-dom'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/relative_timestamp.js b/app/javascript/gabsocial/components/relative_timestamp.js
index b63aedaa..c87fbac5 100644
--- a/app/javascript/gabsocial/components/relative_timestamp.js
+++ b/app/javascript/gabsocial/components/relative_timestamp.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 
 const messages = defineMessages({
diff --git a/app/javascript/gabsocial/components/rich_text_editor_bar.js b/app/javascript/gabsocial/components/rich_text_editor_bar.js
index b1a05338..01b5c8f4 100644
--- a/app/javascript/gabsocial/components/rich_text_editor_bar.js
+++ b/app/javascript/gabsocial/components/rich_text_editor_bar.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { RichUtils } from 'draft-js'
 import classNames from 'classnames/bind'
 import { me } from '../initial_state'
@@ -82,7 +83,7 @@ const mapStateToProps = (state) => {
 
 export default
 @connect(mapStateToProps)
-class RichTextEditorBar extends PureComponent {
+class RichTextEditorBar extends React.PureComponent {
 
   static propTypes = {
     editorState: PropTypes.object.isRequired,
@@ -137,7 +138,7 @@ class RichTextEditorBar extends PureComponent {
 
 }
 
-class StyleButton extends PureComponent {
+class StyleButton extends React.PureComponent {
 
   static propTypes = {
     onClick: PropTypes.func,
diff --git a/app/javascript/gabsocial/components/scrollable_list.js b/app/javascript/gabsocial/components/scrollable_list.js
index 02e4c79d..cd4db866 100644
--- a/app/javascript/gabsocial/components/scrollable_list.js
+++ b/app/javascript/gabsocial/components/scrollable_list.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import throttle from 'lodash.throttle'
 import { List as ImmutableList } from 'immutable'
 import IntersectionObserverArticle from './intersection_observer_article'
@@ -9,7 +9,7 @@ import LoadMore from './load_more'
 
 const MOUSE_IDLE_DELAY = 300
 
-export default class ScrollableList extends PureComponent {
+export default class ScrollableList extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -231,7 +231,7 @@ export default class ScrollableList extends PureComponent {
     if (showLoading) {
       if (Placeholder) {
         return (
-          <Fragment>
+          <React.Fragment>
             {
               Array.apply(null, {
                 length: placeholderCount
@@ -242,7 +242,7 @@ export default class ScrollableList extends PureComponent {
                 />
               ))
             }
-          </Fragment>
+          </React.Fragment>
         )
       }
 
diff --git a/app/javascript/gabsocial/components/search.js b/app/javascript/gabsocial/components/search.js
index d7ab910e..3193f715 100644
--- a/app/javascript/gabsocial/components/search.js
+++ b/app/javascript/gabsocial/components/search.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { withRouter } from 'react-router-dom'
 import queryString from 'query-string'
 import { me } from '../initial_state'
@@ -26,7 +27,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @withRouter
 @connect(mapStateToProps, mapDispatchToProps)
-class Search extends PureComponent {
+class Search extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/select.js b/app/javascript/gabsocial/components/select.js
index b4dffb0b..451136d9 100644
--- a/app/javascript/gabsocial/components/select.js
+++ b/app/javascript/gabsocial/components/select.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import Icon from './icon'
diff --git a/app/javascript/gabsocial/components/sensitive_media_item.js b/app/javascript/gabsocial/components/sensitive_media_item.js
index 9330ad3c..0ef8ad27 100644
--- a/app/javascript/gabsocial/components/sensitive_media_item.js
+++ b/app/javascript/gabsocial/components/sensitive_media_item.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import Button from './button'
 import Text from './text'
@@ -9,7 +10,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class SensitiveMediaItem extends PureComponent {
+class SensitiveMediaItem extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/components/setting_switch.js b/app/javascript/gabsocial/components/setting_switch.js
index 8b52114d..ea26e7b0 100644
--- a/app/javascript/gabsocial/components/setting_switch.js
+++ b/app/javascript/gabsocial/components/setting_switch.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import Switch from './switch'
diff --git a/app/javascript/gabsocial/components/settings_sidebar.js b/app/javascript/gabsocial/components/settings_sidebar.js
index 11ccba18..fd99cc3f 100644
--- a/app/javascript/gabsocial/components/settings_sidebar.js
+++ b/app/javascript/gabsocial/components/settings_sidebar.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { injectIntl, defineMessages } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/shop_item.js b/app/javascript/gabsocial/components/shop_item.js
index 824dad3e..692bfcc7 100644
--- a/app/javascript/gabsocial/components/shop_item.js
+++ b/app/javascript/gabsocial/components/shop_item.js
@@ -1,8 +1,9 @@
+import React from 'react'
 import { DEFAULT_REL } from '../constants'
 import Image from './image'
 import Text from './text'
 
-class ShopItem extends PureComponent {
+class ShopItem extends React.PureComponent {
 
   render() {
     const {
diff --git a/app/javascript/gabsocial/components/sidebar.js b/app/javascript/gabsocial/components/sidebar.js
index 84835575..c1e6dcf8 100644
--- a/app/javascript/gabsocial/components/sidebar.js
+++ b/app/javascript/gabsocial/components/sidebar.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { injectIntl, defineMessages } from 'react-intl'
@@ -287,7 +287,7 @@ class Sidebar extends ImmutablePureComponent {
                 }
                 {
                   !!shortcutItems.length > 0 &&
-                  <Fragment>
+                  <React.Fragment>
                     <SidebarSectionTitle>
                       <div
                         className={[_s.displayFlex, _s.alignItemsCenter, _s.flexRow].join(' ')}
@@ -318,7 +318,7 @@ class Sidebar extends ImmutablePureComponent {
                         <SidebarSectionItem {...shortcutItem} key={`sidebar-item-shortcut-${i}`} />
                       ))
                     }
-                  </Fragment>
+                  </React.Fragment>
                 }
                 <SidebarSectionTitle>{intl.formatMessage(messages.explore)}</SidebarSectionTitle>
                 {
diff --git a/app/javascript/gabsocial/components/sidebar_panel_group.js b/app/javascript/gabsocial/components/sidebar_panel_group.js
index c85b8226..5ce0de1e 100644
--- a/app/javascript/gabsocial/components/sidebar_panel_group.js
+++ b/app/javascript/gabsocial/components/sidebar_panel_group.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { me, promotions } from '../initial_state'
 import Bundle from '../features/ui/util/bundle'
 import WrappedBundle from '../features/ui/util/bundle'
@@ -6,7 +6,7 @@ import {
   StatusPromotionPanel
 } from '../features/ui/util/async_components'
 
-export default class SidebarPanelGroup extends PureComponent {
+export default class SidebarPanelGroup extends React.PureComponent {
 
   static propTypes = {
     layout: PropTypes.array.isRequired,
@@ -30,7 +30,7 @@ export default class SidebarPanelGroup extends PureComponent {
     }
 
     return (
-      <Fragment>
+      <React.Fragment>
         {
           layout.map((panel) => {
             if (typeof panel !== 'function') {
@@ -51,7 +51,7 @@ export default class SidebarPanelGroup extends PureComponent {
             )
           })
         }
-      </Fragment>
+      </React.Fragment>
     )
   }
 
diff --git a/app/javascript/gabsocial/components/sidebar_section_item.js b/app/javascript/gabsocial/components/sidebar_section_item.js
index 92503870..7bee0c26 100644
--- a/app/javascript/gabsocial/components/sidebar_section_item.js
+++ b/app/javascript/gabsocial/components/sidebar_section_item.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import {
   CX,
 } from '../constants'
@@ -6,7 +7,7 @@ import Icon from './icon'
 import Image from './image'
 import ResponsiveClassesComponent from '../features/ui/util/responsive_classes_component'
 
-export default class SidebarSectionItem extends PureComponent {
+export default class SidebarSectionItem extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
diff --git a/app/javascript/gabsocial/components/sidebar_section_title.js b/app/javascript/gabsocial/components/sidebar_section_title.js
index ef1382e4..51f9e8d5 100644
--- a/app/javascript/gabsocial/components/sidebar_section_title.js
+++ b/app/javascript/gabsocial/components/sidebar_section_title.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import Text from './text'
 
-export default class SidebarSectionTitle extends PureComponent {
+export default class SidebarSectionTitle extends React.PureComponent {
 
   static propTypes = {
     children: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/sort_block.js b/app/javascript/gabsocial/components/sort_block.js
index 56da4e31..4f4342bb 100644
--- a/app/javascript/gabsocial/components/sort_block.js
+++ b/app/javascript/gabsocial/components/sort_block.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import Button from '../components/button'
 import DotTextSeperator from '../components/dot_text_seperator'
@@ -11,7 +11,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class SortBlock extends PureComponent {
+class SortBlock extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
@@ -65,7 +65,7 @@ class SortBlock extends PureComponent {
 
         {
           !!subValue &&
-          <Fragment>
+          <React.Fragment>
             <div className={[_s.default, _s.px5].join(' ')}>
               <DotTextSeperator />
             </div>
@@ -83,7 +83,7 @@ class SortBlock extends PureComponent {
               </Text>
               <Icon id='caret-down' size='6px' className={[_s.colorSecondary, _s.ml5].join(' ')} />
             </Button>
-          </Fragment>
+          </React.Fragment>
         }
       </div>
     )
diff --git a/app/javascript/gabsocial/components/status.js b/app/javascript/gabsocial/components/status.js
index c710672a..adcc24e5 100644
--- a/app/javascript/gabsocial/components/status.js
+++ b/app/javascript/gabsocial/components/status.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
@@ -596,7 +596,7 @@ class Status extends ImmutablePureComponent {
                   
                   {
                     status.get('replies_count') > 0 && !isChild && !isNotification && !commentsLimited &&
-                    <Fragment>
+                    <React.Fragment>
                       <div className={[_s.default, _s.mr10, _s.ml10, _s.mb10, _s.borderColorSecondary, _s.borderBottom1PX].join(' ')} />
 
                       <SortBlock
@@ -606,11 +606,11 @@ class Status extends ImmutablePureComponent {
 
                       {
                         descendantsIds.size === 0 &&
-                        <Fragment>
+                        <React.Fragment>
                           <CommentPlaceholder />
                           <CommentPlaceholder />
                           <CommentPlaceholder />
-                        </Fragment>
+                        </React.Fragment>
                       }
                       
                       {
@@ -622,7 +622,7 @@ class Status extends ImmutablePureComponent {
                           onViewComments={this.handleClick}
                         />
                       }
-                    </Fragment>
+                    </React.Fragment>
                   }
                 </div>
               </div>
diff --git a/app/javascript/gabsocial/components/status_action_bar.js b/app/javascript/gabsocial/components/status_action_bar.js
index 91c9533b..ebf4488d 100644
--- a/app/javascript/gabsocial/components/status_action_bar.js
+++ b/app/javascript/gabsocial/components/status_action_bar.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/status_action_bar_item.js b/app/javascript/gabsocial/components/status_action_bar_item.js
index 8d43cad2..cd5d3ad6 100644
--- a/app/javascript/gabsocial/components/status_action_bar_item.js
+++ b/app/javascript/gabsocial/components/status_action_bar_item.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import {
   CX,
   BREAKPOINT_EXTRA_SMALL,
@@ -6,7 +7,7 @@ import Responsive from '../features/ui/util/responsive_component'
 import Button from './button'
 import Text from './text'
 
-export default class StatusActionBarItem extends PureComponent {
+export default class StatusActionBarItem extends React.PureComponent {
 
   static propTypes = {
     title: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/status_card.js b/app/javascript/gabsocial/components/status_card.js
index ab5a4db9..e1d6cb3d 100644
--- a/app/javascript/gabsocial/components/status_card.js
+++ b/app/javascript/gabsocial/components/status_card.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import Immutable from 'immutable'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
diff --git a/app/javascript/gabsocial/components/status_check_box.js b/app/javascript/gabsocial/components/status_check_box.js
index f849ca8e..52f80c11 100644
--- a/app/javascript/gabsocial/components/status_check_box.js
+++ b/app/javascript/gabsocial/components/status_check_box.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { Set as ImmutableSet } from 'immutable';
diff --git a/app/javascript/gabsocial/components/status_content.js b/app/javascript/gabsocial/components/status_content.js
index 1208bcf9..39c7f0bf 100644
--- a/app/javascript/gabsocial/components/status_content.js
+++ b/app/javascript/gabsocial/components/status_content.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { injectIntl, defineMessages } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/status_header.js b/app/javascript/gabsocial/components/status_header.js
index ecde93fe..fb9de132 100644
--- a/app/javascript/gabsocial/components/status_header.js
+++ b/app/javascript/gabsocial/components/status_header.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { NavLink } from 'react-router-dom'
 import ImmutablePropTypes from 'react-immutable-proptypes'
@@ -172,19 +172,19 @@ class StatusHeader extends ImmutablePureComponent {
 
               {
                 !!status.get('expires_at') &&
-                <Fragment>
+                <React.Fragment>
                   <DotTextSeperator />
                   <span title={intl.formatMessage(messages.expirationMessage, {
                     time: timeUntilExpiration,
                   })} className={[_s.default, _s.displayInline, _s.ml5].join(' ')}>
                     <Icon id='stopwatch' size='13px' className={[_s.default, _s.colorSecondary].join(' ')} />
                   </span>
-                </Fragment>
+                </React.Fragment>
               }
 
               {
                 !!status.get('group') &&
-                <Fragment>
+                <React.Fragment>
                   <DotTextSeperator />
                   <Button
                     isText
@@ -198,12 +198,12 @@ class StatusHeader extends ImmutablePureComponent {
                       {status.getIn(['group', 'title'])}
                     </Text>
                   </Button>
-                </Fragment>
+                </React.Fragment>
               }
 
               {
                 status.get('revised_at') !== null &&
-                <Fragment>
+                <React.Fragment>
                   <DotTextSeperator />
                   <Button
                     isText
@@ -217,7 +217,7 @@ class StatusHeader extends ImmutablePureComponent {
                       {intl.formatMessage(messages.edited)}
                     </Text>
                   </Button>
-                </Fragment>
+                </React.Fragment>
               }
 
             </div>
diff --git a/app/javascript/gabsocial/components/status_list.js b/app/javascript/gabsocial/components/status_list.js
index 36098ac2..de5c3d94 100644
--- a/app/javascript/gabsocial/components/status_list.js
+++ b/app/javascript/gabsocial/components/status_list.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
@@ -232,11 +232,11 @@ class StatusList extends ImmutablePureComponent {
 
     if (isPartial || (isLoading && statusIds.size === 0)) {
       return (
-        <Fragment>
+        <React.Fragment>
           <StatusPlaceholder />
           <StatusPlaceholder />
           <StatusPlaceholder />
-        </Fragment>
+        </React.Fragment>
       )
     }
 
@@ -313,7 +313,7 @@ class StatusList extends ImmutablePureComponent {
     }
 
     return (
-      <Fragment>
+      <React.Fragment>
         <TimelineQueueButtonHeader
           onClick={this.handleDequeueTimeline}
           count={totalQueuedItemsCount}
@@ -335,7 +335,7 @@ class StatusList extends ImmutablePureComponent {
         >
           {scrollableContent}
         </ScrollableList>
-      </Fragment>
+      </React.Fragment>
     )
   }
 
diff --git a/app/javascript/gabsocial/components/status_media.js b/app/javascript/gabsocial/components/status_media.js
index a66a1cf1..b22da671 100644
--- a/app/javascript/gabsocial/components/status_media.js
+++ b/app/javascript/gabsocial/components/status_media.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
diff --git a/app/javascript/gabsocial/components/status_prepend.js b/app/javascript/gabsocial/components/status_prepend.js
index 13c4f6c0..67b1a208 100644
--- a/app/javascript/gabsocial/components/status_prepend.js
+++ b/app/javascript/gabsocial/components/status_prepend.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { NavLink } from 'react-router-dom'
 import { injectIntl, defineMessages, FormattedMessage } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/components/status_reply_indicator.js b/app/javascript/gabsocial/components/status_reply_indicator.js
index e2c1c2e8..637a5002 100644
--- a/app/javascript/gabsocial/components/status_reply_indicator.js
+++ b/app/javascript/gabsocial/components/status_reply_indicator.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { defineMessages, injectIntl } from 'react-intl';
diff --git a/app/javascript/gabsocial/components/switch.js b/app/javascript/gabsocial/components/switch.js
index 0a87e927..31f0a81b 100644
--- a/app/javascript/gabsocial/components/switch.js
+++ b/app/javascript/gabsocial/components/switch.js
@@ -1,7 +1,8 @@
+import React from 'react'
 import { CX } from '../constants'
 import Text from './text'
 
-export default class Switch extends PureComponent {
+export default class Switch extends React.PureComponent {
 
   static propTypes = {
     id: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/tab_bar.js b/app/javascript/gabsocial/components/tab_bar.js
index 24059c25..67da7a15 100644
--- a/app/javascript/gabsocial/components/tab_bar.js
+++ b/app/javascript/gabsocial/components/tab_bar.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ResponsiveClassesComponent from '../features/ui/util/responsive_classes_component';
 import TabBarItem from './tab_bar_item'
 
@@ -6,7 +7,7 @@ import TabBarItem from './tab_bar_item'
  * @param {array} [props.tabs] - tab bar data for creating `TabBarItem`
  * @param {bool} [props.isLarge] - to style the tab bar larger
  */
-export default class TabBar extends PureComponent {
+export default class TabBar extends React.PureComponent {
 
   static propTypes = {
     tabs: PropTypes.array,
diff --git a/app/javascript/gabsocial/components/tab_bar_item.js b/app/javascript/gabsocial/components/tab_bar_item.js
index 30467750..f3b14370 100644
--- a/app/javascript/gabsocial/components/tab_bar_item.js
+++ b/app/javascript/gabsocial/components/tab_bar_item.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { withRouter } from 'react-router-dom'
 import { CX } from '../constants'
 import Button from './button'
@@ -13,7 +14,7 @@ import Text from './text'
  */
 export default
 @withRouter
-class TabBarItem extends PureComponent {
+class TabBarItem extends React.PureComponent {
 
   static propTypes = {
     isLarge: PropTypes.bool,
diff --git a/app/javascript/gabsocial/components/text.js b/app/javascript/gabsocial/components/text.js
index 5916b127..71abbb63 100644
--- a/app/javascript/gabsocial/components/text.js
+++ b/app/javascript/gabsocial/components/text.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import classNames from 'classnames/bind'
 
 // Bind CSS Modules global variable `_s` to classNames module
@@ -51,7 +52,7 @@ const ALIGNMENTS = {
  * @param {string} [props.tagName='span'] tagName of the text element
  * @param {string} [props.weight='normal'] weight of the text
  */
-export default class Text extends PureComponent {
+export default class Text extends React.PureComponent {
 
   static propTypes = {
     align: PropTypes.oneOf(Object.keys(ALIGNMENTS)),
diff --git a/app/javascript/gabsocial/components/textarea.js b/app/javascript/gabsocial/components/textarea.js
index b04f57c2..7f470e49 100644
--- a/app/javascript/gabsocial/components/textarea.js
+++ b/app/javascript/gabsocial/components/textarea.js
@@ -1,9 +1,10 @@
+import React from 'react'
 import classNames from 'classnames/bind'
 import Text from './text'
 
 const cx = classNames.bind(_s)
 
-export default class Textarea extends PureComponent {
+export default class Textarea extends React.PureComponent {
   static propTypes = {
     placeholder: PropTypes.string,
     prependIcon: PropTypes.string,
diff --git a/app/javascript/gabsocial/components/timeline_compose_block.js b/app/javascript/gabsocial/components/timeline_compose_block.js
index 53d26f44..b99c37cf 100644
--- a/app/javascript/gabsocial/components/timeline_compose_block.js
+++ b/app/javascript/gabsocial/components/timeline_compose_block.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { injectIntl, defineMessages } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/timeline_queue_button_header.js b/app/javascript/gabsocial/components/timeline_queue_button_header.js
index 3d5d2226..40796398 100644
--- a/app/javascript/gabsocial/components/timeline_queue_button_header.js
+++ b/app/javascript/gabsocial/components/timeline_queue_button_header.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { FormattedMessage } from 'react-intl'
 import throttle from 'lodash.throttle'
 import classNames from 'classnames/bind'
@@ -8,7 +9,7 @@ import Text from './text'
 
 const cx = classNames.bind(_s)
 
-export default class TimelineQueueButtonHeader extends PureComponent {
+export default class TimelineQueueButtonHeader extends React.PureComponent {
 
   static propTypes = {
     onClick: PropTypes.func.isRequired,
diff --git a/app/javascript/gabsocial/components/trends_item.js b/app/javascript/gabsocial/components/trends_item.js
index 6446247f..d07c35a2 100644
--- a/app/javascript/gabsocial/components/trends_item.js
+++ b/app/javascript/gabsocial/components/trends_item.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { urlRegex } from '../features/ui/util/url_regex'
 import {
   CX,
@@ -9,7 +9,7 @@ import DotTextSeperator from './dot_text_seperator'
 import RelativeTimestamp from './relative_timestamp'
 import Text from './text'
 
-export default class TrendingItem extends PureComponent {
+export default class TrendingItem extends React.PureComponent {
 
   static propTypes = {
     index: PropTypes.number,
@@ -66,11 +66,11 @@ export default class TrendingItem extends PureComponent {
 
     if (isHidden) {
       return (
-        <Fragment>
+        <React.Fragment>
           {correctedTitle}
           {!descriptionHasLink && correctedDescription}
           {correctedAuthor}
-        </Fragment>
+        </React.Fragment>
       )
     }
 
diff --git a/app/javascript/gabsocial/components/upload_area.js b/app/javascript/gabsocial/components/upload_area.js
index 8144be37..85befbd7 100644
--- a/app/javascript/gabsocial/components/upload_area.js
+++ b/app/javascript/gabsocial/components/upload_area.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import spring from 'react-motion/lib/spring'
 import Motion from '../features/ui/util/reduced_motion'
@@ -9,7 +10,7 @@ const messages = defineMessages({
 
 export default
 @injectIntl
-class UploadArea extends PureComponent {
+class UploadArea extends React.PureComponent {
 
   static propTypes = {
     active: PropTypes.bool,
diff --git a/app/javascript/gabsocial/components/user_stat.js b/app/javascript/gabsocial/components/user_stat.js
index a5ef03cf..6504d57c 100644
--- a/app/javascript/gabsocial/components/user_stat.js
+++ b/app/javascript/gabsocial/components/user_stat.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { NavLink } from 'react-router-dom'
 import { CX } from '../constants'
 import Text from './text'
@@ -8,7 +9,7 @@ import Text from './text'
  * @param {string} props.to - location to go to on click
  * @param {string} props.value - top value
  */
-export default class UserStat extends PureComponent {
+export default class UserStat extends React.PureComponent {
 
   static propTypes = {
     title: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/components/video.js b/app/javascript/gabsocial/components/video.js
index 67790be8..3911986f 100644
--- a/app/javascript/gabsocial/components/video.js
+++ b/app/javascript/gabsocial/components/video.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/components/zoomable_image.js b/app/javascript/gabsocial/components/zoomable_image.js
index 3ac31760..33b1e752 100644
--- a/app/javascript/gabsocial/components/zoomable_image.js
+++ b/app/javascript/gabsocial/components/zoomable_image.js
@@ -1,3 +1,5 @@
+import React from 'react'
+
 const MIN_SCALE = 1
 const MAX_SCALE = 4
 
@@ -14,7 +16,7 @@ const clamp = (min, max, value) => {
   return Math.min(max, Math.max(min, value))
 }
 
-export default class ZoomableImage extends PureComponent {
+export default class ZoomableImage extends React.PureComponent {
 
   static propTypes = {
     alt: PropTypes.string,
diff --git a/app/javascript/gabsocial/containers/display.js b/app/javascript/gabsocial/containers/display.js
index ee180bc9..02c9c2a9 100644
--- a/app/javascript/gabsocial/containers/display.js
+++ b/app/javascript/gabsocial/containers/display.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import {
   FONT_SIZES,
   THEMES,
@@ -5,7 +6,7 @@ import {
   DEFAULT_FONT_SIZE,
 } from '../constants'
 
-class Display extends PureComponent {
+class Display extends React.PureComponent {
 
   state = {
     theme: this.props.theme,
diff --git a/app/javascript/gabsocial/containers/gabsocial.js b/app/javascript/gabsocial/containers/gabsocial.js
index 2a04acb0..ff724d96 100644
--- a/app/javascript/gabsocial/containers/gabsocial.js
+++ b/app/javascript/gabsocial/containers/gabsocial.js
@@ -1,5 +1,6 @@
 'use strict'
 
+import React from 'react'
 import { Provider } from 'react-redux'
 import configureStore from '../store/configureStore'
 import { BrowserRouter, Route } from 'react-router-dom'
@@ -36,7 +37,7 @@ const mapStateToProps = (state) => ({
 })
 
 @connect(mapStateToProps)
-class GabSocialMount extends PureComponent {
+class GabSocialMount extends React.PureComponent {
 
   static propTypes = {
     shownOnboarding: PropTypes.bool.isRequired,
@@ -80,7 +81,7 @@ class GabSocialMount extends PureComponent {
 
 }
 
-export default class GabSocial extends PureComponent {
+export default class GabSocial extends React.PureComponent {
 
   static propTypes = {
     locale: PropTypes.string.isRequired,
diff --git a/app/javascript/gabsocial/containers/media_container.js b/app/javascript/gabsocial/containers/media_container.js
index b622f9b7..b783e784 100644
--- a/app/javascript/gabsocial/containers/media_container.js
+++ b/app/javascript/gabsocial/containers/media_container.js
@@ -1,4 +1,4 @@
-import React, { PureComponent, Fragment } from 'react';
+import React from 'react';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import { IntlProvider, addLocaleData } from 'react-intl';
@@ -14,7 +14,7 @@ addLocaleData(localeData);
 
 const MEDIA_COMPONENTS = { MediaGallery, Video, Card, Poll };
 
-export default class MediaContainer extends PureComponent {
+export default class MediaContainer extends React.PureComponent {
 
   static propTypes = {
     locale: PropTypes.string.isRequired,
@@ -49,7 +49,7 @@ export default class MediaContainer extends PureComponent {
 
     return (
       <IntlProvider locale={locale} messages={messages}>
-        <Fragment>
+        <React.Fragment>
           {[].map.call(components, (component, i) => {
             const componentName = component.getAttribute('data-component');
             const Component = MEDIA_COMPONENTS[componentName];
@@ -72,7 +72,7 @@ export default class MediaContainer extends PureComponent {
               component,
             );
           })}
-        </Fragment>
+        </React.Fragment>
       </IntlProvider>
     );
   }
diff --git a/app/javascript/gabsocial/containers/notification_container.js b/app/javascript/gabsocial/containers/notification_container.js
index 7ab3f4bf..6f8970dc 100644
--- a/app/javascript/gabsocial/containers/notification_container.js
+++ b/app/javascript/gabsocial/containers/notification_container.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { List as ImmutableList } from 'immutable'
 import { makeGetNotification } from '../selectors'
 import Notification from '../components/notification'
diff --git a/app/javascript/gabsocial/containers/status_container.js b/app/javascript/gabsocial/containers/status_container.js
index f0853bd3..2123d749 100644
--- a/app/javascript/gabsocial/containers/status_container.js
+++ b/app/javascript/gabsocial/containers/status_container.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { FormattedMessage } from 'react-intl'
 import {
   Map as ImmutableMap,
diff --git a/app/javascript/gabsocial/features/about/about.js b/app/javascript/gabsocial/features/about/about.js
index 24d8c2c0..c7813f6c 100644
--- a/app/javascript/gabsocial/features/about/about.js
+++ b/app/javascript/gabsocial/features/about/about.js
@@ -1,10 +1,11 @@
+import React from 'react'
 import Block from '../../components/block'
 import Button from '../../components/button'
 import Divider from '../../components/divider'
 import Heading from '../../components/heading'
 import Text from '../../components/text'
 
-export default class About extends PureComponent {
+export default class About extends React.PureComponent {
 
   render() {
 
diff --git a/app/javascript/gabsocial/features/about/dmca.js b/app/javascript/gabsocial/features/about/dmca.js
index 15376a80..42fe7635 100644
--- a/app/javascript/gabsocial/features/about/dmca.js
+++ b/app/javascript/gabsocial/features/about/dmca.js
@@ -1,10 +1,11 @@
+import React from 'react'
 import Block from '../../components/block'
 import Button from '../../components/button'
 import Divider from '../../components/divider'
 import Heading from '../../components/heading'
 import Text from '../../components/text'
 
-export default class DMCA extends PureComponent {
+export default class DMCA extends React.PureComponent {
 
   render() {
 
diff --git a/app/javascript/gabsocial/features/about/investors.js b/app/javascript/gabsocial/features/about/investors.js
index a167017f..a0cdc029 100644
--- a/app/javascript/gabsocial/features/about/investors.js
+++ b/app/javascript/gabsocial/features/about/investors.js
@@ -1,10 +1,11 @@
+import React from 'react'
 import Block from '../../components/block'
 import Button from '../../components/button'
 import Divider from '../../components/divider'
 import Heading from '../../components/heading'
 import Text from '../../components/text'
 
-export default class Investors extends PureComponent {
+export default class Investors extends React.PureComponent {
 
   render() {
 
diff --git a/app/javascript/gabsocial/features/about/privacy_policy.js b/app/javascript/gabsocial/features/about/privacy_policy.js
index 8f71dc99..fd584748 100644
--- a/app/javascript/gabsocial/features/about/privacy_policy.js
+++ b/app/javascript/gabsocial/features/about/privacy_policy.js
@@ -1,10 +1,11 @@
+import React from 'react'
 import Block from '../../components/block'
 import Button from '../../components/button'
 import Divider from '../../components/divider'
 import Heading from '../../components/heading'
 import Text from '../../components/text'
 
-export default class PrivacyPolicy extends PureComponent {
+export default class PrivacyPolicy extends React.PureComponent {
 
   render() {
 
diff --git a/app/javascript/gabsocial/features/about/terms_of_sale.js b/app/javascript/gabsocial/features/about/terms_of_sale.js
index d6d77fd9..98058972 100644
--- a/app/javascript/gabsocial/features/about/terms_of_sale.js
+++ b/app/javascript/gabsocial/features/about/terms_of_sale.js
@@ -1,10 +1,11 @@
+import React from 'react'
 import Block from '../../components/block'
 import Button from '../../components/button'
 import Divider from '../../components/divider'
 import Heading from '../../components/heading'
 import Text from '../../components/text'
 
-export default class TermsOfSale extends PureComponent {
+export default class TermsOfSale extends React.PureComponent {
 
   render() {
 
diff --git a/app/javascript/gabsocial/features/about/terms_of_service.js b/app/javascript/gabsocial/features/about/terms_of_service.js
index 5fe5e36f..3aedbf3b 100644
--- a/app/javascript/gabsocial/features/about/terms_of_service.js
+++ b/app/javascript/gabsocial/features/about/terms_of_service.js
@@ -1,10 +1,11 @@
+import React from 'react'
 import Block from '../../components/block'
 import Button from '../../components/button'
 import Divider from '../../components/divider'
 import Heading from '../../components/heading'
 import Text from '../../components/text'
 
-export default class TermsOfService extends PureComponent {
+export default class TermsOfService extends React.PureComponent {
 
   render() {
 
diff --git a/app/javascript/gabsocial/features/account_gallery.js b/app/javascript/gabsocial/features/account_gallery.js
index 84253457..24eb73bd 100644
--- a/app/javascript/gabsocial/features/account_gallery.js
+++ b/app/javascript/gabsocial/features/account_gallery.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { injectIntl, defineMessages } from 'react-intl'
diff --git a/app/javascript/gabsocial/features/account_timeline.js b/app/javascript/gabsocial/features/account_timeline.js
index 77236b35..bb3b48df 100644
--- a/app/javascript/gabsocial/features/account_timeline.js
+++ b/app/javascript/gabsocial/features/account_timeline.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { List as ImmutableList } from 'immutable'
diff --git a/app/javascript/gabsocial/features/blocked_accounts.js b/app/javascript/gabsocial/features/blocked_accounts.js
index b55e1c29..da41d96c 100644
--- a/app/javascript/gabsocial/features/blocked_accounts.js
+++ b/app/javascript/gabsocial/features/blocked_accounts.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/features/bookmarked_statuses.js b/app/javascript/gabsocial/features/bookmarked_statuses.js
index 5118a739..969dc4fa 100644
--- a/app/javascript/gabsocial/features/bookmarked_statuses.js
+++ b/app/javascript/gabsocial/features/bookmarked_statuses.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { FormattedMessage } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
diff --git a/app/javascript/gabsocial/features/community_timeline.js b/app/javascript/gabsocial/features/community_timeline.js
index 31a5da45..6a15841f 100644
--- a/app/javascript/gabsocial/features/community_timeline.js
+++ b/app/javascript/gabsocial/features/community_timeline.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { expandCommunityTimeline } from '../actions/timelines'
 import StatusList from '../components/status_list'
@@ -13,7 +14,7 @@ const mapStateToProps = (state) => ({
 export default
 @connect(mapStateToProps)
 @injectIntl
-class CommunityTimeline extends PureComponent {
+class CommunityTimeline extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
diff --git a/app/javascript/gabsocial/features/compose/components/compose_extra_button.js b/app/javascript/gabsocial/features/compose/components/compose_extra_button.js
index e7f45520..8cf9d12e 100644
--- a/app/javascript/gabsocial/features/compose/components/compose_extra_button.js
+++ b/app/javascript/gabsocial/features/compose/components/compose_extra_button.js
@@ -1,9 +1,10 @@
+import React from 'react'
 import classNames from 'classnames/bind'
 import Button from '../../../components/button'
 
 const cx = classNames.bind(_s)
 
-export default class ComposeExtraButton extends PureComponent {
+export default class ComposeExtraButton extends React.PureComponent {
   static propTypes = {
     title: PropTypes.string,
     disabled: PropTypes.bool,
diff --git a/app/javascript/gabsocial/features/compose/components/compose_form.js b/app/javascript/gabsocial/features/compose/components/compose_form.js
index f69f28fb..c87df89e 100644
--- a/app/javascript/gabsocial/features/compose/components/compose_form.js
+++ b/app/javascript/gabsocial/features/compose/components/compose_form.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/features/compose/components/emoji_picker_button.js b/app/javascript/gabsocial/features/compose/components/emoji_picker_button.js
index e80e7607..1d762fc1 100644
--- a/app/javascript/gabsocial/features/compose/components/emoji_picker_button.js
+++ b/app/javascript/gabsocial/features/compose/components/emoji_picker_button.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { openPopover } from '../../../actions/popover'
 import ComposeExtraButton from './compose_extra_button'
@@ -23,7 +24,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class EmojiPickerButton extends PureComponent {
+class EmojiPickerButton extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/features/compose/components/expires_post_button.js b/app/javascript/gabsocial/features/compose/components/expires_post_button.js
index 71f0dc6b..488db6ab 100644
--- a/app/javascript/gabsocial/features/compose/components/expires_post_button.js
+++ b/app/javascript/gabsocial/features/compose/components/expires_post_button.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { openModal } from '../../../actions/modal'
 import { openPopover } from '../../../actions/popover'
@@ -29,7 +30,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class ExpiresPostButton extends PureComponent {
+class ExpiresPostButton extends React.PureComponent {
 
   static propTypes = {
     active: PropTypes.bool.isRequired,
diff --git a/app/javascript/gabsocial/features/compose/components/gif_form.js b/app/javascript/gabsocial/features/compose/components/gif_form.js
index b1373eb3..7bf0dd82 100644
--- a/app/javascript/gabsocial/features/compose/components/gif_form.js
+++ b/app/javascript/gabsocial/features/compose/components/gif_form.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { clearSelectedGif } from '../../../actions/tenor'
 import Image from '../../../components/image'
 
@@ -9,7 +10,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export default
 @connect(null, mapDispatchToProps)
-class GifForm extends PureComponent {
+class GifForm extends React.PureComponent {
 
   static propTypes = {
     onClearSelectedGif: PropTypes.func.isRequired,
diff --git a/app/javascript/gabsocial/features/compose/components/gif_selector_button.js b/app/javascript/gabsocial/features/compose/components/gif_selector_button.js
index 16c1ab99..62474d69 100644
--- a/app/javascript/gabsocial/features/compose/components/gif_selector_button.js
+++ b/app/javascript/gabsocial/features/compose/components/gif_selector_button.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import ComposeExtraButton from './compose_extra_button'
 import { openModal } from '../../../actions/modal'
@@ -23,7 +24,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class GifSelectorButton extends PureComponent {
+class GifSelectorButton extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/features/compose/components/media_upload_button.js b/app/javascript/gabsocial/features/compose/components/media_upload_button.js
index f8feebae..6013d2d2 100644
--- a/app/javascript/gabsocial/features/compose/components/media_upload_button.js
+++ b/app/javascript/gabsocial/features/compose/components/media_upload_button.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/features/compose/components/media_upload_item.js b/app/javascript/gabsocial/features/compose/components/media_upload_item.js
index 195bd496..cc0e7b99 100644
--- a/app/javascript/gabsocial/features/compose/components/media_upload_item.js
+++ b/app/javascript/gabsocial/features/compose/components/media_upload_item.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/features/compose/components/poll_button.js b/app/javascript/gabsocial/features/compose/components/poll_button.js
index 64f058ee..7b4718f7 100644
--- a/app/javascript/gabsocial/features/compose/components/poll_button.js
+++ b/app/javascript/gabsocial/features/compose/components/poll_button.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { addPoll, removePoll } from '../../../actions/compose'
 import ComposeExtraButton from './compose_extra_button'
@@ -30,7 +31,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-class PollButton extends PureComponent {
+class PollButton extends React.PureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,
diff --git a/app/javascript/gabsocial/features/compose/components/poll_form.js b/app/javascript/gabsocial/features/compose/components/poll_form.js
index f9bf87c7..0ec67a09 100644
--- a/app/javascript/gabsocial/features/compose/components/poll_form.js
+++ b/app/javascript/gabsocial/features/compose/components/poll_form.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import classNames from 'classnames/bind'
diff --git a/app/javascript/gabsocial/features/compose/components/rich_text_editor_button.js b/app/javascript/gabsocial/features/compose/components/rich_text_editor_button.js
index 5a48a459..3896f757 100644
--- a/app/javascript/gabsocial/features/compose/components/rich_text_editor_button.js
+++ b/app/javascript/gabsocial/features/compose/components/rich_text_editor_button.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { changeRichTextEditorControlsVisibility } from '../../../actions/compose'
 import { openModal } from '../../../actions/modal'
@@ -29,7 +30,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class RichTextEditorButton extends PureComponent {
+class RichTextEditorButton extends React.PureComponent {
 
   static propTypes = {
     active: PropTypes.bool,
diff --git a/app/javascript/gabsocial/features/compose/components/schedule_post_button.js b/app/javascript/gabsocial/features/compose/components/schedule_post_button.js
index 4a1936ac..08cfe7a7 100644
--- a/app/javascript/gabsocial/features/compose/components/schedule_post_button.js
+++ b/app/javascript/gabsocial/features/compose/components/schedule_post_button.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { openModal } from '../../../actions/modal'
 import { closePopover, openPopover } from '../../../actions/popover'
@@ -35,7 +36,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class SchedulePostButton extends PureComponent {
+class SchedulePostButton extends React.PureComponent {
 
   static propTypes = {
     active: PropTypes.bool.isRequired,
diff --git a/app/javascript/gabsocial/features/compose/components/sensitive_media_button.js b/app/javascript/gabsocial/features/compose/components/sensitive_media_button.js
index a25d9235..55a0775b 100644
--- a/app/javascript/gabsocial/features/compose/components/sensitive_media_button.js
+++ b/app/javascript/gabsocial/features/compose/components/sensitive_media_button.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { changeComposeSensitivity } from '../../../actions/compose'
 import Switch from '../../../components/switch'
@@ -22,7 +23,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class SensitiveMediaButton extends PureComponent {
+class SensitiveMediaButton extends React.PureComponent {
 
   static propTypes = {
     active: PropTypes.bool,
diff --git a/app/javascript/gabsocial/features/compose/components/spoiler_button.js b/app/javascript/gabsocial/features/compose/components/spoiler_button.js
index 4a062361..146e79e1 100644
--- a/app/javascript/gabsocial/features/compose/components/spoiler_button.js
+++ b/app/javascript/gabsocial/features/compose/components/spoiler_button.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { changeComposeSpoilerness } from '../../../actions/compose'
 import ComposeExtraButton from './compose_extra_button'
@@ -23,7 +24,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class SpoilerButton extends PureComponent {
+class SpoilerButton extends React.PureComponent {
 
   static propTypes = {
     active: PropTypes.bool,
diff --git a/app/javascript/gabsocial/features/compose/components/status_visibility_button.js b/app/javascript/gabsocial/features/compose/components/status_visibility_button.js
index 0e432fed..9d1138c5 100644
--- a/app/javascript/gabsocial/features/compose/components/status_visibility_button.js
+++ b/app/javascript/gabsocial/features/compose/components/status_visibility_button.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { openPopover } from '../../../actions/popover'
 import ComposeExtraButton from './compose_extra_button'
@@ -21,7 +22,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-class StatusVisibilityButton extends PureComponent {
+class StatusVisibilityButton extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/features/compose/components/upload_form.js b/app/javascript/gabsocial/features/compose/components/upload_form.js
index 502f27ed..aeb4d590 100644
--- a/app/javascript/gabsocial/features/compose/components/upload_form.js
+++ b/app/javascript/gabsocial/features/compose/components/upload_form.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ProgressBar from '../../../components/progress_bar'
diff --git a/app/javascript/gabsocial/features/compose/compose.js b/app/javascript/gabsocial/features/compose/compose.js
index 60dc9806..067db4fa 100644
--- a/app/javascript/gabsocial/features/compose/compose.js
+++ b/app/javascript/gabsocial/features/compose/compose.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { clearCompose } from '../../actions/compose'
 import ComposeFormContainer from './containers/compose_form_container'
 
@@ -7,7 +8,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export default
 @connect(null, mapDispatchToProps)
-class Compose extends PureComponent {
+class Compose extends React.PureComponent {
 
   static propTypes = {
     onClearCompose: PropTypes.func.isRequired,
diff --git a/app/javascript/gabsocial/features/compose/containers/compose_form_container.js b/app/javascript/gabsocial/features/compose/containers/compose_form_container.js
index 18ae2ac1..b8cacf59 100644
--- a/app/javascript/gabsocial/features/compose/containers/compose_form_container.js
+++ b/app/javascript/gabsocial/features/compose/containers/compose_form_container.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { List as ImmutableList } from 'immutable'
 import ComposeForm from '../components/compose_form'
 import {
diff --git a/app/javascript/gabsocial/features/follow_requests.js b/app/javascript/gabsocial/features/follow_requests.js
index abc56aea..9ccd1334 100644
--- a/app/javascript/gabsocial/features/follow_requests.js
+++ b/app/javascript/gabsocial/features/follow_requests.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { FormattedMessage } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/features/followers.js b/app/javascript/gabsocial/features/followers.js
index 75730838..6ad6626a 100644
--- a/app/javascript/gabsocial/features/followers.js
+++ b/app/javascript/gabsocial/features/followers.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import debounce from 'lodash.debounce'
diff --git a/app/javascript/gabsocial/features/following.js b/app/javascript/gabsocial/features/following.js
index 8e146622..d7585eb2 100644
--- a/app/javascript/gabsocial/features/following.js
+++ b/app/javascript/gabsocial/features/following.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import debounce from 'lodash.debounce'
diff --git a/app/javascript/gabsocial/features/generic_not_found.js b/app/javascript/gabsocial/features/generic_not_found.js
index 149d50bb..2bd97222 100644
--- a/app/javascript/gabsocial/features/generic_not_found.js
+++ b/app/javascript/gabsocial/features/generic_not_found.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import ColumnIndicator from '../components/column_indicator'
 
-export default class GenericNotFound extends PureComponent {
+export default class GenericNotFound extends React.PureComponent {
 
   render() {
     return (
diff --git a/app/javascript/gabsocial/features/group_about.js b/app/javascript/gabsocial/features/group_about.js
index 1e54c10d..946bf7f9 100644
--- a/app/javascript/gabsocial/features/group_about.js
+++ b/app/javascript/gabsocial/features/group_about.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import isObject from 'lodash.isobject'
@@ -9,7 +10,6 @@ import {
 	GroupInfoPanel
 } from '../features/ui/util/async_components'
 
-
 const mapStateToProps = (state, { params }) => {
 	const groupId = isObject(params) ? params['id'] : null
 	const group = state.getIn(['groups', groupId])
diff --git a/app/javascript/gabsocial/features/group_collection_timeline.js b/app/javascript/gabsocial/features/group_collection_timeline.js
index 3b2c725e..cb1619e4 100644
--- a/app/javascript/gabsocial/features/group_collection_timeline.js
+++ b/app/javascript/gabsocial/features/group_collection_timeline.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { injectIntl, defineMessages } from 'react-intl'
 import { List as ImmutableList } from 'immutable'
 import { me } from '../initial_state'
@@ -61,7 +61,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @injectIntl
 @connect(mapStateToProps, mapDispatchToProps)
-class GroupCollectionTimeline extends PureComponent {
+class GroupCollectionTimeline extends React.PureComponent {
 
 	static propTypes = {
 		params: PropTypes.object.isRequired,
@@ -169,7 +169,7 @@ class GroupCollectionTimeline extends PureComponent {
 		) : intl.formatMessage(messages.empty)
 
 		return (
-			<Fragment>
+			<React.Fragment>
 				<GroupSortBlock collectionType={collectionType} />
 				<StatusList
 					scrollKey={`group-collection-timeline-${collectionType}`}
@@ -177,7 +177,7 @@ class GroupCollectionTimeline extends PureComponent {
 					onLoadMore={this.handleLoadMore}
 					emptyMessage={emptyMessage}
 				/>
-			</Fragment>
+			</React.Fragment>
 		)
 	}
 
diff --git a/app/javascript/gabsocial/features/group_create.js b/app/javascript/gabsocial/features/group_create.js
index 3edca06b..9c5b74b2 100644
--- a/app/javascript/gabsocial/features/group_create.js
+++ b/app/javascript/gabsocial/features/group_create.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl } from 'react-intl'
@@ -259,7 +259,7 @@ class GroupCreate extends ImmutablePureComponent {
 
 				{
 					memberCount >= 50 && !hasGroupSlug &&
-					<Fragment>
+					<React.Fragment>
 						<Input
 							id='group-id'
 							title={intl.formatMessage(messages.idTitle)}
@@ -276,7 +276,7 @@ class GroupCreate extends ImmutablePureComponent {
 						</Text>
 
 						<Divider isInvisible />
-					</Fragment>
+					</React.Fragment>
 				}
 
 				<Input
diff --git a/app/javascript/gabsocial/features/group_members.js b/app/javascript/gabsocial/features/group_members.js
index d8b6e480..a836ec34 100644
--- a/app/javascript/gabsocial/features/group_members.js
+++ b/app/javascript/gabsocial/features/group_members.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import debounce from 'lodash.debounce'
diff --git a/app/javascript/gabsocial/features/group_removed_accounts.js b/app/javascript/gabsocial/features/group_removed_accounts.js
index 71d6fde6..b412b8ee 100644
--- a/app/javascript/gabsocial/features/group_removed_accounts.js
+++ b/app/javascript/gabsocial/features/group_removed_accounts.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/features/group_timeline.js b/app/javascript/gabsocial/features/group_timeline.js
index c8d1ce36..8ef04c43 100644
--- a/app/javascript/gabsocial/features/group_timeline.js
+++ b/app/javascript/gabsocial/features/group_timeline.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { injectIntl, defineMessages } from 'react-intl'
@@ -136,7 +136,7 @@ class GroupTimeline extends ImmutablePureComponent {
 		}
 
 		return (
-			<Fragment>
+			<React.Fragment>
 				<GroupSortBlock />
 				<StatusList
 					scrollKey={`group-timeline-${groupId}`}
@@ -144,7 +144,7 @@ class GroupTimeline extends ImmutablePureComponent {
 					onLoadMore={this.handleLoadMore}
 					emptyMessage={intl.formatMessage(messages.empty)}
 				/>
-			</Fragment>
+			</React.Fragment>
 		)
 	}
 
diff --git a/app/javascript/gabsocial/features/groups_collection.js b/app/javascript/gabsocial/features/groups_collection.js
index 04c63a51..d812ad91 100644
--- a/app/javascript/gabsocial/features/groups_collection.js
+++ b/app/javascript/gabsocial/features/groups_collection.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { injectIntl, defineMessages } from 'react-intl'
diff --git a/app/javascript/gabsocial/features/hashtag_timeline.js b/app/javascript/gabsocial/features/hashtag_timeline.js
index 205bc436..90d81c2b 100644
--- a/app/javascript/gabsocial/features/hashtag_timeline.js
+++ b/app/javascript/gabsocial/features/hashtag_timeline.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { FormattedMessage } from 'react-intl'
 import isEqual from 'lodash.isequal'
 import { expandHashtagTimeline, clearTimeline } from '../actions/timelines'
@@ -10,7 +11,7 @@ const mapStateToProps = (state, props) => ({
 
 export default
 @connect(mapStateToProps)
-class HashtagTimeline extends PureComponent {
+class HashtagTimeline extends React.PureComponent {
 
   disconnects = [];
 
diff --git a/app/javascript/gabsocial/features/home_timeline.js b/app/javascript/gabsocial/features/home_timeline.js
index 9f9836b8..4417c697 100644
--- a/app/javascript/gabsocial/features/home_timeline.js
+++ b/app/javascript/gabsocial/features/home_timeline.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { withRouter } from 'react-router-dom'
 import throttle from 'lodash.throttle'
@@ -27,7 +28,7 @@ export default
 @injectIntl
 @withRouter
 @connect(mapStateToProps, mapDispatchToProps)
-class HomeTimeline extends PureComponent {
+class HomeTimeline extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/features/introduction.js b/app/javascript/gabsocial/features/introduction.js
index 4c0ae363..d5766071 100644
--- a/app/javascript/gabsocial/features/introduction.js
+++ b/app/javascript/gabsocial/features/introduction.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import ReactSwipeableViews from 'react-swipeable-views'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
@@ -25,7 +25,7 @@ import Pagination from '../components/pagination'
 import ComposeFormContainer from './compose/containers/compose_form_container'
 import Responsive from './ui/util/responsive_component'
 
-class SlideWelcome extends PureComponent {
+class SlideWelcome extends React.PureComponent {
 
   render() {
     return (
@@ -172,7 +172,7 @@ class SlideGroups extends ImmutablePureComponent {
 
 }
 
-class SlideFirstPost extends PureComponent {
+class SlideFirstPost extends React.PureComponent {
 
   static propTypes = {
     submitted: PropTypes.bool.isRequired,
@@ -187,7 +187,7 @@ class SlideFirstPost extends PureComponent {
         <div className={[_s.default, _s.py15, _s.px15].join(' ')}>
           {
             !submitted &&
-            <Fragment>
+            <React.Fragment>
               <Text size='large' className={_s.pb10}>Now let's make your very first Gab post! Please introduce yourself to the Gab community. How did you hear about Gab? What are you interested in?</Text>
               <br />
 
@@ -201,11 +201,11 @@ class SlideFirstPost extends PureComponent {
                   autoJoinGroup
                 />
               </div>
-            </Fragment>
+            </React.Fragment>
           }
           {
             submitted &&
-            <Fragment>
+            <React.Fragment>
               <Text size='large' align='center'>Your gab was posted!</Text>
               <br />
               <Text size='large' align='center'>Welcome to our community, remember to speak freely.</Text>
@@ -216,7 +216,7 @@ class SlideFirstPost extends PureComponent {
               >
                 Finish
               </Button>
-            </Fragment>
+            </React.Fragment>
           }
 
         </div>
@@ -362,14 +362,14 @@ class Introduction extends ImmutablePureComponent {
             >
               {
                 currentIndex === 3 &&
-                <Fragment>
+                <React.Fragment>
                   <Responsive min={BREAKPOINT_EXTRA_SMALL}>
                     <Text color='white' className={_s.px5}>{nextTitle}</Text>
                   </Responsive>
                   <Responsive max={BREAKPOINT_EXTRA_SMALL}>
                     <Icon id='check' size='14px' className={_s.colorWhite} />
                   </Responsive>
-                </Fragment>
+                </React.Fragment>
               }
             </Button>
           </div>
diff --git a/app/javascript/gabsocial/features/liked_statuses.js b/app/javascript/gabsocial/features/liked_statuses.js
index e5ad8608..2019e923 100644
--- a/app/javascript/gabsocial/features/liked_statuses.js
+++ b/app/javascript/gabsocial/features/liked_statuses.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { FormattedMessage } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
diff --git a/app/javascript/gabsocial/features/list_create.js b/app/javascript/gabsocial/features/list_create.js
index 4a50058e..c73bf275 100644
--- a/app/javascript/gabsocial/features/list_create.js
+++ b/app/javascript/gabsocial/features/list_create.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { changeListEditorTitle, submitListEditor } from '../actions/lists'
 import { closeModal } from '../actions/modal'
@@ -30,7 +31,7 @@ const mapDispatchToProps = (dispatch, { isModal }) => ({
 export default
 @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-class ListCreate extends PureComponent {
+class ListCreate extends React.PureComponent {
 
   static propTypes = {
     value: PropTypes.string,
diff --git a/app/javascript/gabsocial/features/list_edit.js b/app/javascript/gabsocial/features/list_edit.js
index 96ea6c3d..025d9a62 100644
--- a/app/javascript/gabsocial/features/list_edit.js
+++ b/app/javascript/gabsocial/features/list_edit.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { injectIntl, defineMessages } from 'react-intl'
diff --git a/app/javascript/gabsocial/features/list_timeline.js b/app/javascript/gabsocial/features/list_timeline.js
index b319a20f..5242c8f5 100644
--- a/app/javascript/gabsocial/features/list_timeline.js
+++ b/app/javascript/gabsocial/features/list_timeline.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { FormattedMessage } from 'react-intl'
diff --git a/app/javascript/gabsocial/features/lists_directory.js b/app/javascript/gabsocial/features/lists_directory.js
index 7885c062..0b06cd31 100644
--- a/app/javascript/gabsocial/features/lists_directory.js
+++ b/app/javascript/gabsocial/features/lists_directory.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/features/mutes.js b/app/javascript/gabsocial/features/mutes.js
index 32c010b2..06ab7a0d 100644
--- a/app/javascript/gabsocial/features/mutes.js
+++ b/app/javascript/gabsocial/features/mutes.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { injectIntl, FormattedMessage } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
diff --git a/app/javascript/gabsocial/features/news.js b/app/javascript/gabsocial/features/news.js
index 2f6404dd..c7123f0b 100644
--- a/app/javascript/gabsocial/features/news.js
+++ b/app/javascript/gabsocial/features/news.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { withRouter } from 'react-router-dom'
 import isObject from 'lodash.isobject'
 import queryString from 'query-string'
@@ -31,7 +32,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @withRouter
 @connect(mapStateToProps, mapDispatchToProps)
-class News extends PureComponent {
+class News extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/features/notifications.js b/app/javascript/gabsocial/features/notifications.js
index 1b2bdd9f..b848447c 100644
--- a/app/javascript/gabsocial/features/notifications.js
+++ b/app/javascript/gabsocial/features/notifications.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { withRouter } from 'react-router-dom'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
@@ -160,7 +160,7 @@ class Notifications extends ImmutablePureComponent {
     this.scrollableContent = scrollableContent
 
     return (
-      <Fragment>
+      <React.Fragment>
         <TimelineQueueButtonHeader
           onClick={this.handleDequeueNotifications}
           count={totalQueuedNotificationsCount}
@@ -182,7 +182,7 @@ class Notifications extends ImmutablePureComponent {
             {scrollableContent}
           </ScrollableList>
         </Block>
-      </Fragment>
+      </React.Fragment>
     )
   }
 
diff --git a/app/javascript/gabsocial/features/pro_timeline.js b/app/javascript/gabsocial/features/pro_timeline.js
index bc0d6aa3..0956a79f 100644
--- a/app/javascript/gabsocial/features/pro_timeline.js
+++ b/app/javascript/gabsocial/features/pro_timeline.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { expandProTimeline } from '../actions/timelines'
 import { connectProStream } from '../actions/streaming'
@@ -10,7 +11,7 @@ const messages = defineMessages({
 export default
 @injectIntl
 @connect(null)
-class ProTimeline extends PureComponent {
+class ProTimeline extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
diff --git a/app/javascript/gabsocial/features/search.js b/app/javascript/gabsocial/features/search.js
index 68090384..6f6b9505 100644
--- a/app/javascript/gabsocial/features/search.js
+++ b/app/javascript/gabsocial/features/search.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { withRouter } from 'react-router-dom'
diff --git a/app/javascript/gabsocial/features/shortcuts.js b/app/javascript/gabsocial/features/shortcuts.js
index ba223f16..65457b8b 100644
--- a/app/javascript/gabsocial/features/shortcuts.js
+++ b/app/javascript/gabsocial/features/shortcuts.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { fetchShortcuts } from '../actions/shortcuts'
diff --git a/app/javascript/gabsocial/features/status.js b/app/javascript/gabsocial/features/status.js
index 4ea37a95..6b0a043e 100644
--- a/app/javascript/gabsocial/features/status.js
+++ b/app/javascript/gabsocial/features/status.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import {
diff --git a/app/javascript/gabsocial/features/status_likes.js b/app/javascript/gabsocial/features/status_likes.js
index 21e36c37..6284b35c 100644
--- a/app/javascript/gabsocial/features/status_likes.js
+++ b/app/javascript/gabsocial/features/status_likes.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { FormattedMessage } from 'react-intl'
diff --git a/app/javascript/gabsocial/features/status_reposts.js b/app/javascript/gabsocial/features/status_reposts.js
index 7736d038..e6277aab 100644
--- a/app/javascript/gabsocial/features/status_reposts.js
+++ b/app/javascript/gabsocial/features/status_reposts.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import { FormattedMessage } from 'react-intl'
diff --git a/app/javascript/gabsocial/features/ui/ui.js b/app/javascript/gabsocial/features/ui/ui.js
index 7428c3fc..2f1328ef 100644
--- a/app/javascript/gabsocial/features/ui/ui.js
+++ b/app/javascript/gabsocial/features/ui/ui.js
@@ -1,5 +1,6 @@
 'use strict'
 
+import React from 'react'
 import { HotKeys } from 'react-hotkeys'
 import { defineMessages, injectIntl } from 'react-intl'
 import { Switch, Redirect, withRouter } from 'react-router-dom'
@@ -126,7 +127,7 @@ const keyMap = {
   goToRequests: 'g r',
 }
 
-class SwitchingArea extends PureComponent {
+class SwitchingArea extends React.PureComponent {
 
   static propTypes = {
     children: PropTypes.node,
@@ -265,7 +266,7 @@ export default
 @connect(mapStateToProps)
 @injectIntl
 @withRouter
-class UI extends PureComponent {
+class UI extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object.isRequired,
diff --git a/app/javascript/gabsocial/features/ui/util/bundle.js b/app/javascript/gabsocial/features/ui/util/bundle.js
index 45d0af4a..64a9ab48 100644
--- a/app/javascript/gabsocial/features/ui/util/bundle.js
+++ b/app/javascript/gabsocial/features/ui/util/bundle.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import {
   fetchBundleRequest,
   fetchBundleSuccess,
@@ -21,7 +22,7 @@ const noop = () => { }
 
 export default
 @connect(null, mapDispatchToProps)
-class Bundle extends PureComponent {
+class Bundle extends React.PureComponent {
 
   static propTypes = {
     fetchComponent: PropTypes.func.isRequired,
diff --git a/app/javascript/gabsocial/features/ui/util/page_title.js b/app/javascript/gabsocial/features/ui/util/page_title.js
index 3afd571f..cdd14f56 100644
--- a/app/javascript/gabsocial/features/ui/util/page_title.js
+++ b/app/javascript/gabsocial/features/ui/util/page_title.js
@@ -1,7 +1,8 @@
+import React from 'react'
 import isEqual from 'lodash.isequal'
 import { APP_NAME } from '../../../constants'
 
-class PageTitle extends PureComponent {
+class PageTitle extends React.PureComponent {
 
   componentDidMount() {
     this.updatePageTitle(this.props) 
diff --git a/app/javascript/gabsocial/features/ui/util/reduced_motion.js b/app/javascript/gabsocial/features/ui/util/reduced_motion.js
index 0bfbdb61..7b05f3d8 100644
--- a/app/javascript/gabsocial/features/ui/util/reduced_motion.js
+++ b/app/javascript/gabsocial/features/ui/util/reduced_motion.js
@@ -1,6 +1,7 @@
 // Like react-motion's Motion, but reduces all animations to cross-fades
 // for the benefit of users with motion sickness.
 import Motion from 'react-motion/lib/Motion';
+import React from 'react'
 
 const stylesToKeep = ['opacity', 'backgroundOpacity'];
 
@@ -9,7 +10,7 @@ const extractValue = (value) => {
   return (typeof value === 'object' && value && 'val' in value) ? value.val : value;
 };
 
-class ReducedMotion extends PureComponent {
+class ReducedMotion extends React.PureComponent {
 
   static propTypes = {
     defaultStyle: PropTypes.object,
diff --git a/app/javascript/gabsocial/features/ui/util/responsive_classes_component.js b/app/javascript/gabsocial/features/ui/util/responsive_classes_component.js
index e5881269..a6baba9d 100644
--- a/app/javascript/gabsocial/features/ui/util/responsive_classes_component.js
+++ b/app/javascript/gabsocial/features/ui/util/responsive_classes_component.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import {
   BREAKPOINT_EXTRA_LARGE,
   BREAKPOINT_LARGE,
@@ -9,7 +10,7 @@ import { getWindowDimension } from '../../../utils/is_mobile'
 
 const initialState = getWindowDimension()
 
-export default class ResponsiveClassesComponent extends PureComponent {
+export default class ResponsiveClassesComponent extends React.PureComponent {
 
   static propTypes = {
     classNames: PropTypes.string,
diff --git a/app/javascript/gabsocial/features/ui/util/responsive_component.js b/app/javascript/gabsocial/features/ui/util/responsive_component.js
index 5dba6bbc..303c4a66 100644
--- a/app/javascript/gabsocial/features/ui/util/responsive_component.js
+++ b/app/javascript/gabsocial/features/ui/util/responsive_component.js
@@ -1,8 +1,9 @@
+import React from 'react'
 import { getWindowDimension } from '../../../utils/is_mobile'
 
 const initialState = getWindowDimension()
 
-export default class Responsive extends PureComponent {
+export default class Responsive extends React.PureComponent {
 
   static propTypes = {
     min: PropTypes.number,
diff --git a/app/javascript/gabsocial/features/ui/util/wrapped_bundle.js b/app/javascript/gabsocial/features/ui/util/wrapped_bundle.js
index 5abc42ad..c97368f4 100644
--- a/app/javascript/gabsocial/features/ui/util/wrapped_bundle.js
+++ b/app/javascript/gabsocial/features/ui/util/wrapped_bundle.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import Bundle from './bundle'
 
-class WrappedBundle extends PureComponent {
+class WrappedBundle extends React.PureComponent {
 
   render() {
     const {
diff --git a/app/javascript/gabsocial/features/ui/util/wrapped_route.js b/app/javascript/gabsocial/features/ui/util/wrapped_route.js
index 8cdc8200..dc531835 100644
--- a/app/javascript/gabsocial/features/ui/util/wrapped_route.js
+++ b/app/javascript/gabsocial/features/ui/util/wrapped_route.js
@@ -1,10 +1,11 @@
+import React from 'react'
 import api from '../../../api'
 import { Route } from 'react-router-dom'
 import BundleColumnError from '../../../components/bundle_column_error'
 import Bundle from './bundle'
 import { me } from '../../../initial_state'
 
-export default class WrappedRoute extends PureComponent {
+export default class WrappedRoute extends React.PureComponent {
   static propTypes = {
     component: PropTypes.func.isRequired,
     page: PropTypes.func.isRequired,
diff --git a/app/javascript/gabsocial/layouts/about_layout.js b/app/javascript/gabsocial/layouts/about_layout.js
index 7fb279e4..8f7161a6 100644
--- a/app/javascript/gabsocial/layouts/about_layout.js
+++ b/app/javascript/gabsocial/layouts/about_layout.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import {
   CX,
   BREAKPOINT_EXTRA_SMALL,
@@ -15,7 +16,7 @@ import {
   SidebarXS,
 } from '../features/ui/util/async_components'
 
-export default class SettingsLayout extends PureComponent {
+export default class SettingsLayout extends React.PureComponent {
 
   static propTypes = {
     title: PropTypes.string,
diff --git a/app/javascript/gabsocial/layouts/default_layout.js b/app/javascript/gabsocial/layouts/default_layout.js
index 09c4ab2f..821ae2fc 100644
--- a/app/javascript/gabsocial/layouts/default_layout.js
+++ b/app/javascript/gabsocial/layouts/default_layout.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import Layout from './layout'
 
-class DefaultLayout extends PureComponent {
+class DefaultLayout extends React.PureComponent {
 
   render() {
     const {
diff --git a/app/javascript/gabsocial/layouts/explore_layout.js b/app/javascript/gabsocial/layouts/explore_layout.js
index e9387811..66140f24 100644
--- a/app/javascript/gabsocial/layouts/explore_layout.js
+++ b/app/javascript/gabsocial/layouts/explore_layout.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import throttle from 'lodash.throttle'
diff --git a/app/javascript/gabsocial/layouts/group_layout.js b/app/javascript/gabsocial/layouts/group_layout.js
index 7096f502..7259a6b7 100644
--- a/app/javascript/gabsocial/layouts/group_layout.js
+++ b/app/javascript/gabsocial/layouts/group_layout.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import Sticky from 'react-stickynode'
diff --git a/app/javascript/gabsocial/layouts/introduction_layout.js b/app/javascript/gabsocial/layouts/introduction_layout.js
index 443ef103..8ab12a8f 100644
--- a/app/javascript/gabsocial/layouts/introduction_layout.js
+++ b/app/javascript/gabsocial/layouts/introduction_layout.js
@@ -1,10 +1,11 @@
+import React from 'react'
 import Block from '../components/block'
 import Icon from '../components/icon'
 import BundleColumnError from '../components/bundle_column_error'
 import Bundle from '../features/ui/util/bundle'
 import { Introduction } from '../features/ui/util/async_components'
 
-export default class IntroductionLayout extends PureComponent {
+export default class IntroductionLayout extends React.PureComponent {
 
   renderError = (props) => {
     return <BundleColumnError {...props} />
diff --git a/app/javascript/gabsocial/layouts/layout.js b/app/javascript/gabsocial/layouts/layout.js
index 799f8532..665f6a96 100644
--- a/app/javascript/gabsocial/layouts/layout.js
+++ b/app/javascript/gabsocial/layouts/layout.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import Sticky from 'react-stickynode'
 import {
   CX,
@@ -20,7 +21,7 @@ import {
   SidebarXS,
 } from '../features/ui/util/async_components'
 
-class Layout extends PureComponent {
+class Layout extends React.PureComponent {
 
   render() {
     const {
diff --git a/app/javascript/gabsocial/layouts/profile_layout.js b/app/javascript/gabsocial/layouts/profile_layout.js
index 687c8bd0..6ae971fd 100644
--- a/app/javascript/gabsocial/layouts/profile_layout.js
+++ b/app/javascript/gabsocial/layouts/profile_layout.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { BREAKPOINT_EXTRA_SMALL } from '../constants'
diff --git a/app/javascript/gabsocial/layouts/settings_layout.js b/app/javascript/gabsocial/layouts/settings_layout.js
index aca9cbd1..5dcb2d03 100644
--- a/app/javascript/gabsocial/layouts/settings_layout.js
+++ b/app/javascript/gabsocial/layouts/settings_layout.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import {
   CX,
   BREAKPOINT_EXTRA_SMALL,
@@ -13,7 +14,7 @@ import {
   SidebarXS,
 } from '../features/ui/util/async_components'
 
-export default class SettingsLayout extends PureComponent {
+export default class SettingsLayout extends React.PureComponent {
 
   static propTypes = {
     title: PropTypes.string,
diff --git a/app/javascript/gabsocial/main.js b/app/javascript/gabsocial/main.js
index 5cfa6526..8acfc0e6 100644
--- a/app/javascript/gabsocial/main.js
+++ b/app/javascript/gabsocial/main.js
@@ -1,9 +1,10 @@
 'use strict';
 
-import * as registerPushNotifications from './actions/push_notifications';
-import { default as GabSocial, store } from './containers/gabsocial';
+import React from 'react'
 import ReactDOM from 'react-dom';
 import ready from './ready';
+import * as registerPushNotifications from './actions/push_notifications';
+import { default as GabSocial, store } from './containers/gabsocial';
 
 function main() {
   ready(() => {
diff --git a/app/javascript/gabsocial/pages/about_page.js b/app/javascript/gabsocial/pages/about_page.js
index 0e0f5ef9..726c1175 100644
--- a/app/javascript/gabsocial/pages/about_page.js
+++ b/app/javascript/gabsocial/pages/about_page.js
@@ -1,7 +1,8 @@
+import React from 'react'
 import PageTitle from '../features/ui/util/page_title'
 import AboutLayout from '../layouts/about_layout'
 
-class AboutPage extends PureComponent {
+class AboutPage extends React.PureComponent {
 
   render() {
     const { children, title } = this.props
diff --git a/app/javascript/gabsocial/pages/basic_page.js b/app/javascript/gabsocial/pages/basic_page.js
index 8de7f8ae..56d85d44 100644
--- a/app/javascript/gabsocial/pages/basic_page.js
+++ b/app/javascript/gabsocial/pages/basic_page.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import PageTitle from '../features/ui/util/page_title'
 import DefaultLayout from '../layouts/default_layout'
 import {
@@ -6,7 +7,7 @@ import {
   WhoToFollowPanel,
 } from '../features/ui/util/async_components'
 
-class BasicPage extends PureComponent {
+class BasicPage extends React.PureComponent {
 
   render() {
     const {
diff --git a/app/javascript/gabsocial/pages/community_page.js b/app/javascript/gabsocial/pages/community_page.js
index d04a54c9..37f06633 100644
--- a/app/javascript/gabsocial/pages/community_page.js
+++ b/app/javascript/gabsocial/pages/community_page.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { openModal } from '../actions/modal'
 import PageTitle from '../features/ui/util/page_title'
@@ -11,7 +12,7 @@ import {
   WhoToFollowPanel,
 } from '../features/ui/util/async_components'
 
-class CommunityPage extends PureComponent {
+class CommunityPage extends React.PureComponent {
 
   onOpenCommunityPageSettingsModal = () => {
     this.props.dispatch(openModal(MODAL_COMMUNITY_TIMELINE_SETTINGS))
diff --git a/app/javascript/gabsocial/pages/error_page.js b/app/javascript/gabsocial/pages/error_page.js
index b911ae2d..ef4aff8c 100644
--- a/app/javascript/gabsocial/pages/error_page.js
+++ b/app/javascript/gabsocial/pages/error_page.js
@@ -1,4 +1,6 @@
-export default class ErrorPage extends PureComponent {
+import React from 'react'
+
+export default class ErrorPage extends React.PureComponent {
 
 	render() {
 		const { children } = this.props
diff --git a/app/javascript/gabsocial/pages/explore_page.js b/app/javascript/gabsocial/pages/explore_page.js
index 5664dd10..c1c0a09a 100644
--- a/app/javascript/gabsocial/pages/explore_page.js
+++ b/app/javascript/gabsocial/pages/explore_page.js
@@ -1,7 +1,8 @@
+import React from 'react'
 import PageTitle from '../features/ui/util/page_title'
 import ExploreLayout from '../layouts/explore_layout'
 
-class ExplorePage extends PureComponent {
+class ExplorePage extends React.PureComponent {
 
   render() {
     const { children, title } = this.props
diff --git a/app/javascript/gabsocial/pages/group_page.js b/app/javascript/gabsocial/pages/group_page.js
index e586a0b1..cb557216 100644
--- a/app/javascript/gabsocial/pages/group_page.js
+++ b/app/javascript/gabsocial/pages/group_page.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
@@ -37,10 +37,10 @@ class GroupPage extends ImmutablePureComponent {
 
 				{
 					!!relationships && isTimeline && relationships.get('member') &&
-					<Fragment>
+					<React.Fragment>
 						<TimelineComposeBlock size={46} groupId={groupId} autoFocus />
 						<Divider />
-					</Fragment>
+					</React.Fragment>
 				}
 
 				{children}
diff --git a/app/javascript/gabsocial/pages/groups_page.js b/app/javascript/gabsocial/pages/groups_page.js
index 4d4ed165..aac5d10d 100644
--- a/app/javascript/gabsocial/pages/groups_page.js
+++ b/app/javascript/gabsocial/pages/groups_page.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { me } from '../initial_state'
 import { defineMessages, injectIntl } from 'react-intl'
 import PageTitle from '../features/ui/util/page_title'
@@ -10,7 +11,7 @@ import {
   LinkFooter,
 } from '../features/ui/util/async_components'
 
-class GroupsPage extends PureComponent {
+class GroupsPage extends React.PureComponent {
 
   render() {
     const {
diff --git a/app/javascript/gabsocial/pages/hashtag_page.js b/app/javascript/gabsocial/pages/hashtag_page.js
index a842a89c..7e090692 100644
--- a/app/javascript/gabsocial/pages/hashtag_page.js
+++ b/app/javascript/gabsocial/pages/hashtag_page.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { openModal } from '../actions/modal'
 import { defineMessages, injectIntl } from 'react-intl'
 import isObject from 'lodash.isobject'
@@ -11,7 +12,7 @@ import {
   WhoToFollowPanel,
 } from '../features/ui/util/async_components'
 
-class HashtagPage extends PureComponent {
+class HashtagPage extends React.PureComponent {
 
   onOpenHashtagPageSettingsModal = () => {
     const { params } = this.props
diff --git a/app/javascript/gabsocial/pages/home_page.js b/app/javascript/gabsocial/pages/home_page.js
index dbae588d..e26170e0 100644
--- a/app/javascript/gabsocial/pages/home_page.js
+++ b/app/javascript/gabsocial/pages/home_page.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import throttle from 'lodash.throttle'
 import { openModal } from '../actions/modal'
 import { defineMessages, injectIntl } from 'react-intl'
@@ -21,7 +22,7 @@ import {
   ProgressPanel,
 } from '../features/ui/util/async_components'
 
-class HomePage extends PureComponent {
+class HomePage extends React.PureComponent {
 
   state = {
     lazyLoaded: false,
diff --git a/app/javascript/gabsocial/pages/introduction_page.js b/app/javascript/gabsocial/pages/introduction_page.js
index 087c09d8..15191519 100644
--- a/app/javascript/gabsocial/pages/introduction_page.js
+++ b/app/javascript/gabsocial/pages/introduction_page.js
@@ -1,7 +1,8 @@
+import React from 'react'
 import PageTitle from '../features/ui/util/page_title'
 import IntroductionLayout from '../layouts/introduction_layout'
 
-export default class IntroductionPage extends PureComponent {
+export default class IntroductionPage extends React.PureComponent {
 
   render() {
     return (
diff --git a/app/javascript/gabsocial/pages/list_page.js b/app/javascript/gabsocial/pages/list_page.js
index d7f08601..b552533a 100644
--- a/app/javascript/gabsocial/pages/list_page.js
+++ b/app/javascript/gabsocial/pages/list_page.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { defineMessages, injectIntl } from 'react-intl'
diff --git a/app/javascript/gabsocial/pages/lists_page.js b/app/javascript/gabsocial/pages/lists_page.js
index 8e6ade00..a1e26418 100644
--- a/app/javascript/gabsocial/pages/lists_page.js
+++ b/app/javascript/gabsocial/pages/lists_page.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { openModal } from '../actions/modal'
 import { defineMessages, injectIntl } from 'react-intl'
 import PageTitle from '../features/ui/util/page_title'
@@ -9,7 +10,7 @@ import {
   WhoToFollowPanel,
 } from '../features/ui/util/async_components'
 
-class ListsPage extends PureComponent {
+class ListsPage extends React.PureComponent {
 
   onOpenListCreateModal = () => {
     this.props.dispatch(openModal(MODAL_LIST_CREATE))
diff --git a/app/javascript/gabsocial/pages/modal_page.js b/app/javascript/gabsocial/pages/modal_page.js
index 37e1da97..68dce5da 100644
--- a/app/javascript/gabsocial/pages/modal_page.js
+++ b/app/javascript/gabsocial/pages/modal_page.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import PageTitle from '../features/ui/util/page_title'
 import Block from '../components/block'
 import DefaultLayout from '../layouts/default_layout'
@@ -6,7 +7,7 @@ import {
   WhoToFollowPanel,
 } from '../features/ui/util/async_components'
 
-class ModalPage extends PureComponent {
+class ModalPage extends React.PureComponent {
 
   render() {
     const {
diff --git a/app/javascript/gabsocial/pages/news_page.js b/app/javascript/gabsocial/pages/news_page.js
index cc59df66..a9419652 100644
--- a/app/javascript/gabsocial/pages/news_page.js
+++ b/app/javascript/gabsocial/pages/news_page.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import PageTitle from '../features/ui/util/page_title'
 import DefaultLayout from '../layouts/default_layout'
 import {
@@ -8,7 +9,7 @@ import {
   VerifiedAccountsPanel,
 } from '../features/ui/util/async_components'
 
-class NewsPage extends PureComponent {
+class NewsPage extends React.PureComponent {
 
   render() {
     const { children, title } = this.props
diff --git a/app/javascript/gabsocial/pages/notifications_page.js b/app/javascript/gabsocial/pages/notifications_page.js
index d0fa8b5a..56d0d472 100644
--- a/app/javascript/gabsocial/pages/notifications_page.js
+++ b/app/javascript/gabsocial/pages/notifications_page.js
@@ -1,4 +1,4 @@
-
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { setFilter } from '../actions/notifications'
 import { me } from '../initial_state'
@@ -12,7 +12,7 @@ import {
   WhoToFollowPanel,
 } from '../features/ui/util/async_components'
 
-class NotificationsPage extends PureComponent {
+class NotificationsPage extends React.PureComponent {
 
   onChangeActiveFilter(notificationType) {
     this.props.dispatch(setFilter('active', notificationType))
diff --git a/app/javascript/gabsocial/pages/pro_page.js b/app/javascript/gabsocial/pages/pro_page.js
index 5c257909..c7ff212d 100644
--- a/app/javascript/gabsocial/pages/pro_page.js
+++ b/app/javascript/gabsocial/pages/pro_page.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import PageTitle from '../features/ui/util/page_title'
 import DefaultLayout from '../layouts/default_layout'
@@ -7,7 +8,7 @@ import {
   ProgressPanel,
 } from '../features/ui/util/async_components'
 
-class ProPage extends PureComponent {
+class ProPage extends React.PureComponent {
 
   render() {
     const { intl, children } = this.props
diff --git a/app/javascript/gabsocial/pages/profile_page.js b/app/javascript/gabsocial/pages/profile_page.js
index 006a324e..3cf6db79 100644
--- a/app/javascript/gabsocial/pages/profile_page.js
+++ b/app/javascript/gabsocial/pages/profile_page.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { FormattedMessage } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
diff --git a/app/javascript/gabsocial/pages/search_page.js b/app/javascript/gabsocial/pages/search_page.js
index daf9c722..5ffb13aa 100644
--- a/app/javascript/gabsocial/pages/search_page.js
+++ b/app/javascript/gabsocial/pages/search_page.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { BREAKPOINT_EXTRA_SMALL } from '../constants'
 import Responsive from '../features/ui/util/responsive_component'
@@ -11,7 +12,7 @@ import {
   SignUpPanel,
 } from '../features/ui/util/async_components'
 
-class SearchPage extends PureComponent {
+class SearchPage extends React.PureComponent {
 
   componentWillMount() {
     const { intl } = this.props
diff --git a/app/javascript/gabsocial/pages/settings_page.js b/app/javascript/gabsocial/pages/settings_page.js
index 965ef1c3..ae6e5a45 100644
--- a/app/javascript/gabsocial/pages/settings_page.js
+++ b/app/javascript/gabsocial/pages/settings_page.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import SettingsLayout from '../layouts/settings_layout'
 
-class SettingsPage extends PureComponent {
+class SettingsPage extends React.PureComponent {
 	
 	render() {
 		const {
diff --git a/app/javascript/gabsocial/pages/shortcuts_page.js b/app/javascript/gabsocial/pages/shortcuts_page.js
index 1c5333d6..8bffdc95 100644
--- a/app/javascript/gabsocial/pages/shortcuts_page.js
+++ b/app/javascript/gabsocial/pages/shortcuts_page.js
@@ -1,3 +1,4 @@
+import React from 'react'
 import { defineMessages, injectIntl } from 'react-intl'
 import { openModal } from '../actions/modal'
 import { MODAL_EDIT_SHORTCUTS } from '../constants'
@@ -9,7 +10,7 @@ import {
   WhoToFollowPanel,
 } from '../features/ui/util/async_components'
 
-class ShortcutsPage extends PureComponent {
+class ShortcutsPage extends React.PureComponent {
 
   handleOnOpenEditShortcutsModal = () => {
     this.props.dispatch(openModal(MODAL_EDIT_SHORTCUTS))
diff --git a/app/javascript/gabsocial/utils/numbers.js b/app/javascript/gabsocial/utils/numbers.js
index f6c4374e..89971a79 100644
--- a/app/javascript/gabsocial/utils/numbers.js
+++ b/app/javascript/gabsocial/utils/numbers.js
@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import React from 'react'
 import { FormattedNumber } from 'react-intl'
 
 export const shortNumberFormat = (number) => {
@@ -11,9 +11,9 @@ export const shortNumberFormat = (number) => {
   }
 
   return (
-    <Fragment>
+    <React.Fragment>
       <FormattedNumber value={number / 1000} maximumFractionDigits={1} />k
-    </Fragment>
+    </React.Fragment>
   )
 }
 
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 23a3fa6d..78eaa915 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -63,8 +63,6 @@ module.exports = {
 
   plugins: [
     new webpack.ProvidePlugin({
-      React: 'react',
-      PureComponent: ['react', 'PureComponent'],
       connect: ['react-redux', 'connect'],
       PropTypes: 'prop-types',
       _s: `${resolve(settings.source_path)}/styles/global.css`,