Skip to content

Commit e45487e

Browse files
committed
notification bundle fix
1 parent 3841a56 commit e45487e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/projects/detail/containers/FeedContainer.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ class FeedView extends React.Component {
7676
const notReadNotifications = filterReadNotifications(this.props.notifications.notifications)
7777
const unreadTopicAndPostChangedNotifications = filterTopicAndPostChangedNotifications(filterNotificationsByProjectId(notReadNotifications, this.props.project.id))
7878
this.setState({ unreadUpdate: _.map(unreadTopicAndPostChangedNotifications, 'id' ) })
79-
console.log('scrolled '+this.state.scrolled)
8079
if (!this.isChanged() && !this.state.scrolled && this.state.unreadUpdate.length > 0) {
8180
this.onRefreshFeeds()
8281
}

src/routes/notifications/constants/notifications.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ export const NOTIFICATIONS = [
296296
eventType: 'notifications.connect.project.linkCreated',
297297
type: NOTIFICATION_TYPE.NEW_POSTS,
298298
rules: [{
299-
text: '<strong>{{userHandle}}</strong> added to your project',
299+
text: '<strong>{{userHandle}}</strong> added a link to your project',
300300
projectRoles: [PROJECT_ROLE_OWNER, PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER, PROJECT_ROLE_MEMBER],
301301
goTo: GOTO.PROJECT_DASHBOARD
302302
}]
@@ -305,7 +305,7 @@ export const NOTIFICATIONS = [
305305
eventType: 'notifications.connect.project.linkCreated',
306306
type: NOTIFICATION_TYPE.NEW_POSTS,
307307
rules: [{
308-
text: '<strong>{{userFullName}}</strong> added to your project',
308+
text: '<strong>{{userFullName}}</strong> added a link to your project',
309309
projectRoles: [PROJECT_ROLE_OWNER, PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER, PROJECT_ROLE_MEMBER],
310310
goTo: GOTO.PROJECT_DASHBOARD
311311
}]

src/routes/notifications/helpers/notifications.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,8 @@ const bundleNotifications = (notificationsWithRules) => {
286286
_.reverse(notificationsWithRules).forEach((notificationWithRule) => {
287287
// if notifications doesn't have to be bundled, add it to notifications list as it is
288288
if (!notificationWithRule.notificationRule.shouldBundle) {
289-
bundledNotificationsWithRules.push(notificationWithRule)
289+
bundledNotificationsWithRules.push(notificationWithRule);
290+
return;
290291
}
291292

292293
// try to find existent notification in the list to which we can bundle current one

0 commit comments

Comments
 (0)