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

fix notification

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-07-16 11:43:26 -03:00
commit 42dd516b60
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/services/txStatus.js
View file

@ -7,6 +7,7 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash,
var fc = profileService.focusedClient;
var status = txp.status;
var type;
var INMEDIATE_SECS = 10;
if (status == 'broadcasted') {
type = 'broadcasted';
@ -17,10 +18,15 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash,
copayerId: fc.credentials.copayerId
});
if (!action || (action.type == 'accept' && n == 1)) {
if (!action) {
type = 'created';
} else if (action.type == 'accept') {
type = 'accepted';
// created and accepted at the same time?
if ( n == 1 && action.createdOn - txp.createdOn < INMEDIATE_SECS ) {
type = 'created';
} else {
type = 'accepted';
}
} else if (action.type == 'reject') {
type = 'rejected';
} else {