diff options
| author | Bruno <brunobar79@gmail.com> | 2018-06-13 14:01:47 +0800 |
|---|---|---|
| committer | Bruno <brunobar79@gmail.com> | 2018-06-13 14:01:47 +0800 |
| commit | bb4cc72646def9b32fffb8e6a208a2cae9d4f8c6 (patch) | |
| tree | dd619a266cd91222ba19b0af0c47598d82483d89 /ui/app/components/pending-tx/confirm-send-ether.js | |
| parent | fe3d81cfd828be06ffdebc2ed348a01ee235062c (diff) | |
| parent | b6980eed87dcd3b3fcd8a901af0cf075d894d956 (diff) | |
| download | tangerine-wallet-browser-bb4cc72646def9b32fffb8e6a208a2cae9d4f8c6.tar.gz tangerine-wallet-browser-bb4cc72646def9b32fffb8e6a208a2cae9d4f8c6.tar.zst tangerine-wallet-browser-bb4cc72646def9b32fffb8e6a208a2cae9d4f8c6.zip | |
fix merge conflicts
Diffstat (limited to 'ui/app/components/pending-tx/confirm-send-ether.js')
| -rw-r--r-- | ui/app/components/pending-tx/confirm-send-ether.js | 2 |
1 files changed, 1 insertions, 1 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: { |