Merge pull request #747 from lightninglabs/hide-seen-ntfns

Don't show notification count after navigating to view.

Author: tanx

src/action/nav-mobile.js

@@ -142,6 +142,7 @@ class NavAction {
   }
 
   goNotifications() {
+    this._store.unseenNtfnCount = 0;
     this._navigate('Notifications');
   }
 

src/action/nav.js

@@ -143,6 +143,7 @@ class NavAction {
   }
 
   goNotifications() {
+    this._store.unseenNtfnCount = 0;
     this._store.route = 'Notifications';
   }
 

src/action/notification.js

@@ -40,6 +40,7 @@ class NotificationAction {
       handlerLbl: handlerLbl || (err ? 'Show error logs' : null),
       display: true,
     });
+    if (!wait) this._store.unseenNtfnCount += 1;
     clearTimeout(this.tdisplay);
     this.tdisplay = setTimeout(() => this.close(), NOTIFICATION_DELAY);
   }

src/computed/notification.js

@@ -34,7 +34,7 @@ const ComputedNotification = store => {
       return all;
     },
     get notificationCountLabel() {
-      return formatNumber(store.computedNotifications.length);
+      return formatNumber(store.unseenNtfnCount);
     },
   });
 };

src/store.js

@@ -82,6 +82,7 @@ export class Store {
       paymentRequest: null,
       seedMnemonic: [],
       notifications: [],
+      unseenNtfnCount: 0,
       logs: '',
 
       // Persistent data

test/unit/action/nav.spec.js

@@ -217,9 +217,11 @@ describe('Action Nav Unit Tests', () => {
   });
 
   describe('goNotifications()', () => {
-    it('should set correct route', () => {
+    it('should set correct route and zero unseen ntfns', () => {
+      store.unseenNtfnCount = 10;
       nav.goNotifications();
       expect(store.route, 'to equal', 'Notifications');
+      expect(store.unseenNtfnCount, 'to be', 0);
     });
   });
 

test/unit/action/notification.spec.js

@@ -36,6 +36,7 @@ describe('Action Notification Unit Tests', () => {
       expect(log.info, 'was not called');
       await nap(10);
       expect(store.notifications[0].display, 'to be', false);
+      expect(store.unseenNtfnCount, 'to equal', 1);
     });
 
     it('create warning notification when type is set', () => {

test/unit/computed/notification.spec.js

@@ -38,6 +38,7 @@ describe('Computed Notification Unit Tests', () => {
         display: true,
         waiting: true,
       });
+      store.unseenNtfnCount = 2;
       ComputedNotification(store);
       expect(store.lastNotification.type, 'to equal', 'info');
       expect(store.displayNotification, 'to equal', true);