Bug fixes
This commit is contained in:
parent
d20381da36
commit
57ef2ede72
17
index.html
17
index.html
@ -4585,6 +4585,7 @@
|
|||||||
getRef('send_fee').readOnly = false;
|
getRef('send_fee').readOnly = false;
|
||||||
getRef('send_fee').placeholder = 'Fee';
|
getRef('send_fee').placeholder = 'Fee';
|
||||||
renderElem(getRef('selected_fee_tip'), html`Set custom fee`)
|
renderElem(getRef('selected_fee_tip'), html`Set custom fee`)
|
||||||
|
feeMemo.memoized = false;
|
||||||
break;
|
break;
|
||||||
case 'suggested':
|
case 'suggested':
|
||||||
calculateFees();
|
calculateFees();
|
||||||
@ -4630,8 +4631,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
getRef('receiver_container').addEventListener('input', debounce(calculateFees, 300))
|
getRef('receiver_container').addEventListener('input', debounce(calculateFees, 300))
|
||||||
|
let feeMemo = {
|
||||||
|
memoized: false,
|
||||||
|
memoizedFee: 0
|
||||||
|
};
|
||||||
function calculateFees() {
|
function calculateFees() {
|
||||||
|
if (getRef('fees_selector').value === 'custom') return;
|
||||||
|
const allValid = [...getRef('receiver_container').querySelectorAll('sm-input')].every(input => input.isValid)
|
||||||
|
if (!allValid && feeMemo.memoized) return;
|
||||||
getRef('fees_selector').children[0].click();
|
getRef('fees_selector').children[0].click();
|
||||||
getRef('fees_selector').classList.remove('hidden')
|
getRef('fees_selector').classList.remove('hidden')
|
||||||
getRef('initiate_transaction').disabled = true;
|
getRef('initiate_transaction').disabled = true;
|
||||||
@ -4645,7 +4652,6 @@
|
|||||||
getRef('send_fee_loader').animate(fadeIn, animOptions)
|
getRef('send_fee_loader').animate(fadeIn, animOptions)
|
||||||
getRef('fees_section').classList.remove('hidden')
|
getRef('fees_section').classList.remove('hidden')
|
||||||
getRef('error_section').classList.add('hidden')
|
getRef('error_section').classList.add('hidden')
|
||||||
const allValid = [...getRef('receiver_container').querySelectorAll('sm-input')].every(input => input.isValid)
|
|
||||||
if (allValid) {
|
if (allValid) {
|
||||||
getRef('send_fee').placeholder = 'Fee'
|
getRef('send_fee').placeholder = 'Fee'
|
||||||
calculateBtcFees().then(({ fee }) => {
|
calculateBtcFees().then(({ fee }) => {
|
||||||
@ -4667,11 +4673,17 @@
|
|||||||
getRef('send_fee_loader').classList.add('hidden')
|
getRef('send_fee_loader').classList.add('hidden')
|
||||||
|
|
||||||
})
|
})
|
||||||
|
feeMemo.memoized = false;
|
||||||
} else {
|
} else {
|
||||||
getRef('send_fee').placeholder = 'Approximate fee'
|
getRef('send_fee').placeholder = 'Approximate fee'
|
||||||
renderElem(getRef('selected_fee_tip'), html` <p style="opacity: 0.8;">*Fill out all fields for exact fee!</p> `)
|
renderElem(getRef('selected_fee_tip'), html` <p style="opacity: 0.8;">*Fill out all fields for exact fee!</p> `)
|
||||||
|
if (feeMemo.memoized) {
|
||||||
|
getRef('send_fee').value = feeMemo.memoizedFee.toFixed(8);
|
||||||
|
return;
|
||||||
|
}
|
||||||
calculateApproxFee().then(fee => {
|
calculateApproxFee().then(fee => {
|
||||||
getRef('send_fee').value = fee.toFixed(8);
|
getRef('send_fee').value = fee.toFixed(8);
|
||||||
|
feeMemo.memoizedFee = fee;
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
getRef('fees_selector').children[1].click();
|
getRef('fees_selector').children[1].click();
|
||||||
getRef('fees_selector').classList.add('hidden')
|
getRef('fees_selector').classList.add('hidden')
|
||||||
@ -4679,6 +4691,7 @@
|
|||||||
getRef('send_fee_loader').animate(fadeOut, animOptions).onfinish = _ =>
|
getRef('send_fee_loader').animate(fadeOut, animOptions).onfinish = _ =>
|
||||||
getRef('send_fee_loader').classList.add('hidden')
|
getRef('send_fee_loader').classList.add('hidden')
|
||||||
})
|
})
|
||||||
|
feeMemo.memoized = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user