diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-25 07:44:25 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-25 07:44:25 +0800 |
| commit | 242456ba6af8d01049152b9b04197da94a43d8c8 (patch) | |
| tree | f4b1cbe2c165b0e7a9fbd0eb9c1df20646196c4b /ui/app/components | |
| parent | 98d8275743344826e81ee59ba7435ca75b43f2cd (diff) | |
| parent | 35ca7e83bdffe4dbf9efbcd161e9f80e5530c86a (diff) | |
| download | tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.tar tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.tar.gz tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.tar.bz2 tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.tar.lz tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.tar.xz tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.tar.zst tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.zip | |
Resolve merge conflict.
Diffstat (limited to 'ui/app/components')
| -rw-r--r-- | ui/app/components/pending-tx.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index 431a5a0cb..79323d6eb 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -15,7 +15,7 @@ const addressSummary = util.addressSummary const nameForAddress = require('../../lib/contract-namer') const BNInput = require('./bn-as-decimal-input') -const MIN_GAS_PRICE_MWEI_BN = new BN(100) +const MIN_GAS_PRICE_MWEI_BN = new BN('100') const MWEI_FACTOR = new BN(1e6) const MIN_GAS_PRICE_BN = MIN_GAS_PRICE_MWEI_BN.mul(MWEI_FACTOR) const MIN_GAS_LIMIT_BN = new BN(21000) |