diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-11-16 04:03:13 +0800 |
|---|---|---|
| committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-11-16 04:03:13 +0800 |
| commit | e61ba93194fe1bfb5fd2644951eebb3f3369f4ad (patch) | |
| tree | df23cb13d13e345bbbc3a904fb9161570bdd2d6d /app/scripts/controllers | |
| parent | f8d38f44c2612f0f291063814ec0e98bb4aaf4bb (diff) | |
| parent | 707a10548d4c6f1574395c7d72f432fa65d6fb9a (diff) | |
| download | tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.tar tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.tar.gz tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.tar.bz2 tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.tar.lz tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.tar.xz tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.tar.zst tangerine-wallet-browser-e61ba93194fe1bfb5fd2644951eebb3f3369f4ad.zip | |
Merge branch 'master' into merge-master
Diffstat (limited to 'app/scripts/controllers')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index ef659a300..a861c0342 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -133,7 +133,7 @@ module.exports = class TransactionController extends EventEmitter { async newUnapprovedTransaction (txParams) { log.debug(`MetaMaskController newUnapprovedTransaction ${JSON.stringify(txParams)}`) const txMeta = await this.addUnapprovedTransaction(txParams) - this.emit('newUnaprovedTx', txMeta) + this.emit('newUnapprovedTx', txMeta) // listen for tx completion (success, fail) return new Promise((resolve, reject) => { this.txStateManager.once(`${txMeta.id}:finished`, (completedTx) => { @@ -170,6 +170,7 @@ module.exports = class TransactionController extends EventEmitter { async addTxDefaults (txMeta) { const txParams = txMeta.txParams // ensure value + txMeta.gasPriceSpecified = Boolean(txParams.gasPrice) const gasPrice = txParams.gasPrice || await this.query.gasPrice() txParams.gasPrice = ethUtil.addHexPrefix(gasPrice.toString(16)) txParams.value = txParams.value || '0x0' |