aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan J Miller <danjm.com@gmail.com>2018-07-04 01:31:48 +0800
committerGitHub <noreply@github.com>2018-07-04 01:31:48 +0800
commit4bdd59b055730ee05c82546cd2eba55d8ac4506c (patch)
treef09119f5088e7a8f845457901528622bdea59c09 /ui
parent1f0cf11af1c94e750bbc4c5238c3ee028350a6c6 (diff)
parent491f2d03cfd790e4246a9fa638a2eecb07a6488a (diff)
downloadtangerine-wallet-browser-4bdd59b055730ee05c82546cd2eba55d8ac4506c.tar
tangerine-wallet-browser-4bdd59b055730ee05c82546cd2eba55d8ac4506c.tar.gz
tangerine-wallet-browser-4bdd59b055730ee05c82546cd2eba55d8ac4506c.tar.bz2
tangerine-wallet-browser-4bdd59b055730ee05c82546cd2eba55d8ac4506c.tar.lz
tangerine-wallet-browser-4bdd59b055730ee05c82546cd2eba55d8ac4506c.tar.xz
tangerine-wallet-browser-4bdd59b055730ee05c82546cd2eba55d8ac4506c.tar.zst
tangerine-wallet-browser-4bdd59b055730ee05c82546cd2eba55d8ac4506c.zip
Merge pull request #4699 from TrejGun/removeLeadingZeroes
move removeLeadingZeroes to utils, add test
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/send/currency-display.js5
-rw-r--r--ui/app/components/send_/send.utils.js5
-rw-r--r--ui/app/components/send_/send.utils.test.js30
3 files changed, 36 insertions, 4 deletions
diff --git a/ui/app/components/send/currency-display.js b/ui/app/components/send/currency-display.js
index 5e2c5fdf6..1cf55ce1a 100644
--- a/ui/app/components/send/currency-display.js
+++ b/ui/app/components/send/currency-display.js
@@ -2,6 +2,7 @@ const Component = require('react').Component
const h = require('react-hyperscript')
const inherits = require('util').inherits
const { conversionUtil, multiplyCurrencies } = require('../../conversion-util')
+const { removeLeadingZeroes } = require('../send_/send.utils')
const currencyFormatter = require('currency-formatter')
const currencies = require('currency-formatter/currencies')
const ethUtil = require('ethereumjs-util')
@@ -92,10 +93,6 @@ CurrencyDisplay.prototype.getConvertedValueToRender = function (nonFormattedValu
: convertedValue
}
-function removeLeadingZeroes (str) {
- return str.replace(/^0*(?=\d)/, '')
-}
-
CurrencyDisplay.prototype.handleChange = function (newVal) {
this.setState({ valueToRender: removeLeadingZeroes(newVal) })
this.props.onChange(this.getAmount(newVal))
diff --git a/ui/app/components/send_/send.utils.js b/ui/app/components/send_/send.utils.js
index 872df1d2f..34275248f 100644
--- a/ui/app/components/send_/send.utils.js
+++ b/ui/app/components/send_/send.utils.js
@@ -33,6 +33,7 @@ module.exports = {
getToAddressForGasUpdate,
isBalanceSufficient,
isTokenBalanceSufficient,
+ removeLeadingZeroes,
}
function calcGasTotal (gasLimit, gasPrice) {
@@ -276,3 +277,7 @@ function estimateGasPriceFromRecentBlocks (recentBlocks) {
function getToAddressForGasUpdate (...addresses) {
return [...addresses, ''].find(str => str !== undefined && str !== null).toLowerCase()
}
+
+function removeLeadingZeroes (str) {
+ return str.replace(/^0*(?=\d)/, '')
+}
diff --git a/ui/app/components/send_/send.utils.test.js b/ui/app/components/send_/send.utils.test.js
new file mode 100644
index 000000000..36f3a5c10
--- /dev/null
+++ b/ui/app/components/send_/send.utils.test.js
@@ -0,0 +1,30 @@
+import assert from 'assert'
+import { removeLeadingZeroes } from './send.utils'
+
+
+describe('send utils', () => {
+ describe('removeLeadingZeroes()', () => {
+ it('should remove leading zeroes from int when user types', () => {
+ assert.equal(removeLeadingZeroes('0'), '0')
+ assert.equal(removeLeadingZeroes('1'), '1')
+ assert.equal(removeLeadingZeroes('00'), '0')
+ assert.equal(removeLeadingZeroes('01'), '1')
+ })
+
+ it('should remove leading zeroes from int when user copy/paste', () => {
+ assert.equal(removeLeadingZeroes('001'), '1')
+ })
+
+ it('should remove leading zeroes from float when user types', () => {
+ assert.equal(removeLeadingZeroes('0.'), '0.')
+ assert.equal(removeLeadingZeroes('0.0'), '0.0')
+ assert.equal(removeLeadingZeroes('0.00'), '0.00')
+ assert.equal(removeLeadingZeroes('0.001'), '0.001')
+ assert.equal(removeLeadingZeroes('0.10'), '0.10')
+ })
+
+ it('should remove leading zeroes from float when user copy/paste', () => {
+ assert.equal(removeLeadingZeroes('00.1'), '0.1')
+ })
+ })
+})