diff --git a/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx b/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
index e3b26c9f3c..48c242621a 100644
--- a/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
+++ b/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
@@ -2,7 +2,6 @@ import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import { injectIntl } from 'react-intl';
-import emojify from '../features/emoji/emoji';
 import classNames from 'classnames';
 import EmojiView from './emoji_view';
 
@@ -50,7 +49,6 @@ class EmojiReactionButton extends React.PureComponent {
 
 }
 
-export default @injectIntl
 class StatusEmojiReactionsBar extends React.PureComponent {
 
   static propTypes = {
@@ -73,7 +71,7 @@ class StatusEmojiReactionsBar extends React.PureComponent {
   render () {
     const { emojiReactions } = this.props;
 
-    const emojiButtons = Array.from(emojiReactions).filter(emoji => emoji.get('count') != 0).map((emoji, index) => (
+    const emojiButtons = Array.from(emojiReactions).filter(emoji => emoji.get('count') !== 0).map((emoji, index) => (
       <EmojiReactionButton
         key={index}
         name={emoji.get('name')}
@@ -94,3 +92,5 @@ class StatusEmojiReactionsBar extends React.PureComponent {
   }
 
 }
+
+export default injectIntl(StatusEmojiReactionsBar);
diff --git a/app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx b/app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx
index ce45363a75..cc9f32e2b1 100644
--- a/app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx
@@ -5,7 +5,6 @@ import IconButton from '../../../components/icon_button';
 import Overlay from 'react-overlays/Overlay';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import classNames from 'classnames';
-import Icon from 'mastodon/components/icon';
 
 const messages = defineMessages({
   add_expiration: { id: 'status.expiration.add', defaultMessage: 'Set status expiration' },
@@ -119,7 +118,6 @@ class ExpirationDropdownMenu extends React.PureComponent {
 
 }
 
-export default @injectIntl
 class ExpirationDropdown extends React.PureComponent {
 
   static propTypes = {
@@ -266,3 +264,5 @@ class ExpirationDropdown extends React.PureComponent {
   }
 
 }
+
+export default injectIntl(ExpirationDropdown);
diff --git a/app/javascript/mastodon/features/emoji_reacted_statuses/index.jsx b/app/javascript/mastodon/features/emoji_reacted_statuses/index.jsx
index 6d878d3da3..2d290b7403 100644
--- a/app/javascript/mastodon/features/emoji_reacted_statuses/index.jsx
+++ b/app/javascript/mastodon/features/emoji_reacted_statuses/index.jsx
@@ -22,8 +22,6 @@ const mapStateToProps = state => ({
   hasMore: !!state.getIn(['status_lists', 'emoji_reactions', 'next']),
 });
 
-export default @connect(mapStateToProps)
-@injectIntl
 class EmojiReactions extends ImmutablePureComponent {
 
   static propTypes = {
@@ -106,3 +104,5 @@ class EmojiReactions extends ImmutablePureComponent {
   }
 
 }
+
+export default connect(mapStateToProps)(injectIntl(EmojiReactions));
diff --git a/app/javascript/mastodon/features/emoji_reactions/index.jsx b/app/javascript/mastodon/features/emoji_reactions/index.jsx
index a0a79c8796..8e687c62c9 100644
--- a/app/javascript/mastodon/features/emoji_reactions/index.jsx
+++ b/app/javascript/mastodon/features/emoji_reactions/index.jsx
@@ -6,7 +6,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 import ColumnHeader from 'mastodon/components/column_header';
 import Icon from 'mastodon/components/icon';
-import { fetchEmojiReactions, fetchFavourites } from 'mastodon/actions/interactions';
+import { fetchEmojiReactions } from 'mastodon/actions/interactions';
 import LoadingIndicator from 'mastodon/components/loading_indicator';
 import ScrollableList from 'mastodon/components/scrollable_list';
 import AccountContainer from 'mastodon/containers/account_container';
@@ -18,12 +18,12 @@ const messages = defineMessages({
   refresh: { id: 'refresh', defaultMessage: 'Refresh' },
 });
 
-const mapStateToProps = (state, props) => { return {
-  accountIds: state.getIn(['user_lists', 'emoji_reactioned_by', props.params.statusId]),
-} };
+const mapStateToProps = (state, props) => {
+  return {
+    accountIds: state.getIn(['user_lists', 'emoji_reactioned_by', props.params.statusId]),
+  };
+};
 
-export default @connect(mapStateToProps)
-@injectIntl
 class EmojiReactions extends ImmutablePureComponent {
 
   static propTypes = {
@@ -88,7 +88,7 @@ class EmojiReactions extends ImmutablePureComponent {
         >
           {Object.keys(groups).map((key) =>(
             <AccountContainer key={key} id={key} withNote={false}>
-              <div style={ { 'maxWidth': '100px' } }>
+              <div style={{ 'maxWidth': '100px' }}>
                 {groups[key].map((value, index2) => <EmojiView key={index2} name={value.name} url={value.url} staticUrl={value.static_url} />)}
               </div>
             </AccountContainer>
@@ -103,3 +103,5 @@ class EmojiReactions extends ImmutablePureComponent {
   }
 
 }
+
+export default connect(mapStateToProps)(injectIntl(EmojiReactions));