diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-02 05:41:34 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-02 05:41:34 +0800 |
| commit | 1494cc5e6c5943095c89e3b243b0a6152876e72c (patch) | |
| tree | e34e74e79e8d41ce5903cc8d6eedf5caa19bc354 /ui/app/components/pending-tx/confirm-send-ether.js | |
| parent | 6e563acd93cbaf20fb233a267104fc6af3384287 (diff) | |
| parent | b2e64f24ecbc9e309869e678254cf755ffe11b40 (diff) | |
| download | tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.gz tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.zst tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.zip | |
fix merge conflicts
Diffstat (limited to 'ui/app/components/pending-tx/confirm-send-ether.js')
| -rw-r--r-- | ui/app/components/pending-tx/confirm-send-ether.js | 2 |
1 files changed, 1 insertions, 1 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') |