aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan J Miller <danjm.com@gmail.com>2018-06-11 21:09:57 +0800
committerGitHub <noreply@github.com>2018-06-11 21:09:57 +0800
commitb7a469681bdadd77f8c09da254db91dad820a7a1 (patch)
treefd0c77a0b58095a1c4f684847fd396990693cb6a
parentc0d2dab28b4083ee3ef65b6b561e28c811c6773d (diff)
parent049071a743581d142b0426d25613d1318d41093f (diff)
downloadtangerine-wallet-browser-b7a469681bdadd77f8c09da254db91dad820a7a1.tar
tangerine-wallet-browser-b7a469681bdadd77f8c09da254db91dad820a7a1.tar.gz
tangerine-wallet-browser-b7a469681bdadd77f8c09da254db91dad820a7a1.tar.bz2
tangerine-wallet-browser-b7a469681bdadd77f8c09da254db91dad820a7a1.tar.lz
tangerine-wallet-browser-b7a469681bdadd77f8c09da254db91dad820a7a1.tar.xz
tangerine-wallet-browser-b7a469681bdadd77f8c09da254db91dad820a7a1.tar.zst
tangerine-wallet-browser-b7a469681bdadd77f8c09da254db91dad820a7a1.zip
Merge pull request #4535 from MetaMask/i4508-fix-gas-edit-confirm-screen
Fix gas limit editing on confirm screen
-rw-r--r--ui/app/components/pending-tx/confirm-send-ether.js2
-rw-r--r--ui/app/components/pending-tx/confirm-send-token.js2
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: {