From 02beb533c16533faf85ace678e2f94fb9c99d605 Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Fri, 15 May 2020 17:03:31 -0400
Subject: [PATCH] Removed group item component subtitles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Removed:
- group item component subtitles until we get "unread count" working again
- unused messages, imports
---
 .../components/group_collection_item.js       | 19 -------------
 .../gabsocial/components/group_list_item.js   | 27 -------------------
 2 files changed, 46 deletions(-)

diff --git a/app/javascript/gabsocial/components/group_collection_item.js b/app/javascript/gabsocial/components/group_collection_item.js
index 9163b5e9..6c902455 100644
--- a/app/javascript/gabsocial/components/group_collection_item.js
+++ b/app/javascript/gabsocial/components/group_collection_item.js
@@ -6,15 +6,11 @@ import { defineMessages, injectIntl } from 'react-intl'
 import classNames from 'classnames/bind'
 import { PLACEHOLDER_MISSING_HEADER_SRC } from '../constants'
 import { shortNumberFormat } from '../utils/numbers'
-import Button from './button'
-import DotTextSeperator from './dot_text_seperator'
 import Image from './image'
 import Text from './text'
 
 const messages = defineMessages({
   members: { id: 'groups.card.members', defaultMessage: 'Members' },
-  new_statuses: { id: 'groups.sidebar-panel.item.view', defaultMessage: 'new gabs' },
-  no_recent_activity: { id: 'groups.sidebar-panel.item.no_recent_activity', defaultMessage: 'No recent activity' },
   viewGroup: { id: 'view_group', defaultMessage: 'View Group' },
   member: { id: 'member', defaultMessage: 'Member' },
   admin: { id: 'admin', defaultMessage: 'Admin' },
@@ -48,16 +44,6 @@ class GroupCollectionItem extends ImmutablePureComponent {
 
     if (!relationships) return null
 
-    const unreadCount = relationships.get('unread_count')
-
-    const subtitle = unreadCount > 0 ? (
-      <Fragment>
-        {shortNumberFormat(unreadCount)}
-        &nbsp;
-        {intl.formatMessage(messages.new_statuses)}
-      </Fragment>
-    ) : intl.formatMessage(messages.no_recent_activity)
-
     const isMember = relationships.get('member')
     const isAdmin = relationships.get('admin')
     const coverSrc = group.get('cover_image_url') || ''
@@ -68,7 +54,6 @@ class GroupCollectionItem extends ImmutablePureComponent {
       return (
         <Fragment>
           {group.get('title')}
-          {subtitle}
           {isMember && intl.formatMessage(messages.member)}
           {isAdmin && intl.formatMessage(messages.admin)}
         </Fragment>
@@ -149,10 +134,6 @@ class GroupCollectionItem extends ImmutablePureComponent {
                 &nbsp;
                 {intl.formatMessage(messages.members)}
               </Text>
-              <DotTextSeperator />
-              <Text color='secondary' size='small' className={_s.ml5}>
-                {subtitle}
-              </Text>
             </div>
           </div>
 
diff --git a/app/javascript/gabsocial/components/group_list_item.js b/app/javascript/gabsocial/components/group_list_item.js
index f73d4ada..6457d9f6 100644
--- a/app/javascript/gabsocial/components/group_list_item.js
+++ b/app/javascript/gabsocial/components/group_list_item.js
@@ -11,13 +11,10 @@ import Text from './text'
 
 const messages = defineMessages({
   members: { id: 'groups.card.members', defaultMessage: 'Members' },
-  new_statuses: { id: 'groups.sidebar-panel.item.view', defaultMessage: 'new gabs' },
-  no_recent_activity: { id: 'groups.sidebar-panel.item.no_recent_activity', defaultMessage: 'No recent activity' },
 })
 
 const mapStateToProps = (state, { id }) => ({
   group: state.getIn(['groups', id]),
-  relatioships: state.getIn(['group_relationships', id]),
 })
 
 export default
@@ -27,7 +24,6 @@ class GroupListItem extends ImmutablePureComponent {
 
   static propTypes = {
     group: ImmutablePropTypes.map,
-    relationships: ImmutablePropTypes.map,
     slim: PropTypes.bool,
     isLast: PropTypes.bool,
     isHidden: PropTypes.bool,
@@ -42,7 +38,6 @@ class GroupListItem extends ImmutablePureComponent {
     const {
       intl,
       group,
-      relationships,
       slim,
       isLast,
       isHidden,
@@ -50,25 +45,10 @@ class GroupListItem extends ImmutablePureComponent {
 
     if (!group) return null
 
-    let unreadCount, subtitle
-
-    if (relationships) {
-      unreadCount = relationships.get('unread_count')
-
-      subtitle = unreadCount > 0 ? (
-        <Fragment>
-          {shortNumberFormat(unreadCount)}
-          &nbsp;
-          {intl.formatMessage(messages.new_statuses)}
-        </Fragment>
-      ) : intl.formatMessage(messages.no_recent_activity)
-    }
-
     if (isHidden) {
       return (
         <Fragment>
           {group.get('title')}
-          {subtitle}
         </Fragment>
       )
     }
@@ -135,13 +115,6 @@ class GroupListItem extends ImmutablePureComponent {
             </Text>
           }
 
-          {
-            subtitle &&
-            <Text color='secondary' size='small' className={_s.mt5}>
-              {subtitle}
-            </Text>
-          }
-
         </div>
       </NavLink>
     )