From a08d00c672b8aab402b52077e1f24b5c89596d6c Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jan 2016 10:20:45 +0000 Subject: [PATCH] Apply patch to the right branch: update for new count format --- config.json | 2 +- src/components/structures/RoomSubList.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 923d23ab..9834209a 100644 --- a/config.json +++ b/config.json @@ -1,4 +1,4 @@ { - "default_hs_url": "https://matrix.org", + "default_hs_url": "http://localhost:8008", "default_is_url": "https://vector.im" } diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index 903e8586..4ce5cff1 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -255,7 +255,7 @@ var RoomSubList = React.createClass({ collapsed={ self.props.collapsed || false} selected={ selected } unread={ self.props.activityMap[room.roomId] === 1 } - highlight={ (room.unread_notifications && room.unread_notifications['notification_count'] > 0) || self.props.label === 'Invites' } + highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' } isInvite={ self.props.label === 'Invites' } incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } />