open wallet working
This commit is contained in:
parent
65cbf5b46a
commit
341c9d8ffa
6 changed files with 54 additions and 12 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue