From a1bd044c0c770c1a3723279d57c93db00fb6efe0 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 13 May 2023 06:05:54 -0600
Subject: [PATCH] Update Notifications component
---
resources/assets/components/Notifications.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/resources/assets/components/Notifications.vue b/resources/assets/components/Notifications.vue
index e3af689a8..2fb085b4e 100644
--- a/resources/assets/components/Notifications.vue
+++ b/resources/assets/components/Notifications.vue
@@ -54,7 +54,7 @@
</li>
</ul>
- <div v-if="notificationsEmpty && followRequestsChecked && !followRequests.accounts.length && notificationRetries <= 2">
+ <div v-if="notificationsEmpty && followRequestsChecked && !followRequests.accounts.length && notificationRetries < 2">
<div class="row justify-content-center">
<div class="col-12 col-md-10 text-center">
<img src="/img/illustrations/dk-nature-man-monochrome.svg" class="img-fluid" style="opacity: 0.6;">
@@ -63,7 +63,7 @@
</div>
</div>
- <div v-else-if="!notificationsLoaded || tabSwitching || notificationRetries != 2 || (!notifications && !followRequests && !followRequests.accounts && !followRequests.accounts.length)">
+ <div v-else-if="!notificationsLoaded || tabSwitching || ((notificationsEmpty && notificationRetries < 2 ) || !notifications && !followRequests && !followRequests.accounts && !followRequests.accounts.length)">
<placeholder />
</div>
@@ -315,9 +315,9 @@
methods: {
fetchNotifications() {
+ this.notificationRetries++;
axios.get('/api/pixelfed/v1/notifications?pg=true')
.then(res => {
- this.notificationRetries++;
if(!res || !res.data || !res.data.length) {
if(this.notificationRetries == 2) {
clearTimeout(this.notificationRetryTimeout);