diff options
author | kumavis <kumavis@users.noreply.github.com> | 2016-10-17 03:54:23 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-17 03:54:23 +0800 |
commit | 11c114599c75c6188703c619135ce41877f83b66 (patch) | |
tree | 115ed3828722fc0a60b83d19bb34b0a198e153b6 /app/scripts/lib/idStore.js | |
parent | 8d5b2478e3aa939cb4b0a58b20b199cded62769e (diff) | |
parent | 35232c5e293b30da90049b094d87336bb22dc59e (diff) | |
download | tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.tar tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.tar.gz tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.tar.bz2 tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.tar.lz tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.tar.xz tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.tar.zst tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.zip |
Merge pull request #720 from MetaMask/i#495CustomGasField
add a gasPrice field
Diffstat (limited to 'app/scripts/lib/idStore.js')
-rw-r--r-- | app/scripts/lib/idStore.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index 6837a1e8d..aa77c3360 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -112,6 +112,8 @@ IdentityStore.prototype.getState = function () { currentFiat: configManager.getCurrentFiat(), conversionRate: configManager.getConversionRate(), conversionDate: configManager.getConversionDate(), + gasMultiplier: configManager.getGasMultiplier(), + })) } @@ -211,6 +213,7 @@ IdentityStore.prototype.exportAccount = function (address, cb) { // comes from dapp via zero-client hooked-wallet provider IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDoneCb, cb) { const configManager = this.configManager + var self = this // create txData obj with parameters and meta data var time = (new Date()).getTime() @@ -222,6 +225,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone txParams: txParams, time: time, status: 'unconfirmed', + gasMultiplier: configManager.getGasMultiplier() || 1, } console.log('addUnconfirmedTransaction:', txData) |