diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-07-17 00:55:13 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-07-17 00:55:13 +0800 |
commit | d05814a5ad375f21a0b3d72de1815764eb1da5a4 (patch) | |
tree | 50315015995fac6ab84f00e479d61710859ddb42 /ui/app/components/pending-tx | |
parent | 7f29b46d32b590ebc34c6f86360ef34e8bbb75fe (diff) | |
parent | db4469794e3e843f3cb08222d0a9b568c7816a85 (diff) | |
download | tangerine-wallet-browser-d05814a5ad375f21a0b3d72de1815764eb1da5a4.tar.gz tangerine-wallet-browser-d05814a5ad375f21a0b3d72de1815764eb1da5a4.tar.zst tangerine-wallet-browser-d05814a5ad375f21a0b3d72de1815764eb1da5a4.zip |
Merge branch 'develop' into initial-trezor-support
Diffstat (limited to 'ui/app/components/pending-tx')
-rw-r--r-- | ui/app/components/pending-tx/confirm-deploy-contract.js | 2 | ||||
-rw-r--r-- | ui/app/components/pending-tx/confirm-send-ether.js | 6 | ||||
-rw-r--r-- | ui/app/components/pending-tx/confirm-send-token.js | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ui/app/components/pending-tx/confirm-deploy-contract.js b/ui/app/components/pending-tx/confirm-deploy-contract.js index af3a14f57..a059d1a32 100644 --- a/ui/app/components/pending-tx/confirm-deploy-contract.js +++ b/ui/app/components/pending-tx/confirm-deploy-contract.js @@ -11,7 +11,7 @@ const { conversionUtil } = require('../../conversion-util') const SenderToRecipient = require('../sender-to-recipient') const NetworkDisplay = require('../network-display') -const { MIN_GAS_PRICE_HEX } = require('../send_/send.constants') +const { MIN_GAS_PRICE_HEX } = require('../send/send.constants') class ConfirmDeployContract extends Component { constructor (props) { diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js index 22b2670d8..67f54aa26 100644 --- a/ui/app/components/pending-tx/confirm-send-ether.js +++ b/ui/app/components/pending-tx/confirm-send-ether.js @@ -19,14 +19,14 @@ const { const { calcGasTotal, isBalanceSufficient, -} = require('../send_/send.utils') -const GasFeeDisplay = require('../send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component').default +} = require('../send/send.utils') +const GasFeeDisplay = require('../send/send-content/send-gas-row/gas-fee-display/').default const SenderToRecipient = require('../sender-to-recipient') const NetworkDisplay = require('../network-display') const currencyFormatter = require('currency-formatter') const currencies = require('currency-formatter/currencies') -const { MIN_GAS_PRICE_HEX } = require('../send_/send.constants') +const { MIN_GAS_PRICE_HEX } = require('../send/send.constants') const { SEND_ROUTE, DEFAULT_ROUTE } = require('../../routes') const { ENVIRONMENT_TYPE_POPUP, diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js index 535347cee..818853882 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_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js').default +const GasFeeDisplay = require('../send/send-content/send-gas-row/gas-fee-display/').default const NetworkDisplay = require('../network-display') const ethUtil = require('ethereumjs-util') const BN = ethUtil.BN @@ -23,7 +23,7 @@ const { const { calcGasTotal, isBalanceSufficient, -} = require('../send_/send.utils') +} = require('../send/send.utils') const { calcTokenAmount, } = require('../../token-util') @@ -31,7 +31,7 @@ const classnames = require('classnames') const currencyFormatter = require('currency-formatter') const currencies = require('currency-formatter/currencies') -const { MIN_GAS_PRICE_HEX } = require('../send_/send.constants') +const { MIN_GAS_PRICE_HEX } = require('../send/send.constants') const { getTokenExchangeRate, |