From 0981312b0888b39e26542b956df22c0d3a2bc0d1 Mon Sep 17 00:00:00 2001 From: sairaj mote Date: Tue, 21 Mar 2023 00:38:48 +0530 Subject: [PATCH] minor changes --- index.html | 4 ++-- scripts/messenger.js | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index d69b883..15efda9 100644 --- a/index.html +++ b/index.html @@ -3488,9 +3488,9 @@ }) document.getElementById('create_multisig_button').addEventListener('click', () => { if (getRef('add_self_check').checked) - selectedMembers.add(floGlobals.myFloID) + selectedMembers.add(floDapps.user.id) const selctedPubKeys = [...selectedMembers].map(id => { - if (id === floGlobals.myFloID) + if (id === floDapps.user.id) return floDapps.user.public return floGlobals.pubKeys[id] }); diff --git a/scripts/messenger.js b/scripts/messenger.js index 78a37b0..eea78eb 100644 --- a/scripts/messenger.js +++ b/scripts/messenger.js @@ -1088,6 +1088,7 @@ MultiSig.createAddress = function (pubKeys, minRequired) { return new Promise(async (resolve, reject) => { let co_owners = pubKeys.map(p => floCrypto.getFloID(p)); + console.log(co_owners); if (co_owners.includes(null)) return reject("Invalid public key: " + pubKeys[co_owners.indexOf(null)]); let privateKey = await floDapps.user.private; @@ -1183,7 +1184,7 @@ //sign multisig tx for BTC MultiSig.signTx_BTC = function (pipeID) { 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'); if (_loaded.pipeline[pipeID].disabled) return reject("Pipeline is already closed"); @@ -1245,7 +1246,7 @@ //sign multisig tx for FLO MultiSig.signTx_FLO = function (pipeID) { 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'); if (_loaded.pipeline[pipeID].disabled) return reject("Pipeline is already closed");