diff options
author | Chi Kei Chan <chikeichan@gmail.com> | 2017-12-21 09:38:28 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-21 09:38:28 +0800 |
commit | 9959aea5987a123209c962632d54e503f1d458a5 (patch) | |
tree | cdb705c11731a59d59b8015918b260a07f159f8b /ui/app/components/pending-tx/confirm-send-ether.js | |
parent | 7915e62d65de1bbc3419cba58f69e6d55a4df3ea (diff) | |
parent | e7e1b7a95180597308bd167bd4a152bbbf53ff21 (diff) | |
download | tangerine-wallet-browser-9959aea5987a123209c962632d54e503f1d458a5.tar.gz tangerine-wallet-browser-9959aea5987a123209c962632d54e503f1d458a5.tar.zst tangerine-wallet-browser-9959aea5987a123209c962632d54e503f1d458a5.zip |
Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20
Diffstat (limited to 'ui/app/components/pending-tx/confirm-send-ether.js')
-rw-r--r-- | ui/app/components/pending-tx/confirm-send-ether.js | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js index 1264da153..566224864 100644 --- a/ui/app/components/pending-tx/confirm-send-ether.js +++ b/ui/app/components/pending-tx/confirm-send-ether.js @@ -421,7 +421,9 @@ ConfirmSendEther.prototype.onSubmit = function (event) { ConfirmSendEther.prototype.cancel = function (event, txMeta) { event.preventDefault() - this.props.cancelTransaction(txMeta) + const { cancelTransaction } = this.props + + cancelTransaction(txMeta) } ConfirmSendEther.prototype.checkValidity = function () { @@ -445,26 +447,6 @@ ConfirmSendEther.prototype.gatherTxMeta = function () { const state = this.state const txData = clone(state.txData) || clone(props.txData) - if (props.send.editingTransactionId) { - const { - send: { - memo, - amount: value, - gasLimit: gas, - gasPrice, - }, - } = props - const { txParams: { from, to } } = txData - txData.txParams = { - from: ethUtil.addHexPrefix(from), - to: ethUtil.addHexPrefix(to), - memo: memo && ethUtil.addHexPrefix(memo), - value: ethUtil.addHexPrefix(value), - gas: ethUtil.addHexPrefix(gas), - gasPrice: ethUtil.addHexPrefix(gasPrice), - } - } - // log.debug(`UI has defaulted to tx meta ${JSON.stringify(txData)}`) return txData } |