diff --git a/43c46ea9eba217aae247bd25484c78131b4813a1.diff.1 b/43c46ea9eba217aae247bd25484c78131b4813a1.diff.1 new file mode 100644 index 00000000..2f8c6a55 --- /dev/null +++ b/43c46ea9eba217aae247bd25484c78131b4813a1.diff.1 @@ -0,0 +1,19 @@ +diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js +index f83f871e0..bd0189994 100644 +--- a/src/services/notifications_fetcher/notifications_fetcher.service.js ++++ b/src/services/notifications_fetcher/notifications_fetcher.service.js +@@ -56,14 +56,6 @@ const fetchNotifications = ({ store, args, older }) => { + update({ store, notifications, older }) + return notifications + }) +- .catch((error) => { +- store.dispatch('pushGlobalNotice', { +- level: 'error', +- messageKey: 'notifications.error', +- messageArgs: [error.message], +- timeout: 5000 +- }) +- }) + } + + const startFetching = ({ credentials, store }) => { diff --git a/src/i18n/en.json b/src/i18n/en.json index b52fa5a2..bcfdf720 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -139,7 +139,7 @@ }, "notifications": { "broken_favorite": "Unknown status, searching for it…", - "error": "Error fetching notifications: {0}", + "error": "Error fetching notifications", "favorited_you": "favorited your status", "followed_you": "followed you", "follow_request": "wants to follow you", @@ -676,7 +676,7 @@ "timeline": { "collapse": "Collapse", "conversation": "Conversation", - "error": "Error fetching timeline: {0}", + "error": "Error loading status", "load_older": "Load older statuses", "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated", "repeated": "repeated", diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js index f83f871e..bd018999 100644 --- a/src/services/notifications_fetcher/notifications_fetcher.service.js +++ b/src/services/notifications_fetcher/notifications_fetcher.service.js @@ -56,14 +56,6 @@ const fetchNotifications = ({ store, args, older }) => { update({ store, notifications, older }) return notifications }) - .catch((error) => { - store.dispatch('pushGlobalNotice', { - level: 'error', - messageKey: 'notifications.error', - messageArgs: [error.message], - timeout: 5000 - }) - }) } const startFetching = ({ credentials, store }) => { diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js index 46bba41a..6077fd71 100644 --- a/src/services/timeline_fetcher/timeline_fetcher.service.js +++ b/src/services/timeline_fetcher/timeline_fetcher.service.js @@ -65,14 +65,6 @@ const fetchAndUpdate = ({ update({ store, statuses, timeline, showImmediately, userId, pagination }) return { statuses, pagination } }) - .catch((error) => { - store.dispatch('pushGlobalNotice', { - level: 'error', - messageKey: 'timeline.error', - messageArgs: [error.message], - timeout: 5000 - }) - }) } const startFetching = ({ timeline = 'friends', credentials, store, userId = false, tag = false }) => {