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

fixes in ux

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-20 21:53:54 -03:00
commit 616429a355
4 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

26
js/controllers/transactions.js
View file

@ -43,6 +43,7 @@ console.log('[transactions.js.10:_updateTxs:]'); //TODO
});
$scope.txs = txs;
console.log('[transactions.js.55] SET HANDL+'); //TODO
w.removeListener('txProposalsUpdated',_updateTxs)
w.once('txProposalsUpdated',_updateTxs);
};
@ -58,6 +59,20 @@ console.log('[transactions.js.55] SET HANDL+'); //TODO
socket.on('connect', controllerUtils.handleTransactionByAddress($scope));
}
$scope.send = function (ntxid) {
var w = $rootScope.wallet;
w.sendTx(ntxid, function(txid) {
console.log('[transactions.js.68:txid:] SENTTX CALLBACK',txid); //TODO
$rootScope.flashMessage = txid
? {type:'success', message: 'Transactions SENT! txid:' + txid}
: {type:'error', message: 'There was an error sending the Transaction'}
;
_updateTxs();
$rootScope.$digest();
});
};
$scope.sign = function (ntxid) {
var w = $rootScope.wallet;
var ret = w.sign(ntxid);
@ -65,19 +80,16 @@ console.log('[transactions.js.55] SET HANDL+'); //TODO
var p = w.getTxProposal(ntxid);
if (p.txp.builder.isFullySigned()) {
w.sendTx(ntxid, function(txid) {
$rootScope.flashMessage = txid
? {type:'success', message: 'Transactions SENT! txid:' + txid}
: {type:'error', message: 'There was an error sending the Transaction'}
;
});
$scope.send(ntxid);
}
else {
$rootScope.flashMessage = ret
? {type:'success', message: 'Transactions signed'}
: {type:'error', message: 'There was an error signing the Transaction'}
;
_updateTxs();
$rootScope.$digest();
}
_updateTxs();
};
});

2
js/models/core/TxProposals.js
View file

@ -19,7 +19,7 @@ function TxProposal(opts) {
this.seenBy = opts.seenBy || {};
this.signedBy = opts.signedBy || {};
this.builder = opts.builder;
this.sentTs = null;
this.sentTs = opts.sentTs || null;
}
TxProposal.prototype.toObj = function() {

14
js/models/core/Wallet.js
View file

@ -334,7 +334,7 @@ Wallet.prototype.sign = function(ntxid) {
return ret;
};
Wallet.prototype.sendTx = function(ntxid) {
Wallet.prototype.sendTx = function(ntxid, cb) {
var txp = this.txProposals.txps[ntxid];
if (!txp) return;
@ -348,18 +348,12 @@ Wallet.prototype.sendTx = function(ntxid) {
var self = this;
this.blockchain.sendRawTransaction(txHex, function(txid) {
self.log('BITCOND txid:',txid); //TODO
console.log('[Wallet.js.351]'); //TODO
if (txid) {
console.log('[Wallet.js.354]',self); //TODO
self.txProposals.setSent(ntxid);
console.log('[Wallet.js.353]', self.txProposals); //TODO
self.sendTxProposals();
self.store();
}
return (txid);
self.sendTxProposals();
self.store();
return cb(txid);
});
};