m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Resolve merge conflict.

Browse Source
This commit is contained in:
Kevin Serrano 2017-10-24 16:44:25 -07:00
commit 242456ba6a
No known key found for this signature in database
GPG Key ID: BF999DEFC7371BA1
3 changed files with 4493 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
## Current Master ## Current Master
- Add support for alternative ENS TLDs (Ethereum Name Service Top-Level Domains). - Add support for alternative ENS TLDs (Ethereum Name Service Top-Level Domains).
- Lower minimum gas price to 0.1 GWEI, now shown as 100 MWEI.
## 3.11.2 2017-10-21 ## 3.11.2 2017-10-21

2
ui/app/components/pending-tx.js
View File

@ -15,7 +15,7 @@ const addressSummary = util.addressSummary
const nameForAddress = require('../../lib/contract-namer') const nameForAddress = require('../../lib/contract-namer')
const BNInput = require('./bn-as-decimal-input') 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 MWEI_FACTOR = new BN(1e6)
const MIN_GAS_PRICE_BN = MIN_GAS_PRICE_MWEI_BN.mul(MWEI_FACTOR) const MIN_GAS_PRICE_BN = MIN_GAS_PRICE_MWEI_BN.mul(MWEI_FACTOR)
const MIN_GAS_LIMIT_BN = new BN(21000) const MIN_GAS_LIMIT_BN = new BN(21000)

4491
ui/app/css/output/index.css Normal file
View File

File diff suppressed because one or more lines are too long