#436: fix notification order, follow type link issue, duplicate key
This commit is contained in:
parent
93a2510ede
commit
e5e1d4c643
5 changed files with 15 additions and 10 deletions
|
@ -269,11 +269,11 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
|
|||
}
|
||||
|
||||
const addNewNotifications = (state, { dispatch, notifications, older, visibleNotificationTypes }) => {
|
||||
const allStatuses = state.allStatuses
|
||||
const allStatusesObject = state.allStatusesObject
|
||||
// const allStatuses = state.allStatuses
|
||||
// const allStatusesObject = state.allStatusesObject
|
||||
each(notifications, (notification) => {
|
||||
notification.action = mergeOrAdd(allStatuses, allStatusesObject, notification.action).item
|
||||
notification.status = notification.status && mergeOrAdd(allStatuses, allStatusesObject, notification.status).item
|
||||
// notification.action = mergeOrAdd(allStatuses, allStatusesObject, notification.action).item
|
||||
// notification.status = notification.status && mergeOrAdd(allStatuses, allStatusesObject, notification.status).item
|
||||
|
||||
// Only add a new notification if we don't have one for the same action
|
||||
if (!state.notifications.idStore.hasOwnProperty(notification.id)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue