diff --git a/public/views/includes/walletActivity.html b/public/views/includes/walletActivity.html index fca106357..a4d834e45 100644 --- a/public/views/includes/walletActivity.html +++ b/public/views/includes/walletActivity.html @@ -1,14 +1,14 @@ -
+
Copayer joined
-
+
Wallet created
-
+
Payment Sent
{{x.amountStr}} @@ -17,36 +17,34 @@ -
+
Payment Received
{{x.amountStr}}
-
+
Proposal Deleted
-
+
Proposal Rejected
-
- - + + - {{x.amountStr}} - {{x.message}} - - - - Proposal Accepted - -
+ {{x.amountStr}} + {{x.message}} + + + + Proposal Accepted +

diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 058568ebc..592c10c84 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -31,19 +31,19 @@ angular.module('copayApp.controllers').controller('tabHomeController', wallet.status = status; }); }); - // - // $scope.fetchingNotifications = true; - // profileService.getNotifications({ - // limit: 3 - // }, function(err, n) { - // if (err) { - // console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO - // return; - // } - // $scope.fetchingNotifications = false; - // setNotifications(n); - // $ionicScrollDelegate.resize(); - // }) + + $scope.fetchingNotifications = true; + profileService.getNotifications({ + limit: 3 + }, function(err, n) { + if (err) { + console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO + return; + } + $scope.fetchingNotifications = false; + setNotifications(n); + $ionicScrollDelegate.resize(); + }) }; $scope.updateWallet = function(wallet) { @@ -55,17 +55,17 @@ angular.module('copayApp.controllers').controller('tabHomeController', } wallet.status = status; - // profileService.getNotifications({ - // limit: 3 - // }, function(err, n) { - // console.log('[tab-home.js.57]', n); //TODO - // if (err) { - // console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO - // return; - // } - // setNotifications(n); - // $ionicScrollDelegate.resize(); - // }) + profileService.getNotifications({ + limit: 3 + }, function(err, n) { + console.log('[tab-home.js.57]', n); //TODO + if (err) { + console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO + return; + } + setNotifications(n); + $ionicScrollDelegate.resize(); + }) }); }; diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 76d639869..a5f5c8769 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -822,26 +822,29 @@ angular.module('copayApp.services') }; }); - // condense - var finale = [], - prev; + var finale = shown; // GROUPING DISABLED! - // REMOVE (if we want 1-to-1 notification) ???? - lodash.each(shown, function(x) { - if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId && prev.creatorId && prev.creatorId === x.creatorId) { - prev.types.push(x.type); - prev.data = lodash.assign(prev.data, x.data); - prev.txid = prev.txid || x.txid; - prev.amountStr = prev.amountStr || x.amountStr; - prev.creatorName = prev.creatorName || x.creatorName; - } else { - finale.push(x); - prev = x; - } - }); - - // messages... + // var finale = [], + // prev; + // + // + // // Item grouping... DISABLED. + // + // // REMOVE (if we want 1-to-1 notification) ???? + // lodash.each(shown, function(x) { + // if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId && prev.creatorId && prev.creatorId === x.creatorId) { + // prev.types.push(x.type); + // prev.data = lodash.assign(prev.data, x.data); + // prev.txid = prev.txid || x.txid; + // prev.amountStr = prev.amountStr || x.amountStr; + // prev.creatorName = prev.creatorName || x.creatorName; + // } else { + // finale.push(x); + // prev = x; + // } + // }); + // var u = bwcService.getUtils(); lodash.each(finale, function(x) {