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

Merge pull request #77 from matiu/bug/fix-uxrefresh

Browse source 
fix uxrefresh with new #setup - awesome!!
This commit is contained in:
Gustavo Maximiliano Cortez 2014-04-17 11:49:02 -03:00
commit 73d5266a89
8 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,6 +120,7 @@ Wallet.prototype._handleNetworkChange = function(newPeer) {
this.sendWalletId(newPeer);
this.sendPublicKeyRing(newPeer);
this.sendTxProposals(newPeer);
this.emit('refresh');
};
Wallet.prototype.netStart = function() {

5
js/models/core/WalletFactory.js
View file

@ -148,7 +148,10 @@ WalletFactory.prototype.openRemote = function(peedId) {
opts.storage = this.storage;
opts.network = this.network;
opts.blockchain = this.blockchain;
opts.spendUnconfirmed = opts.spendUnconfirmed || this.walletDefaults.spendUnconfirmed;
opts.spendUnconfirmed = typeof opts.spendUnconfirmed === undefined
?this.walletDefaults.spendUnconfirmed : opts.spendUnconfirmed;
opts.requiredCopayers = requiredCopayers;
opts.totalCopayers = totalCopayers;
var w = new Wallet(opts);