From d3a75fb099afead90cba6103f5d34bea41c56f7b Mon Sep 17 00:00:00 2001
From: magmahindenburg <emil@moar.se>
Date: Sun, 18 Jun 2017 17:45:46 +0900
Subject: [PATCH] Fixed a bug where notifications are displayed twice.
 Redundant notifications are now removed

---
 src/js/controllers/activity.js | 24 ++++++++++++++++++++++++
 src/js/controllers/tab-home.js | 23 +++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/src/js/controllers/activity.js b/src/js/controllers/activity.js
index 9ea9a31e9..3d3495755 100644
--- a/src/js/controllers/activity.js
+++ b/src/js/controllers/activity.js
@@ -11,6 +11,30 @@ angular.module('copayApp.controllers').controller('activityController',
           $log.error(err);
           return;
         }
+
+        var txIdList = [];
+
+        var notificationsBeforeCheck = n.length;
+
+        for (var i=0; i<n.length; i++) {
+            var txId = n[i].txid;
+            if (txIdList.includes(txId)) {
+                n.splice(i, 1);
+                i = i - 1;
+            } else {
+                txIdList.push(txId)
+            }
+        }
+
+        var notificationsAfterCheck = n.length;
+        var removedNotifications = notificationsBeforeCheck - notificationsAfterCheck;
+
+        if (notificationsBeforeCheck != notificationsAfterCheck) {
+            console.log("Found a redundant notification. Removed " + removedNotifications);
+        }
+
+        console.log(n);
+
         $scope.fetchingNotifications = false;
         $scope.notifications = n;
 
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 9a32b3ee0..76d293fdd 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -248,6 +248,29 @@ angular.module('copayApp.controllers').controller('tabHomeController',
           $log.error(err);
           return;
         }
+
+        var txIdList = [];
+
+        var notificationsBeforeCheck = notifications.length;
+        
+        for (var i=0; i<notifications.length; i++) {
+            var txId = notifications[i].txid;
+            if (txIdList.includes(txId)) {
+                notifications.splice(i, 1);
+                i = i - 1;
+            } else {
+                txIdList.push(txId)
+            }
+        }
+
+        var notificationsAfterCheck = notifications.length;
+        var removedNotifications = notificationsBeforeCheck - notificationsAfterCheck;
+
+        if (notificationsBeforeCheck != notificationsAfterCheck) {
+            console.log("Found a redundant notification. Removed " + removedNotifications);
+            total = total - removedNotifications;
+        }
+
         $scope.notifications = notifications;
         $scope.notificationsN = total;
         $timeout(function() {