aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2018-04-05 05:28:25 +0800
committerfrankiebee <frankie.diamond@gmail.com>2018-04-05 05:28:25 +0800
commit6ab938546c3b41d188df62f0cc180aa9b6c72cf6 (patch)
tree28a7b36371355fe1893cc72ae14f5fbb032b5a1a /app/scripts/lib
parentef21af29f2df31cdd193823e3dc0762a1ef571b4 (diff)
parente1b1da9113e6d2d7adf0096bbfbbc4a807c07613 (diff)
downloadtangerine-wallet-browser-6ab938546c3b41d188df62f0cc180aa9b6c72cf6.tar
tangerine-wallet-browser-6ab938546c3b41d188df62f0cc180aa9b6c72cf6.tar.gz
tangerine-wallet-browser-6ab938546c3b41d188df62f0cc180aa9b6c72cf6.tar.bz2
tangerine-wallet-browser-6ab938546c3b41d188df62f0cc180aa9b6c72cf6.tar.lz
tangerine-wallet-browser-6ab938546c3b41d188df62f0cc180aa9b6c72cf6.tar.xz
tangerine-wallet-browser-6ab938546c3b41d188df62f0cc180aa9b6c72cf6.tar.zst
tangerine-wallet-browser-6ab938546c3b41d188df62f0cc180aa9b6c72cf6.zip
Merge branch 'master' of https://github.com/MetaMask/metamask-extension into normalize-transactions
Diffstat (limited to 'app/scripts/lib')
-rw-r--r--app/scripts/lib/tx-state-manager.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/lib/tx-state-manager.js b/app/scripts/lib/tx-state-manager.js
index 9e597ef37..2ab24d6a0 100644
--- a/app/scripts/lib/tx-state-manager.js
+++ b/app/scripts/lib/tx-state-manager.js
@@ -143,7 +143,7 @@ module.exports = class TransactionStateManager extends EventEmitter {
// validate types
switch (key) {
case 'chainId':
- if (typeof value !== 'number') throw new Error(`${key} in txParams is not a Number. got: (${value})`)
+ if (typeof value !== 'number' && typeof value !== 'string') throw new Error(`${key} in txParams is not a Number or hex string. got: (${value})`)
break
default:
if (typeof value !== 'string') throw new Error(`${key} in txParams is not a string. got: (${value})`)