diff options
author | Alexander Tseung <alextsg@gmail.com> | 2018-09-21 10:35:45 +0800 |
---|---|---|
committer | Alexander Tseung <alextsg@gmail.com> | 2018-09-21 10:44:23 +0800 |
commit | 431beb943675f2e9b7b5e5ce9c7f55d45f10905f (patch) | |
tree | f4517b6f8737d3a2d5393b18cdca463e3a1bbfd0 /ui/app/components/modals/cancel-transaction/cancel-transaction.container.js | |
parent | 2cfdc95eebc3e0a878017090f22e5136cff709a6 (diff) | |
download | tangerine-wallet-browser-431beb943675f2e9b7b5e5ce9c7f55d45f10905f.tar.gz tangerine-wallet-browser-431beb943675f2e9b7b5e5ce9c7f55d45f10905f.tar.zst tangerine-wallet-browser-431beb943675f2e9b7b5e5ce9c7f55d45f10905f.zip |
Fix multiplyCurrencies. Add onClose prop for Modal component. Remove hideModal from modal components.
Diffstat (limited to 'ui/app/components/modals/cancel-transaction/cancel-transaction.container.js')
-rw-r--r-- | ui/app/components/modals/cancel-transaction/cancel-transaction.container.js | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/ui/app/components/modals/cancel-transaction/cancel-transaction.container.js b/ui/app/components/modals/cancel-transaction/cancel-transaction.container.js index 15bff4bc6..eede8b1ee 100644 --- a/ui/app/components/modals/cancel-transaction/cancel-transaction.container.js +++ b/ui/app/components/modals/cancel-transaction/cancel-transaction.container.js @@ -1,32 +1,39 @@ import { connect } from 'react-redux' import { compose } from 'recompose' -import R from 'ramda' +import ethUtil from 'ethereumjs-util' import { multiplyCurrencies } from '../../../conversion-util' -import { bnToHex } from '../../../helpers/conversions.util' import withModalProps from '../../../higher-order-components/with-modal-props' import CancelTransaction from './cancel-transaction.component' -import { showModal, hideModal, createCancelTransaction } from '../../../actions' +import { showModal, createCancelTransaction } from '../../../actions' +import { getHexGasTotal } from '../../../helpers/confirm-transaction/util' const mapStateToProps = (state, ownProps) => { const { metamask } = state const { transactionId, originalGasPrice } = ownProps const { selectedAddressTxList } = metamask - const transaction = R.find(({ id }) => id === transactionId)(selectedAddressTxList) + const transaction = selectedAddressTxList.find(({ id }) => id === transactionId) const transactionStatus = transaction ? transaction.status : '' - const defaultNewGasPrice = bnToHex(multiplyCurrencies(originalGasPrice, 1.1)) + const defaultNewGasPrice = ethUtil.addHexPrefix( + multiplyCurrencies(originalGasPrice, 1.1, { + toNumericBase: 'hex', + multiplicandBase: 16, + multiplierBase: 10, + }) + ) + + const newGasFee = getHexGasTotal({ gasPrice: defaultNewGasPrice, gasLimit: '0x5208' }) return { transactionId, transactionStatus, originalGasPrice, - defaultNewGasPrice, + newGasFee, } } const mapDispatchToProps = dispatch => { return { - hideModal: () => dispatch(hideModal()), createCancelTransaction: txId => dispatch(createCancelTransaction(txId)), showTransactionConfirmedModal: () => dispatch(showModal({ name: 'TRANSACTION_CONFIRMED' })), } |