From 6c8eea5160df5e104b1267a158c4e7257cbf0741 Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Mon, 27 Jan 2020 14:46:42 -0500
Subject: [PATCH] Updates for missing vars in components

---
 .../gabsocial/components/account/account.js   |  4 +---
 .../column_header_setting_button.js           |  6 ++---
 .../modal/compose_modal/compose_modal.js      |  3 ++-
 .../components/modal/modal_layout.js          |  2 +-
 .../section_headline_bar.js                   | 22 ++++++++++++-------
 .../components/trending_item/trending_item.js |  2 ++
 .../account_gallery/account_gallery.js        |  2 +-
 .../components/media_item/media_item.js       |  2 ++
 .../character_counter/character_counter.js    |  8 ++++---
 .../compose_search/compose_search.js          |  4 ++--
 .../gabsocial/features/following/following.js |  1 -
 .../list_editor_search/list_editor_search.js  |  3 +--
 .../notification_filter_bar.js                | 14 ++++++------
 .../gabsocial/features/status/status.js       |  2 +-
 .../gabsocial/pages/profile_page.js           | 11 ++++++----
 15 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/app/javascript/gabsocial/components/account/account.js b/app/javascript/gabsocial/components/account/account.js
index 49f56afa..0f9b769b 100644
--- a/app/javascript/gabsocial/components/account/account.js
+++ b/app/javascript/gabsocial/components/account/account.js
@@ -64,9 +64,7 @@ class Account extends ImmutablePureComponent {
   render() {
     const { account, intl, hidden, onActionClick, actionIcon, actionTitle, displayOnly } = this.props;
 
-    if (!account) {
-      return <div />;
-    }
+    if (!account) return null;
 
     if (hidden) {
       return (
diff --git a/app/javascript/gabsocial/components/column_header_setting_button/column_header_setting_button.js b/app/javascript/gabsocial/components/column_header_setting_button/column_header_setting_button.js
index 9e05e4b0..953828aa 100644
--- a/app/javascript/gabsocial/components/column_header_setting_button/column_header_setting_button.js
+++ b/app/javascript/gabsocial/components/column_header_setting_button/column_header_setting_button.js
@@ -9,12 +9,12 @@ export default class ColumnHeaderSettingButton extends PureComponent {
   static propTypes = {
     title: PropTypes.node.isRequired,
     icon: PropTypes.string.isRequired,
-    onClick: PropTypes.func.isRequired,
+    onClick: PropTypes.func,
     to: PropTypes.string,
   };
 
   render () {
-    const { title, icon, to } = this.props;
+    const { title, icon, to, onClick } = this.props;
 
     const classes = classNames('column-header-setting-btn', {
       'column-header-setting-btn--link': !!to
@@ -30,7 +30,7 @@ export default class ColumnHeaderSettingButton extends PureComponent {
     }
 
     return (
-      <button className={classes} tabIndex='0' onClick={this.props.onClick}>
+      <button className={classes} tabIndex='0' onClick={onClick}>
         <Icon id={icon} />
         {title}
       </button>
diff --git a/app/javascript/gabsocial/components/modal/compose_modal/compose_modal.js b/app/javascript/gabsocial/components/modal/compose_modal/compose_modal.js
index d1f6c7e8..8e8fe869 100644
--- a/app/javascript/gabsocial/components/modal/compose_modal/compose_modal.js
+++ b/app/javascript/gabsocial/components/modal/compose_modal/compose_modal.js
@@ -3,6 +3,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { openModal } from '../../../actions/modal';
 import { cancelReplyCompose } from '../../../actions/compose';
 import ModalLayout from '../modal_layout';
+import TimelineComposeBlock from '../../timeline_compose_block';
 
 const messages = defineMessages({
   confirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
@@ -46,7 +47,7 @@ class ComposeModal extends ImmutablePureComponent {
     const { intl } = this.props;
 
     return (
-      <ModalLayout title={intl.formatMessage(messages.title)} onClose={onClickClose}>
+      <ModalLayout title={intl.formatMessage(messages.title)} onClose={this.onClickClose}>
         <TimelineComposeBlock />
       </ModalLayout>
     );
diff --git a/app/javascript/gabsocial/components/modal/modal_layout.js b/app/javascript/gabsocial/components/modal/modal_layout.js
index 5102acba..97da11a1 100644
--- a/app/javascript/gabsocial/components/modal/modal_layout.js
+++ b/app/javascript/gabsocial/components/modal/modal_layout.js
@@ -16,7 +16,7 @@ class ModalLayout extends PureComponent {
   };
 
   render() {
-    const { title, children } = this.props;
+    const { title, children, intl, onClose } = this.props;
 
     return (
       <div className='modal modal--layout modal--root'>
diff --git a/app/javascript/gabsocial/components/section_headline_bar/section_headline_bar.js b/app/javascript/gabsocial/components/section_headline_bar/section_headline_bar.js
index cf158052..c888b0e1 100644
--- a/app/javascript/gabsocial/components/section_headline_bar/section_headline_bar.js
+++ b/app/javascript/gabsocial/components/section_headline_bar/section_headline_bar.js
@@ -8,7 +8,7 @@ class SectionHeadlineBarItem extends PureComponent {
     icon: PropTypes.string,
     className: PropTypes.string,
     onClick: PropTypes.func,
-    title: PropTypes.oneOf([
+    title: PropTypes.oneOfType([
       PropTypes.string,
       PropTypes.node,
     ]),
@@ -21,14 +21,20 @@ class SectionHeadlineBarItem extends PureComponent {
     const classes = classNames('section-header-bar__item', className);
 
     if (to) {
-      return (<NavLink className={classes} exact={exact} to={to}>{title}</NavLink>);
+      return (
+        <NavLink className={classes} exact={exact} to={to}>{title}</NavLink>
+      )
     } else if (icon) {
-      <button className={classes} onClick={onClick} title={title}>
-        <Icon id={icon} fixedWidth />
-      </button>
+      return (
+        <button className={classes} onClick={onClick} title={title}>
+          <Icon id={icon} fixedWidth />
+        </button>
+      )
     }
 
-    return (<button className={classes} onClick={onClick}>{title}</button>)
+    return (
+      <button className={classes} onClick={onClick}>{title}</button>
+    )
   }
 };
 
@@ -46,8 +52,8 @@ export default class SectionHeadlineBar extends PureComponent {
     return (
       <div className={classes}>
         {
-          items.forEach(item, i => (
-            <SectionHeadlineBarItem key={`shbi-{i}`} {...item} />
+          items.forEach((item, i) => (
+            <SectionHeadlineBarItem key={`shbi-${i}`} {...item} />
           ))
         }
       </div>
diff --git a/app/javascript/gabsocial/components/trending_item/trending_item.js b/app/javascript/gabsocial/components/trending_item/trending_item.js
index 55e85412..7990b90d 100644
--- a/app/javascript/gabsocial/components/trending_item/trending_item.js
+++ b/app/javascript/gabsocial/components/trending_item/trending_item.js
@@ -14,6 +14,8 @@ export default class TrendingItem extends ImmutablePureComponent {
   };
 
   render() {
+    const { hashtag } = this.props;
+    
     return (
       <div className='trending-item'>
         <div className='trending-item__text'>
diff --git a/app/javascript/gabsocial/features/account_gallery/account_gallery.js b/app/javascript/gabsocial/features/account_gallery/account_gallery.js
index 620c5b11..f1d4303b 100644
--- a/app/javascript/gabsocial/features/account_gallery/account_gallery.js
+++ b/app/javascript/gabsocial/features/account_gallery/account_gallery.js
@@ -157,7 +157,7 @@ class AccountGallery extends ImmutablePureComponent {
   }
 
   render () {
-    const { attachments, isLoading, hasMore, isAccount, accountId, unavailable, accountUsername } = this.props;
+    const { attachments, isLoading, hasMore, isAccount, accountId, unavailable, accountUsername, intl } = this.props;
     const { width } = this.state;
 
     if (!isAccount && accountId !== -1) {
diff --git a/app/javascript/gabsocial/features/account_gallery/components/media_item/media_item.js b/app/javascript/gabsocial/features/account_gallery/components/media_item/media_item.js
index 56d4f873..50d0412b 100644
--- a/app/javascript/gabsocial/features/account_gallery/components/media_item/media_item.js
+++ b/app/javascript/gabsocial/features/account_gallery/components/media_item/media_item.js
@@ -6,6 +6,8 @@ import classNames from 'classnames';
 import { decode } from 'blurhash';
 import { isIOS } from 'gabsocial/utils/is_mobile';
 
+import './media_item.scss';
+
 export default class MediaItem extends ImmutablePureComponent {
 
   static propTypes = {
diff --git a/app/javascript/gabsocial/features/compose/components/character_counter/character_counter.js b/app/javascript/gabsocial/features/compose/components/character_counter/character_counter.js
index a1a59042..7efe6e46 100644
--- a/app/javascript/gabsocial/features/compose/components/character_counter/character_counter.js
+++ b/app/javascript/gabsocial/features/compose/components/character_counter/character_counter.js
@@ -17,9 +17,11 @@ export default class CharacterCounter extends PureComponent {
       'character-counter--over': (diff < 0),
     });
 
-    <div className='character-counter__wrapper'>
-      <span className={classes}>{diff}</span>
-    </div>
+    return (
+      <div className='character-counter__wrapper'>
+        <span className={classes}>{diff}</span>
+      </div>
+    )
   }
 
 }
diff --git a/app/javascript/gabsocial/features/compose/components/compose_search/compose_search.js b/app/javascript/gabsocial/features/compose/components/compose_search/compose_search.js
index b575c548..bcea4125 100644
--- a/app/javascript/gabsocial/features/compose/components/compose_search/compose_search.js
+++ b/app/javascript/gabsocial/features/compose/components/compose_search/compose_search.js
@@ -50,7 +50,7 @@ class ComposeSearch extends PureComponent {
   }
 
   render () {
-    const { intl, value, onShow, ...rest } = this.props;
+    const { intl, value, onShow, openInRoute } = this.props;
 
     return (
       <Search
@@ -61,7 +61,7 @@ class ComposeSearch extends PureComponent {
         handleClear={this.handleClear}
         onShow={onShow}
         withOverlay
-        {...rest}
+        openInRoute
       />
     )
   }
diff --git a/app/javascript/gabsocial/features/following/following.js b/app/javascript/gabsocial/features/following/following.js
index 1f97d080..d732ac1e 100644
--- a/app/javascript/gabsocial/features/following/following.js
+++ b/app/javascript/gabsocial/features/following/following.js
@@ -43,7 +43,6 @@ const mapStateToProps = (state, { params: { username } }) => {
 
 
 export default @connect(mapStateToProps)
-@injectIntl
 class Following extends ImmutablePureComponent {
 
   static propTypes = {
diff --git a/app/javascript/gabsocial/features/list_editor/components/list_editor_search/list_editor_search.js b/app/javascript/gabsocial/features/list_editor/components/list_editor_search/list_editor_search.js
index 7a2d3f39..8c7fe09b 100644
--- a/app/javascript/gabsocial/features/list_editor/components/list_editor_search/list_editor_search.js
+++ b/app/javascript/gabsocial/features/list_editor/components/list_editor_search/list_editor_search.js
@@ -48,7 +48,7 @@ class ListEditorSearch extends PureComponent {
   }
 
   render () {
-    const { value, intl, ...rest } = this.props;
+    const { value, intl } = this.props;
 
     return (
       <Search
@@ -60,7 +60,6 @@ class ListEditorSearch extends PureComponent {
         handleSubmit={this.handleSubmit}
         handleClear={this.handleClear}
         searchTitle={intl.formatMessage(messages.searchTitle)}
-        {...rest}
       />
     )
   }
diff --git a/app/javascript/gabsocial/features/notifications/components/notification_filter_bar/notification_filter_bar.js b/app/javascript/gabsocial/features/notifications/components/notification_filter_bar/notification_filter_bar.js
index 6b6002a3..b02276f2 100644
--- a/app/javascript/gabsocial/features/notifications/components/notification_filter_bar/notification_filter_bar.js
+++ b/app/javascript/gabsocial/features/notifications/components/notification_filter_bar/notification_filter_bar.js
@@ -1,7 +1,7 @@
 import { defineMessages, injectIntl } from 'react-intl';
 import SectionHeadlineBar from '../../../../components/section_headline_bar';
 
-const tooltips = defineMessages({
+const messages = defineMessages({
   mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
   favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favorites' },
   boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Reposts' },
@@ -58,33 +58,33 @@ class NotificationFilterBar extends PureComponent {
           {
             className: selectedFilter === 'mention' ? 'active' : '',
             onClick: this.onClick('mention'),
-            title: intl.formatMessage(tooltips.mentions),
+            title: intl.formatMessage(messages.mentions),
             icon: 'at',
           },
           {
             className: selectedFilter === 'favourite' ? 'active' : '',
             onClick: this.onClick('favourite'),
-            title: intl.formatMessage(tooltips.favourites),
+            title: intl.formatMessage(messages.favourites),
             icon: 'star',
           },
           {
             className: selectedFilter === 'reblog' ? 'active' : '',
             onClick: this.onClick('reblog'),
-            title: intl.formatMessage(tooltips.boosts),
+            title: intl.formatMessage(messages.boosts),
             icon: 'retweet',
           },
           {
             className: selectedFilter === 'poll' ? 'active' : '',
             onClick: this.onClick('poll'),
-            title: intl.formatMessage(tooltips.polls),
+            title: intl.formatMessage(messages.polls),
             icon: 'tasks',
           },
           {
             className: selectedFilter === 'follow' ? 'active' : '',
             onClick: this.onClick('follow'),
-            title: intl.formatMessage(tooltips.follows),
+            title: intl.formatMessage(messages.follows),
             icon: 'user-plus',
-          }
+          },
         ]}
       />
     )
diff --git a/app/javascript/gabsocial/features/status/status.js b/app/javascript/gabsocial/features/status/status.js
index aa0c25c5..1a8b382b 100644
--- a/app/javascript/gabsocial/features/status/status.js
+++ b/app/javascript/gabsocial/features/status/status.js
@@ -420,7 +420,7 @@ class Status extends ImmutablePureComponent {
     const { fullscreen } = this.state;
 
     if (status === null) {
-      return (<ColumnIndicator type='missing' />);
+      return (<ColumnIndicator type='loading' />);
     }
 
     if (ancestorsIds && ancestorsIds.size > 0) {
diff --git a/app/javascript/gabsocial/pages/profile_page.js b/app/javascript/gabsocial/pages/profile_page.js
index 7802ef5f..ccc143fc 100644
--- a/app/javascript/gabsocial/pages/profile_page.js
+++ b/app/javascript/gabsocial/pages/profile_page.js
@@ -2,7 +2,7 @@ import { Fragment } from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import HeaderContainer from '../features/account_timeline/containers/header_container';
-import {WhoToFollowPanel, SignUpPanel} from '../components/panel';
+import { WhoToFollowPanel, SignUpPanel } from '../components/panel';
 import LinkFooter from '../components/link_footer';
 import ProfileInfoPanel from '../features/account_timeline/components/profile_info_panel/profile_info_panel';
 import ColumnsArea from '../components/columns_area';
@@ -37,12 +37,15 @@ class ProfilePage extends ImmutablePureComponent {
   static propTypes = {
     account: ImmutablePropTypes.map,
     accountUsername: PropTypes.string.isRequired,
-    accountId: PropTypes.number.isRequired,
+    accountId: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.number,
+    ]).isRequired,
     children: PropTypes.node,
   };
 
-  render () {
-    const {accountId, account, accountUsername} = this.props;
+  render() {
+    const { accountId, account, accountUsername } = this.props;
 
     return (
       <ColumnsArea