@@ -1372,7 +1479,7 @@
${inputs.map(input => html`
${input.address}
- ${getConvertedAmount(input.value, true)}
+ ${getConvertedAmount(input.value, amountOptions)}
`)}
@@ -1386,7 +1493,7 @@
${outputs.map(output => html`
${output.address}
- ${getConvertedAmount(output.value, true)}
+ ${getConvertedAmount(output.value, amountOptions)}
`)}
@@ -1426,14 +1533,14 @@
usd: `
`,
inr: `
`
}
- function formatAmount(amount = 0) {
+ function formatAmount(amount = 0, currency = selectedCurrency) {
// check if amount is a string and convert it to a number
if (typeof amount === 'string') {
amount = parseFloat(amount)
}
if (!amount)
return '0';
- return amount.toLocaleString(undefined, { style: 'currency', currency: selectedCurrency, minimumFractionDigits: 0, maximumFractionDigits: selectedCurrency === 'btc' ? 8 : 2 })
+ return amount.toLocaleString(undefined, { style: 'currency', currency, minimumFractionDigits: 0, maximumFractionDigits: selectedCurrency === 'btc' ? 8 : 2 })
}
let globalExchangeRate = {}
async function getExchangeRate() {
@@ -1449,13 +1556,20 @@
}).catch(err => reject(err))
})
}
- function getConvertedAmount(amount, shouldFormatAmount = false) {
+ function getConvertedAmount(amount, { shouldFormatAmount = false, onDate } = {}) {
// check if amount is a string and convert it to a number
if (typeof amount === 'string') {
amount = parseFloat(amount)
}
let convertedAmount = amount;
- if (globalExchangeRate[selectedCurrency])
+ if (onDate && selectedCurrency !== 'btc') {
+ const historicPrice = mappedHistoricPrices.get(toYDM(onDate));
+ if (historicPrice) {
+ convertedAmount = parseFloat((amount * historicPrice[selectedCurrency]).toFixed(8))
+ } else {
+ convertedAmount = parseFloat((amount * globalExchangeRate[selectedCurrency]).toFixed(8))
+ }
+ } else if (globalExchangeRate[selectedCurrency])
convertedAmount = parseFloat((amount * globalExchangeRate[selectedCurrency]).toFixed(8))
if (shouldFormatAmount)
convertedAmount = formatAmount(convertedAmount)
@@ -1467,8 +1581,10 @@
let previouslySelectedCurrency = localStorage.getItem('btc-wallet-currency') || 'btc';
getRef('currency_selector').addEventListener('change', e => {
selectedCurrency = e.target.value;
+ getRef('show_current_value').classList.toggle('hidden', selectedCurrency === 'btc')
localStorage.setItem('btc-wallet-currency', selectedCurrency);
document.querySelectorAll('.currency-symbol').forEach(el => el.innerHTML = currencyIcons[selectedCurrency])
+ document.querySelectorAll('transaction-card').forEach(el => el.render())
document.querySelectorAll('.amount-shown').forEach(el => {
if (el.tagName.includes('SM-')) {
const originalAmount = parseFloat(el.value.trim());
@@ -1494,8 +1610,8 @@
el.value = convertedAmount
el.isValid // trigger validation
} else {
- if (el.dataset.btcAmount === undefined) return
- el.textContent = getConvertedAmount(el.dataset.btcAmount, true)
+ if (el.dataset.btcAmount === undefined) return;
+ el.textContent = getConvertedAmount(el.dataset.btcAmount, { shouldFormatAmount: true, onDate: parseInt(el.dataset.onDate) })
}
})
previouslySelectedCurrency = selectedCurrency
@@ -1761,11 +1877,11 @@
senderBalances.forEach(el => el.innerHTML = '
');
Promise.all(addresses.map((addr, index) => btcOperator.getBalance(addr))).then(balances => {
balances.forEach((balance, index) => {
- senderBalances[index].textContent = getConvertedAmount(balance, true);
+ senderBalances[index].textContent = getConvertedAmount(balance, { shouldFormatAmount: true });
senderBalances[index].dataset.btcAmount = balance;
totalBalance += balance;
})
- getRef("total_balance").textContent = `${getConvertedAmount(totalBalance, true)}`;
+ getRef("total_balance").textContent = `${getConvertedAmount(totalBalance, { shouldFormatAmount: true })}`;
getRef("total_balance").dataset.btcAmount = totalBalance;
}).catch(err => {
console.error(err);
@@ -1814,7 +1930,7 @@
renderElem(getRef('fees_wrapper'), html`
- Approximate fee: ${getConvertedAmount(fees, true)}
+ Approximate fee: ${getConvertedAmount(fees, { shouldFormatAmount: true })}
*Exact fee will be calculated after you fill all the required fields
@@ -1862,7 +1978,7 @@
renderElem(getRef('fees_wrapper'), html`
`)
const [senders, privKeys, receivers, amounts] = getTransactionInputs();
btcOperator.createTx(senders, receivers, amounts).then(({ fee }) => {
- renderElem(getRef('fees_wrapper'), html`
${getConvertedAmount(fee, true)} `)
+ renderElem(getRef('fees_wrapper'), html`
${getConvertedAmount(fee, { shouldFormatAmount: true })} `)
getRef('send_transaction').disabled = false;
getRef('fees_section').classList.remove('hidden')
getRef('error_section').classList.add('hidden')
@@ -1921,7 +2037,7 @@
Transaction ID
`)
break;
}
@@ -1954,14 +2070,14 @@
