bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'notif-counters' into 'develop'

Browse source 
Chats: count only unread *chats* not total unread messages for counter

See merge request soapbox-pub/soapbox-fe!291
This commit is contained in:
Alex Gleason 2020-10-03 01:12:16 +00:00
commit dc23eff7cd
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/soapbox/components/helmet.js
View file

@ -4,10 +4,10 @@ import PropTypes from 'prop-types';
import { Helmet } from'react-helmet'; import { Helmet } from'react-helmet';
const getNotifTotals = state => { const getNotifTotals = state => {
const normNotif = state.getIn(['notifications', 'unread']); const notifications = state.getIn(['notifications', 'unread'], 0);
const chatNotif = state.get('chats').reduce((acc, curr) => acc + curr.get('unread'), 0); const chats = state.get('chats').reduce((acc, curr) => acc + Math.min(curr.get('unread', 0), 1), 0);
const notifTotals = normNotif + chatNotif; const reports = state.getIn(['admin', 'open_report_count'], 0);
return notifTotals; return notifications + chats + reports;
}; };
const mapStateToProps = state => ({ const mapStateToProps = state => ({

2
app/soapbox/features/chats/components/chat_panes.js
View file

@ -29,7 +29,7 @@ const mapStateToProps = state => {
return { return {
panesData: addChatsToPanes(state, panesData), panesData: addChatsToPanes(state, panesData),
unreadCount: state.get('chats').reduce((acc, curr) => acc + curr.get('unread'), 0), unreadCount: state.get('chats').reduce((acc, curr) => acc + Math.min(curr.get('unread', 0), 1), 0),
}; };
}; };

2
app/soapbox/features/ui/components/chats_counter_icon.js
View file

@ -2,7 +2,7 @@ import { connect } from 'react-redux';
import IconWithBadge from 'soapbox/components/icon_with_badge'; import IconWithBadge from 'soapbox/components/icon_with_badge';
const mapStateToProps = state => ({ const mapStateToProps = state => ({
count: state.get('chats').reduce((acc, curr) => acc + curr.get('unread'), 0), count: state.get('chats').reduce((acc, curr) => acc + Math.min(curr.get('unread', 0), 1), 0),
id: 'comment', id: 'comment',
}); });