open wallet working

This commit is contained in:
Matias Alejo Garcia 2014-04-15 15:25:55 -03:00
commit 341c9d8ffa
6 changed files with 54 additions and 12 deletions

View file

@ -114,8 +114,10 @@ angular.module('copay.network')
var recipients;
var inTxProposals = copay.TxProposals.fromObj(data.txProposals);
var mergeInfo = w.txProposals.merge(inTxProposals, true);
if ( mergeInfo.merged && !data.isBroadcast) {
log('### BROADCASTING txProposals');
var addSeen = w.addSeenToTxProposals();
if ((mergeInfo.merged && !data.isBroadcast) || addSeen) {
log('### BROADCASTING txProposals. ' );
recipients = null;
shouldSend = true;
}