fixed merge conflict and fixed number formatting

6 years ago · 183ce801eb
parent 3515d31979
commit 183ce801eb
1 changed files with 1 additions and 0 deletions
--- a/apps/block_scout_web/assets/js/lib/smart_contract/wei_ether_converter.js
+++ b/apps/block_scout_web/assets/js/lib/smart_contract/wei_ether_converter.js
@ -16,6 +16,7 @@ const weiToEtherConverter = (element, event) => {
    unitVal = unitVal.dividedBy(weiUnit)
    $conversionUnit.html(unitVal.toFixed() > 0 ? unitVal.toFixed() : numeral(unitVal).format('0[.000000000000000000]'))
  } else {
+    $conversionTextWei.removeAttr('style')
    $conversionTextWei.addClass('d-inline-block')
    $conversionTextEth.addClass('d-none')
    unitVal = unitVal.multipliedBy(weiUnit)