Merge branch 'fix/notification-bugs' into 'develop'

#474 Fix notification bugs

Closes #474

See merge request pleroma/pleroma-fe!728

1 files changed, 6 insertions, 2 deletions

diff --git a/src/modules/users.js b/src/modules/users.js
index 5839574b..becf66d2 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -353,7 +353,8 @@ const users = {
       store.commit('setToken', false)
       store.dispatch('stopFetching', 'friends')
       store.commit('setBackendInteractor', backendInteractorService())
-      store.dispatch('stopFetchingNotifications')
+      store.dispatch('stopFetching', 'notifications')
+      store.commit('clearNotifications')
       store.commit('resetStatuses')
     },
     loginUser (store, accessToken) {
@@ -385,7 +386,10 @@ const users = {
               }
 
               // Start getting fresh posts.
-              store.dispatch('startFetching', { timeline: 'friends' })
+              store.dispatch('startFetchingTimeline', { timeline: 'friends' })
+
+              // Start fetching notifications
+              store.dispatch('startFetchingNotifications')
 
               // Get user mutes
               store.dispatch('fetchMutes')