BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove flashmessages from transactions

This commit is contained in:
Manuel Araoz 2014-06-26 17:56:34 -03:00
parent c400ba2695
commit 1e1ac82a14
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/controllers/transactions.js
View File

@ -107,13 +107,11 @@ angular.module('copayApp.controllers').controller('TransactionsController',
$rootScope.txAlertCount = 0; $rootScope.txAlertCount = 0;
var w = $rootScope.wallet; var w = $rootScope.wallet;
w.sendTx(ntxid, function(txid) { w.sendTx(ntxid, function(txid) {
$rootScope.$flashMessage = txid ? { if (!txid) {
type: 'success', notification.error('Error', 'There was an error sending the transaction');
message: 'Transaction broadcasted. txid: ' + txid } else {
} : { notification.success('Transaction broadcast', 'Transaction id: '+txid);
type: 'error', }
message: 'There was an error sending the Transaction'
};
if (cb) return cb(); if (cb) return cb();
else $scope.update(); else $scope.update();
}); });
@ -124,10 +122,7 @@ angular.module('copayApp.controllers').controller('TransactionsController',
var w = $rootScope.wallet; var w = $rootScope.wallet;
w.sign(ntxid, function(ret) { w.sign(ntxid, function(ret) {
if (!ret) { if (!ret) {
$rootScope.$flashMessage = { notification.error('Error', 'There was an error signing the transaction');
type: 'error',
message: 'There was an error signing the Transaction',
};
$scope.update(); $scope.update();
} else { } else {
var p = w.txProposals.getTxProposal(ntxid); var p = w.txProposals.getTxProposal(ntxid);
@ -180,10 +175,7 @@ angular.module('copayApp.controllers').controller('TransactionsController',
$rootScope.txAlertCount = 0; $rootScope.txAlertCount = 0;
var w = $rootScope.wallet; var w = $rootScope.wallet;
w.reject(ntxid); w.reject(ntxid);
$rootScope.$flashMessage = { notification.warning('Transaction rejected', 'You rejected the transaction successfully');
type: 'warning',
message: 'Transaction rejected by you'
};
$scope.loading = false; $scope.loading = false;
}; };