diff options
| author | Bruno <brunobar79@gmail.com> | 2018-06-13 13:55:35 +0800 |
|---|---|---|
| committer | Bruno <brunobar79@gmail.com> | 2018-06-13 13:55:35 +0800 |
| commit | b6980eed87dcd3b3fcd8a901af0cf075d894d956 (patch) | |
| tree | fb39d41db91c831202dc0b057231b77ed1308210 /ui/app/components/pending-tx | |
| parent | 4e7d92ec8f360658c08f993256eeb121038c9dcf (diff) | |
| parent | 73a9aaa8338c2d8a2960a79f02369caaa21b3c95 (diff) | |
| download | tangerine-wallet-browser-b6980eed87dcd3b3fcd8a901af0cf075d894d956.tar.gz tangerine-wallet-browser-b6980eed87dcd3b3fcd8a901af0cf075d894d956.tar.zst tangerine-wallet-browser-b6980eed87dcd3b3fcd8a901af0cf075d894d956.zip | |
Merge branch 'develop' of git://github.com/Metamask/metamask-extension into develop
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 97d0318ea..bbf5683f0 100644 --- a/ui/app/components/pending-tx/confirm-send-ether.js +++ b/ui/app/components/pending-tx/confirm-send-ether.js @@ -647,7 +647,7 @@ ConfirmSendEther.prototype.gatherTxMeta = function () { const state = this.state const txData = clone(state.txData) || clone(props.txData) - const { gasPrice: sendGasPrice, gas: sendGasLimit } = props.send + const { gasPrice: sendGasPrice, gasLimit: sendGasLimit } = props.send const { lastGasPrice, txParams: { diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js index 1802d3143..ee066b8f4 100644 --- a/ui/app/components/pending-tx/confirm-send-token.js +++ b/ui/app/components/pending-tx/confirm-send-token.js @@ -651,7 +651,7 @@ ConfirmSendToken.prototype.gatherTxMeta = function () { const state = this.state const txData = clone(state.txData) || clone(props.txData) - const { gasPrice: sendGasPrice, gas: sendGasLimit } = props.send + const { gasPrice: sendGasPrice, gasLimit: sendGasLimit } = props.send const { lastGasPrice, txParams: { |