mirror of https://github.com/BTCPrivate/copay.git
fixes in ux
This commit is contained in:
parent
17431e29c5
commit
616429a355
10
index.html
10
index.html
|
@ -286,6 +286,13 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="large-6 columns text-right">
|
||||
<span ng-show="!tx.missingSignatures && !tx.sentTs">
|
||||
Transaction ready.
|
||||
<button class="secondary round" ng-click="send(tx.ntxid)">
|
||||
Broadcast Transaction
|
||||
</button>
|
||||
</span>
|
||||
|
||||
<span ng-show="!tx.missingSignatures && tx.sentTs">
|
||||
Sent at {{tx.sentTs | date:'medium'}}
|
||||
</span>
|
||||
|
@ -299,8 +306,8 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="large-12 columns">
|
||||
<!--
|
||||
<h4>Last transactions</h4>
|
||||
<div class="panel">
|
||||
<div class="row">
|
||||
|
@ -332,6 +339,7 @@
|
|||
</span>
|
||||
</div>
|
||||
</div>
|
||||
-->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
};
|
||||
|
||||
});
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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);
|
||||
return cb(txid);
|
||||
});
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue