anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #785 from maraoz/bug/remove-rogue-notifications

Browse source 
remove some extra old-style notifications
This commit is contained in:
Gustavo Maximiliano Cortez 2014-06-27 16:23:09 -03:00
commit 0bfbad880d
5 changed files with 24 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

22
js/controllers/header.js
View file

@ -30,16 +30,14 @@ angular.module('copayApp.controllers').controller('HeaderController',
};
var latestVersion = data[0].name.replace('v', '').split('.').map(toInt);
var currentVersion = copay.version.split('.').map(toInt);
var title = 'Copay '+data[0].name+' available.';
var content;
if (currentVersion[0] < latestVersion[0]) {
$scope.updateVersion = {
class: 'error',
version: data[0].name
};
content = 'It\'s important that you update your wallet at https://copay.io';
notification.version(title, content, true);
} else if (currentVersion[0] == latestVersion[0] && currentVersion[1] < latestVersion[1]) {
$scope.updateVersion = {
class: 'info',
version: data[0].name
};
var content = 'Please update your wallet at https://copay.io';
notification.version(title, content, false);
}
});
@ -49,14 +47,16 @@ angular.module('copayApp.controllers').controller('HeaderController',
$rootScope.txAlertCount = 0;
$rootScope.insightError = 0;
$rootScope.$watch('insightError', function(status) {
if (status === -1) {
notification.success('Networking restored', 'Connection to insight restored');
$rootScope.insightError = 0;
notification.success('Networking restored', 'Connection to Insight re-established');
//$rootScope.insightError = 0;
} else if (status !== 0) {
notification.error('Networking problem', 'Connection to Insight lost, reconnecting (attempt number '+status+')');
}
});
// Init socket handlers (with no wallet yet)
controllerUtils.setSocketHandlers();

7
js/services/controllerUtils.js
View file

@ -69,13 +69,6 @@ angular.module('copayApp.services')
$rootScope.txAlertCount = 0;
$rootScope.insightError = 0;
$rootScope.isCollapsed = true;
$rootScope.$watch('insightError', function(status) {
if (status === -1) {
notification.success('Networking restored', 'Connection to Insight re-established');
$rootScope.insightError = 0;
}
});
$rootScope.$watch('txAlertCount', function(txAlertCount) {
if (txAlertCount && txAlertCount > 0) {
notification.info('New Transaction', ($rootScope.txAlertCount == 1) ? 'You have a pending transaction proposal' : 'You have ' + $rootScope.txAlertCount + ' pending transaction proposals', txAlertCount);

8
js/services/notifications.js
View file

@ -16,6 +16,10 @@ factory('notification', ['$timeout',
duration: 5000,
enabled: true
},
version: {
duration: 60000,
enabled: true
},
warning: {
duration: 5000,
enabled: true
@ -135,6 +139,10 @@ factory('notification', ['$timeout',
return this.awesomeNotify('funds', 'bitcoin', title, content, userData);
},
version: function(title, content, severe) {
return this.awesomeNotify('version', severe ? 'alert' : 'flag', title, content);
},
error: function(title, content, userData) {
return this.awesomeNotify('error', 'x', title, content, userData);
},