diff --git a/index.html b/index.html index 1f1d5ff..34f9331 100644 --- a/index.html +++ b/index.html @@ -1601,7 +1601,7 @@ return floGlobals.contacts[floID] else if (messenger.groups[floID]) return messenger.groups[floID].name - else if (floID === floGlobals.myFloID) + else if (floID === floDapps.user.id) return 'You' else return floID @@ -2774,7 +2774,8 @@ ` }, - multisigAddressCard(address, label, mode = 'btc') { + multisigAddressCard(address, details, label, mode = 'btc') { + console.log(details) const floMultisig = floCrypto.toMultisigFloID(address) return html.for(getRef('select_multisig_list'), mode === 'btc' ? address : floMultisig)`
  • @@ -2793,7 +2794,7 @@ return new Promise((resolve, reject) => { Promise.all([messenger.multisig.listAddress(), compactIDB.readAllData('multisigLabels')]) .then(([addresses, labels]) => { - const list = Object.keys(addresses).map(address => render.multisigAddressCard(address, labels[address], multisigMode)) || [] + const list = Object.keys(addresses).map(address => render.multisigAddressCard(address, addresses[address], labels[address], multisigMode)) || [] renderElem(getRef('select_multisig_list'), html`${list}`) resolve() }).catch(err => { diff --git a/scripts/messenger.js b/scripts/messenger.js index fbbbee9..b6c20db 100644 --- a/scripts/messenger.js +++ b/scripts/messenger.js @@ -1144,7 +1144,9 @@ multsigs[addr] = { redeemScript: decode.redeemscript, pubKeys: decode.pubkeys, - minRequired: decode.signaturesRequired + minRequired: decode.signaturesRequired, + time: result[i].time, + txid: result[i].txid } } resolve(multsigs); @@ -1321,7 +1323,7 @@ requestPipelineInbox(pipeline.id, pipeline.model); resolve(_loaded.pipeline[pipeline.id]) }).catch(error => reject(error)) - }) + }).catch(error => reject(error)) }) }