From 36de213c6c5eda192d4160d650004523d303379c Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 18 Jun 2018 13:49:21 -0230 Subject: Fix currency-display.js rendering of token amounts. --- ui/app/components/send/currency-display.js | 1 + 1 file changed, 1 insertion(+) (limited to 'ui/app/components/send/currency-display.js') diff --git a/ui/app/components/send/currency-display.js b/ui/app/components/send/currency-display.js index 3bc9ad226..9866393d8 100644 --- a/ui/app/components/send/currency-display.js +++ b/ui/app/components/send/currency-display.js @@ -57,6 +57,7 @@ CurrencyDisplay.prototype.getValueToRender = function ({ selectedToken, conversi return selectedToken ? conversionUtil(ethUtil.addHexPrefix(value), { fromNumericBase: 'hex', + toNumericBase: 'dec', toCurrency: symbol, conversionRate: multiplier, invertConversionRate: true, -- cgit From 6c9302f9853d931ecf2f4385fa77b78d367f89e2 Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 18 Jun 2018 13:50:21 -0230 Subject: Remove leading zeroes from send screen amount row input. --- ui/app/components/send/currency-display.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ui/app/components/send/currency-display.js') diff --git a/ui/app/components/send/currency-display.js b/ui/app/components/send/currency-display.js index 9866393d8..e410bc070 100644 --- a/ui/app/components/send/currency-display.js +++ b/ui/app/components/send/currency-display.js @@ -92,8 +92,12 @@ CurrencyDisplay.prototype.getConvertedValueToRender = function (nonFormattedValu : convertedValue } +function removeLeadingZeroes (str) { + return str.replace(/^0*(?=\d)/, '') +} + CurrencyDisplay.prototype.handleChange = function (newVal) { - this.setState({ valueToRender: newVal }) + this.setState({ valueToRender: removeLeadingZeroes(newVal) }) this.props.onChange(this.getAmount(newVal)) } -- cgit