diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-06-15 01:11:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-15 01:11:35 +0800 |
| commit | d9ef72cb7ef78a1c2bf7ce119352425d72a10dc0 (patch) | |
| tree | 6c14bb94e21996bdf688cc08011c8955322697ad /ui/app/components/pending-tx | |
| parent | 11bfdf444dca3917479cff82f807cc0d4c217191 (diff) | |
| parent | d814bee578bfe931766804612ed57a545e4b21a8 (diff) | |
| download | tangerine-wallet-browser-d9ef72cb7ef78a1c2bf7ce119352425d72a10dc0.tar.gz tangerine-wallet-browser-d9ef72cb7ef78a1c2bf7ce119352425d72a10dc0.tar.zst tangerine-wallet-browser-d9ef72cb7ef78a1c2bf7ce119352425d72a10dc0.zip | |
Merge branch 'develop' into save-brave
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: { |