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

minor changes

Browse Source
This commit is contained in:
sairaj mote 2023-03-21 00:38:48 +05:30
parent aacba0cca6
commit 0981312b08
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@ -3488,9 +3488,9 @@
}) })
document.getElementById('create_multisig_button').addEventListener('click', () => { document.getElementById('create_multisig_button').addEventListener('click', () => {
if (getRef('add_self_check').checked) if (getRef('add_self_check').checked)
selectedMembers.add(floGlobals.myFloID) selectedMembers.add(floDapps.user.id)
const selctedPubKeys = [...selectedMembers].map(id => { const selctedPubKeys = [...selectedMembers].map(id => {
if (id === floGlobals.myFloID) if (id === floDapps.user.id)
return floDapps.user.public return floDapps.user.public
return floGlobals.pubKeys[id] return floGlobals.pubKeys[id]
}); });

5
scripts/messenger.js
View File

@ -1088,6 +1088,7 @@
MultiSig.createAddress = function (pubKeys, minRequired) { MultiSig.createAddress = function (pubKeys, minRequired) {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
let co_owners = pubKeys.map(p => floCrypto.getFloID(p)); let co_owners = pubKeys.map(p => floCrypto.getFloID(p));
console.log(co_owners);
if (co_owners.includes(null)) if (co_owners.includes(null))
return reject("Invalid public key: " + pubKeys[co_owners.indexOf(null)]); return reject("Invalid public key: " + pubKeys[co_owners.indexOf(null)]);
let privateKey = await floDapps.user.private; let privateKey = await floDapps.user.private;
@ -1183,7 +1184,7 @@
//sign multisig tx for BTC //sign multisig tx for BTC
MultiSig.signTx_BTC = function (pipeID) { MultiSig.signTx_BTC = function (pipeID) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if(_loaded.pipeline[pipeID].model !== TYPE_BTC_MULTISIG) if (_loaded.pipeline[pipeID].model !== TYPE_BTC_MULTISIG)
return reject('Incorrect pipeline model. Only works for BTC-multisig'); return reject('Incorrect pipeline model. Only works for BTC-multisig');
if (_loaded.pipeline[pipeID].disabled) if (_loaded.pipeline[pipeID].disabled)
return reject("Pipeline is already closed"); return reject("Pipeline is already closed");
@ -1245,7 +1246,7 @@
//sign multisig tx for FLO //sign multisig tx for FLO
MultiSig.signTx_FLO = function (pipeID) { MultiSig.signTx_FLO = function (pipeID) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if(_loaded.pipeline[pipeID].model !== TYPE_FLO_MULTISIG) if (_loaded.pipeline[pipeID].model !== TYPE_FLO_MULTISIG)
return reject('Incorrect pipeline model. Only works for FLO-multisig'); return reject('Incorrect pipeline model. Only works for FLO-multisig');
if (_loaded.pipeline[pipeID].disabled) if (_loaded.pipeline[pipeID].disabled)
return reject("Pipeline is already closed"); return reject("Pipeline is already closed");