Fix more code discrepancies

app/javascript/flavours/glitch/components/modal_root.jsx

@@ -110,8 +110,9 @@ class ModalRoot extends PureComponent {
   }
 
   _handleModalClose () {
-    this.unlistenHistory();
-
+    if (this.unlistenHistory) {
+      this.unlistenHistory();
+    }
     const { state } = this.history.location;
     if (state && state.mastodonModalKey === this._modalHistoryKey) {
       this.history.goBack();

app/javascript/flavours/glitch/features/emoji/emoji.js

@@ -138,7 +138,6 @@ const emojify = (str, customEmojis = {}) => {
 };
 
 export default emojify;
-export { unicodeMapping };
 
 export const buildCustomEmojis = (customEmojis) => {
   const emojis = [];

app/javascript/flavours/glitch/features/mutes/index.jsx

@@ -48,7 +48,7 @@ class Mutes extends ImmutablePureComponent {
   }, 300, { leading: true });
 
   render () {
-    const { intl, accountIds, hasMore, multiColumn, isLoading } = this.props;
+    const { intl, hasMore, accountIds, multiColumn, isLoading } = this.props;
 
     if (!accountIds) {
       return (

app/javascript/flavours/glitch/features/public_timeline/index.jsx

@@ -44,14 +44,14 @@ const mapStateToProps = (state, { columnId }) => {
 
 class PublicTimeline extends PureComponent {
 
-  static defaultProps = {
-    onlyMedia: false,
-  };
-
   static contextTypes = {
     identity: PropTypes.object,
   };
 
+  static defaultProps = {
+    onlyMedia: false,
+  };
+
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,

app/javascript/flavours/glitch/reducers/index.ts

@@ -68,8 +68,8 @@ const reducers = {
   push_notifications,
   mutes,
   blocks,
-  server,
   boosts,
+  server,
   contexts,
   compose,
   search,