Infinite scroll for timeline columns

1 files changed, 17 insertions, 1 deletions

diff --git a/app/assets/javascripts/components/reducers/notifications.jsx b/app/assets/javascripts/components/reducers/notifications.jsx
index a1d99f0e1..47641557d 100644
--- a/app/assets/javascripts/components/reducers/notifications.jsx
+++ b/app/assets/javascripts/components/reducers/notifications.jsx
@@ -1,8 +1,18 @@
 import { COMPOSE_SUBMIT_FAIL, COMPOSE_UPLOAD_FAIL } from '../actions/compose';
 import { FOLLOW_SUBMIT_FAIL }                       from '../actions/follow';
 import { REBLOG_FAIL, FAVOURITE_FAIL }              from '../actions/interactions';
-import { TIMELINE_REFRESH_FAIL }                    from '../actions/timelines';
+import {
+  TIMELINE_REFRESH_FAIL,
+  TIMELINE_EXPAND_FAIL
+}                                                   from '../actions/timelines';
 import { NOTIFICATION_DISMISS, NOTIFICATION_CLEAR } from '../actions/notifications';
+import {
+  ACCOUNT_FETCH_FAIL,
+  ACCOUNT_FOLLOW_FAIL,
+  ACCOUNT_UNFOLLOW_FAIL,
+  ACCOUNT_TIMELINE_FETCH_FAIL
+}                                                   from '../actions/accounts';
+import { STATUS_FETCH_FAIL }                        from '../actions/statuses';
 import Immutable                                    from 'immutable';
 
 const initialState = Immutable.List();
@@ -33,6 +43,12 @@ export default function notifications(state = initialState, action) {
     case REBLOG_FAIL:
     case FAVOURITE_FAIL:
     case TIMELINE_REFRESH_FAIL:
+    case TIMELINE_EXPAND_FAIL:
+    case ACCOUNT_FETCH_FAIL:
+    case ACCOUNT_FOLLOW_FAIL:
+    case ACCOUNT_UNFOLLOW_FAIL:
+    case ACCOUNT_TIMELINE_FETCH_FAIL:
+    case STATUS_FETCH_FAIL:
       return notificationFromError(state, action.error);
     case NOTIFICATION_DISMISS:
       return state.filterNot(item => item.get('key') === action.notification.key);