Merge branch 'main' into ui-testing

This commit is contained in:
sairaj mote 2022-04-03 16:15:47 +05:30 committed by GitHub
commit 6d28a1c00c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 3 deletions

View File

@ -624,6 +624,7 @@ sm-checkbox {
grid-template-columns: auto 1fr auto; grid-template-columns: auto 1fr auto;
gap: 0.5rem; gap: 0.5rem;
padding: 1rem 0; padding: 1rem 0;
border-radius: 0.5rem; border-radius: 0.5rem;
opacity: 0.8; opacity: 0.8;
font-weight: 400; font-weight: 400;

File diff suppressed because one or more lines are too long

View File

@ -598,6 +598,7 @@ sm-checkbox {
grid-template-columns: auto 1fr auto; grid-template-columns: auto 1fr auto;
gap: 0.5rem; gap: 0.5rem;
padding: 1rem 0; padding: 1rem 0;
border-radius: 0.5rem; border-radius: 0.5rem;
opacity: 0.8; opacity: 0.8;
font-weight: 400; font-weight: 400;
@ -614,6 +615,7 @@ sm-checkbox {
} }
#flo_rate { #flo_rate {
font-weight: 700; font-weight: 700;
} }
.quantity-selector { .quantity-selector {
.button { .button {

View File

@ -758,6 +758,7 @@
function getFormattedTime(timeString, relative) { function getFormattedTime(timeString, relative) {
try { try {
console.log(timeString)
const [date, time] = timeString.split('T') const [date, time] = timeString.split('T')
const [year, month, day] = date.split('-').map(v => parseInt(v)) const [year, month, day] = date.split('-').map(v => parseInt(v))
let [hours, minutes] = time.split(':').map(v => parseInt(v)) let [hours, minutes] = time.split(':').map(v => parseInt(v))
@ -766,7 +767,7 @@
const monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", const monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
]; ];
const monthName = monthNames[month] const monthName = monthNames[month - 1]
minutes = minutes < 10 ? `0${minutes}` : minutes minutes = minutes < 10 ? `0${minutes}` : minutes
let finalHours = ``; let finalHours = ``;
@ -1459,7 +1460,6 @@
} }
} }
getRef('quantity_selector').addEventListener('click', e => { getRef('quantity_selector').addEventListener('click', e => {
// Get latest balance and exchange rate
if (e.target.closest('button')) { if (e.target.closest('button')) {
const target = e.target.closest('button') const target = e.target.closest('button')
const unitValue = parseFloat(getRef('get_price').value) const unitValue = parseFloat(getRef('get_price').value)
@ -1472,11 +1472,13 @@
} else { } else {
getRef('get_total').value = parseFloat((fraction * allTokens[selectedAsset].net * floGlobals.exchangeRates[selectedAsset]).toFixed(4)) getRef('get_total').value = parseFloat((fraction * allTokens[selectedAsset].net * floGlobals.exchangeRates[selectedAsset]).toFixed(4))
getRef('get_quantity').value = parseFloat((allTokens[selectedAsset].net * fraction).toFixed(4)) getRef('get_quantity').value = parseFloat((allTokens[selectedAsset].net * fraction).toFixed(4))
} }
} }
}) })
getRef('get_price').addEventListener('keyup', e => { getRef('get_price').addEventListener('keyup', e => {
const unitValue = parseFloat(getRef('get_price').value) || floGlobals.exchangeRates[pagesData.params.asset] const unitValue = parseFloat(getRef('get_price').value) || floGlobals.exchangeRates[pagesData.params.asset]
const quantity = parseFloat(getRef('get_quantity').value) || 0 const quantity = parseFloat(getRef('get_quantity').value) || 0
getRef('get_total').value = parseFloat((quantity * unitValue).toFixed(4)) || 0 getRef('get_total').value = parseFloat((quantity * unitValue).toFixed(4)) || 0
}) })
@ -1501,6 +1503,7 @@
getRef('wallet_popup__title').textContent = `${type} ${asset}` getRef('wallet_popup__title').textContent = `${type} ${asset}`
getRef('get_user_amount').setAttribute('step', asset === 'rupee' ? '0.01' : '0.00001') getRef('get_user_amount').setAttribute('step', asset === 'rupee' ? '0.01' : '0.00001')
getRef('get_user_amount').setAttribute('min', asset === 'rupee' ? '0.01' : '0.00001') getRef('get_user_amount').setAttribute('min', asset === 'rupee' ? '0.01' : '0.00001')
if (type === 'withdraw') { if (type === 'withdraw') {
getRef('get_private_key').classList.add('hide') getRef('get_private_key').classList.add('hide')
getRef('wallet_quantity_selector').classList.remove('hide') getRef('wallet_quantity_selector').classList.remove('hide')
@ -1918,6 +1921,7 @@
}) })
} }
} }
function updateRate(init = false) { function updateRate(init = false) {
floExchangeAPI.getRates().then(rates => { floExchangeAPI.getRates().then(rates => {
console.debug(rates); console.debug(rates);
@ -1956,6 +1960,7 @@
} }
if (pagesData.params.hasOwnProperty('asset' && pagesData.params.asset !== '')) if (pagesData.params.hasOwnProperty('asset' && pagesData.params.asset !== ''))
getRef('get_price').value = parseFloat(parseFloat(rates[pagesData.params.asset]).toFixed(4)) getRef('get_price').value = parseFloat(parseFloat(rates[pagesData.params.asset]).toFixed(4))
}).catch(error => console.error(error)) }).catch(error => console.error(error))
} }