RanchiMall/messenger
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
sairaj mote 2023-03-21 18:23:18 +05:30
parent 3782a69a08
commit c9eee532ec
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
index.html
View File

@ -1601,7 +1601,7 @@
return floGlobals.contacts[floID] return floGlobals.contacts[floID]
else if (messenger.groups[floID]) else if (messenger.groups[floID])
return messenger.groups[floID].name return messenger.groups[floID].name
else if (floID === floGlobals.myFloID) else if (floID === floDapps.user.id)
return 'You' return 'You'
else else
return floID return floID
@ -2774,7 +2774,8 @@
</button> </button>
` `
}, },
multisigAddressCard(address, label, mode = 'btc') { multisigAddressCard(address, details, label, mode = 'btc') {
console.log(details)
const floMultisig = floCrypto.toMultisigFloID(address) const floMultisig = floCrypto.toMultisigFloID(address)
return html.for(getRef('select_multisig_list'), mode === 'btc' ? address : floMultisig)` return html.for(getRef('select_multisig_list'), mode === 'btc' ? address : floMultisig)`
<li class="grid gap-0-5 align-center multisig-option" data-address=${address}> <li class="grid gap-0-5 align-center multisig-option" data-address=${address}>
@ -2793,7 +2794,7 @@
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
Promise.all([messenger.multisig.listAddress(), compactIDB.readAllData('multisigLabels')]) Promise.all([messenger.multisig.listAddress(), compactIDB.readAllData('multisigLabels')])
.then(([addresses, labels]) => { .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}`) renderElem(getRef('select_multisig_list'), html`${list}`)
resolve() resolve()
}).catch(err => { }).catch(err => {

6
scripts/messenger.js
View File

@ -1144,7 +1144,9 @@
multsigs[addr] = { multsigs[addr] = {
redeemScript: decode.redeemscript, redeemScript: decode.redeemscript,
pubKeys: decode.pubkeys, pubKeys: decode.pubkeys,
minRequired: decode.signaturesRequired minRequired: decode.signaturesRequired,
time: result[i].time,
txid: result[i].txid
} }
} }
resolve(multsigs); resolve(multsigs);
@ -1321,7 +1323,7 @@
requestPipelineInbox(pipeline.id, pipeline.model); requestPipelineInbox(pipeline.id, pipeline.model);
resolve(_loaded.pipeline[pipeline.id]) resolve(_loaded.pipeline[pipeline.id])
}).catch(error => reject(error)) }).catch(error => reject(error))
}) }).catch(error => reject(error))
}) })
} }