RanchiMall/btcwallet
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 2022-07-30 16:07:58 +05:30
parent 6237ce452b
commit c409ade8f6
2 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
index.html
View File

@ -13,6 +13,8 @@
href="https://fonts.googleapis.com/css2?family=Calistoga&family=Roboto:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&display=swap" href="https://fonts.googleapis.com/css2?family=Calistoga&family=Roboto:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&display=swap"
rel="stylesheet"> rel="stylesheet">
<script src="https://unpkg.com/uhtml@3.0.1/es.js"></script> <script src="https://unpkg.com/uhtml@3.0.1/es.js"></script>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"
integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
</script> </script>
<script type="text/javascript" src="lib.js"></script> <script type="text/javascript" src="lib.js"></script>
<script type="text/javascript" src="lib_btc.js"></script> <script type="text/javascript" src="lib_btc.js"></script>
@ -133,8 +135,8 @@
</div> </div>
<div id="sender_container"></div> <div id="sender_container"></div>
<div class="flex align-center balance-wrapper"> <div class="flex align-center balance-wrapper">
<span class="margin-right-0-5">Total balance</span> <span>Total balance:</span>
<output id="total_balance" class="amount-shown"></output> <output id="total_balance" class="amount-shown" style="margin-left: 0.3rem;"></output>
</div> </div>
<button id="add_sender" class=" button--small"> <button id="add_sender" class=" button--small">
<svg class="icon margin-right-0-5" xmlns="http://www.w3.org/2000/svg" height="24px" <svg class="icon margin-right-0-5" xmlns="http://www.w3.org/2000/svg" height="24px"
@ -595,6 +597,7 @@
break; break;
case 'error': case 'error':
icon = `<svg class="icon icon--error" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-1-7v2h2v-2h-2zm0-8v6h2V7h-2z"/></svg>` icon = `<svg class="icon icon--error" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-1-7v2h2v-2h-2zm0-8v6h2V7h-2z"/></svg>`
options.pinned = true
break; break;
} }
getRef("notification_drawer").push(message, { icon, ...options }); getRef("notification_drawer").push(message, { icon, ...options });
@ -1282,7 +1285,7 @@
const currency = getRef('currency_selector').value; const currency = getRef('currency_selector').value;
if (!amount) if (!amount)
return '0'; return '0';
return amount.toLocaleString(`en-IN`, { style: 'currency', currency, maximumFractionDigits: currency === 'btc' ? 8 : 2 }) return amount.toLocaleString(currency === 'inr' ? `en-IN` : 'en-US', { style: 'currency', currency, maximumFractionDigits: currency === 'btc' ? 8 : 2 })
} }
let globalExchangeRate = {} let globalExchangeRate = {}
async function getExchangeRate() { async function getExchangeRate() {
@ -1317,7 +1320,7 @@
senderBalances[index].dataset.btcAmount = result; senderBalances[index].dataset.btcAmount = result;
totalBalance += result; totalBalance += result;
}) })
getRef("total_balance").textContent = `: ${formatAmount(totalBalance * globalExchangeRate[getRef('currency_selector').value])}`; getRef("total_balance").textContent = `${formatAmount(totalBalance * globalExchangeRate[getRef('currency_selector').value])}`;
getRef("total_balance").dataset.btcAmount = totalBalance; getRef("total_balance").dataset.btcAmount = totalBalance;
} catch (e) { } catch (e) {
notify(e, 'error'); notify(e, 'error');
@ -1360,7 +1363,7 @@
const amounts = [...getRef('receiver_container').querySelectorAll('.amount-input')].map(input => { const amounts = [...getRef('receiver_container').querySelectorAll('.amount-input')].map(input => {
return parseFloat(input.value.trim()) / globalExchangeRate[getRef('currency_selector').value] return parseFloat(input.value.trim()) / globalExchangeRate[getRef('currency_selector').value]
}); });
const fee = parseFloat(getRef('send_fee').value.trim()); const fee = parseFloat((parseFloat(getRef('send_fee').value.trim()) / globalExchangeRate[getRef('currency_selector').value]).toFixed(8));
console.debug(senders, receivers, amounts, fee); console.debug(senders, receivers, amounts, fee);
btc_api.sendTx(senders, privKeys, receivers, amounts, fee).then(result => { btc_api.sendTx(senders, privKeys, receivers, amounts, fee).then(result => {
console.log(result); console.log(result);
@ -1379,6 +1382,7 @@
}) })
}).catch(err => { }).catch(err => {
notify(err, 'error') notify(err, 'error')
}).finally(() => {
buttonLoader('send_transaction', false) buttonLoader('send_transaction', false)
}) })
@ -1434,25 +1438,6 @@
}).catch(error => reject(error)) }).catch(error => reject(error))
}) })
} }
// replacement for jquery ajax
function ajax(options) {
const xhr = new XMLHttpRequest();
xhr.open(options.method, options.url, true);
xhr.setRequestHeader('Content-Type', 'application/json');
xhr.onload = function () {
if (this.status >= 200 && this.status < 300) {
options.success(JSON.parse(this.response));
} else {
options.error(this.statusText);
}
};
xhr.onerror = function () {
options.error(this.statusText);
};
xhr.send(JSON.stringify(options.data));
}
</script> </script>
</body> </body>

2
lib_btc.js
View File

@ -2578,7 +2578,7 @@
}; };
const broadcast = btc_api.broadcast = rawtx => new Promise((resolve, reject) => { const broadcast = btc_api.broadcast = rawtx => new Promise((resolve, reject) => {
ajax({ $.ajax({
type: "POST", type: "POST",
url: URL + "send_tx/BTC/", url: URL + "send_tx/BTC/",
data: { data: {