diff options
| author | Thomas <thomas.b.huang@gmail.com> | 2018-07-11 02:34:00 +0800 |
|---|---|---|
| committer | Thomas <thomas.b.huang@gmail.com> | 2018-07-11 02:34:00 +0800 |
| commit | 5188b727d43e91087449818dee69942c382b6d89 (patch) | |
| tree | 4a89be50f09d24bc7e6ed3daf83b660f5e87380e /ui/app/components/pending-tx | |
| parent | dd18684a5d682f48528f278284619983f13bf82f (diff) | |
| parent | f6de948e42ae633d40aef72595a01caa622a280d (diff) | |
| download | tangerine-wallet-browser-5188b727d43e91087449818dee69942c382b6d89.tar tangerine-wallet-browser-5188b727d43e91087449818dee69942c382b6d89.tar.gz tangerine-wallet-browser-5188b727d43e91087449818dee69942c382b6d89.tar.bz2 tangerine-wallet-browser-5188b727d43e91087449818dee69942c382b6d89.tar.lz tangerine-wallet-browser-5188b727d43e91087449818dee69942c382b6d89.tar.xz tangerine-wallet-browser-5188b727d43e91087449818dee69942c382b6d89.tar.zst tangerine-wallet-browser-5188b727d43e91087449818dee69942c382b6d89.zip | |
Merge branch 'develop' into removeNonceTrackerFunction
Diffstat (limited to 'ui/app/components/pending-tx')
| -rw-r--r-- | ui/app/components/pending-tx/confirm-send-ether.js | 2 | ||||
| -rw-r--r-- | ui/app/components/pending-tx/confirm-send-token.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js index bbf5683f0..22b2670d8 100644 --- a/ui/app/components/pending-tx/confirm-send-ether.js +++ b/ui/app/components/pending-tx/confirm-send-ether.js @@ -20,7 +20,7 @@ const { calcGasTotal, isBalanceSufficient, } = require('../send_/send.utils') -const GasFeeDisplay = require('../send/gas-fee-display-v2') +const GasFeeDisplay = require('../send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component').default const SenderToRecipient = require('../sender-to-recipient') const NetworkDisplay = require('../network-display') const currencyFormatter = require('currency-formatter') diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js index ee066b8f4..535347cee 100644 --- a/ui/app/components/pending-tx/confirm-send-token.js +++ b/ui/app/components/pending-tx/confirm-send-token.js @@ -11,7 +11,7 @@ abiDecoder.addABI(tokenAbi) const actions = require('../../actions') const clone = require('clone') const Identicon = require('../identicon') -const GasFeeDisplay = require('../send/gas-fee-display-v2.js') +const GasFeeDisplay = require('../send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js').default const NetworkDisplay = require('../network-display') const ethUtil = require('ethereumjs-util') const BN = ethUtil.BN |