aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-10-20 10:35:44 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-10-20 10:35:44 +0800
commitaa4746f4c723857710d61482a73960d863a8a098 (patch)
treebaa060a4c3969225482dd2e0df2707292186525b
parentac7dca22c3a630d4623e44abe1e86d1cc51f3acc (diff)
downloadtangerine-wallet-browser-aa4746f4c723857710d61482a73960d863a8a098.tar
tangerine-wallet-browser-aa4746f4c723857710d61482a73960d863a8a098.tar.gz
tangerine-wallet-browser-aa4746f4c723857710d61482a73960d863a8a098.tar.bz2
tangerine-wallet-browser-aa4746f4c723857710d61482a73960d863a8a098.tar.lz
tangerine-wallet-browser-aa4746f4c723857710d61482a73960d863a8a098.tar.xz
tangerine-wallet-browser-aa4746f4c723857710d61482a73960d863a8a098.tar.zst
tangerine-wallet-browser-aa4746f4c723857710d61482a73960d863a8a098.zip
Add test and ability for isHex to handle hex strings with hex-prefix
-rw-r--r--test/unit/util_test.js5
-rw-r--r--ui/app/util.js1
2 files changed, 6 insertions, 0 deletions
diff --git a/test/unit/util_test.js b/test/unit/util_test.js
index b7d8ba528..eec3183fe 100644
--- a/test/unit/util_test.js
+++ b/test/unit/util_test.js
@@ -243,6 +243,11 @@ describe('util', function() {
assert.equal(result, false)
})
+ it('should return true when given a hex string with hex-prefix', function() {
+ var result = util.isHex('0xc3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2')
+ assert.equal(result, true)
+ })
+
})
})
})
diff --git a/ui/app/util.js b/ui/app/util.js
index facaef3ee..a519ab5b4 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -212,6 +212,7 @@ function readableDate (ms) {
}
function isHex (str) {
+ if (str.startsWith('0x')) str = str.replace('0x', '')
if (str.match(/[g-zG-Z]/) || str.match(/\W/)) return false
return true
}