diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-09-18 01:34:29 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-09-20 05:31:10 +0800 |
| commit | 5a6c333506e4000602c1a1106cee6d06fe83afa8 (patch) | |
| tree | 2aed850f17114372eaca16ed7e77f42f87907713 /app/scripts | |
| parent | 3e470fee8a5560b605f7ad1060fb1eebafefd21e (diff) | |
| download | tangerine-wallet-browser-5a6c333506e4000602c1a1106cee6d06fe83afa8.tar tangerine-wallet-browser-5a6c333506e4000602c1a1106cee6d06fe83afa8.tar.gz tangerine-wallet-browser-5a6c333506e4000602c1a1106cee6d06fe83afa8.tar.bz2 tangerine-wallet-browser-5a6c333506e4000602c1a1106cee6d06fe83afa8.tar.lz tangerine-wallet-browser-5a6c333506e4000602c1a1106cee6d06fe83afa8.tar.xz tangerine-wallet-browser-5a6c333506e4000602c1a1106cee6d06fe83afa8.tar.zst tangerine-wallet-browser-5a6c333506e4000602c1a1106cee6d06fe83afa8.zip | |
Switch existing modals from using Notification to Modal. Remove Notification component. Add CancelTransaction modal
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/controllers/transactions/index.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js index 59e30cdde..e2965ceb6 100644 --- a/app/scripts/controllers/transactions/index.js +++ b/app/scripts/controllers/transactions/index.js @@ -18,7 +18,7 @@ const { TRANSACTION_STATUS_APPROVED, } = require('./enums') -const { hexToBn, bnToHex } = require('../../lib/util') +const { hexToBn, bnToHex, BnMultiplyByFraction } = require('../../lib/util') /** Transaction Controller is an aggregate of sub-controllers and trackers @@ -244,7 +244,8 @@ class TransactionController extends EventEmitter { const originalTxMeta = this.txStateManager.getTx(originalTxId) const { txParams } = originalTxMeta const { gasPrice: lastGasPrice, from, nonce } = txParams - const newGasPrice = customGasPrice || bnToHex(hexToBn(lastGasPrice).mul(1.1)) + + const newGasPrice = customGasPrice || bnToHex(BnMultiplyByFraction(hexToBn(lastGasPrice), 11, 10)) const newTxMeta = this.txStateManager.generateTxMeta({ txParams: { from, |