m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Update the correct values in state when estimates are received.

Browse Source
This commit is contained in:
Dan 2017-09-26 23:03:03 -02:30 committed by Chi Kei Chan
parent 541b69dda9
commit 39365f2cc4
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/app/components/send-token/index.js
View File

@ -93,8 +93,8 @@ SendTokenScreen.prototype.componentWillMount = function () {
])
.then(([blockGasPrice, estimatedGas]) => {
this.setState({
blockGasPrice,
estimatedGas,
gasPrice: blockGasPrice,
gasLimit: estimatedGas,
})
})
}
@ -305,8 +305,6 @@ SendTokenScreen.prototype.renderGasInput = function () {
isGasTooltipOpen,
gasPrice,
gasLimit,
blockGasPrice,
estimatedGas,
selectedCurrency,
errors: {
gasPrice: gasPriceErrorMessage,
@ -327,8 +325,8 @@ SendTokenScreen.prototype.renderGasInput = function () {
}, [
isGasTooltipOpen && h(GasTooltip, {
className: 'send-tooltip',
gasPrice: gasPrice || blockGasPrice || '0x0',
gasLimit: gasLimit || estimatedGas || '0x0',
gasPrice: gasPrice || '0x0',
gasLimit: gasLimit || '0x0',
onClose: () => this.setState({ isGasTooltipOpen: false }),
onFeeChange: ({ gasLimit, gasPrice }) => {
this.setState({ gasLimit, gasPrice, errors: {} })
@ -351,9 +349,9 @@ SendTokenScreen.prototype.renderGasInput = function () {
h(GasFeeDisplay, {
conversionRate,
tokenExchangeRate,
gasPrice: gasPrice || blockGasPrice || '0x0',
gasPrice: gasPrice || '0x0',
activeCurrency: selectedCurrency,
gas: gasLimit || estimatedGas || '0x0',
gas: gasLimit || '0x0',
blockGasLimit: currentBlockGasLimit,
}),
h(

19
ui/app/send.js
View File

@ -35,8 +35,6 @@ function mapStateToProps (state) {
addressBook,
conversionRate,
currentBlockGasLimit: blockGasLimit,
estimatedGas,
blockGasPrice,
} = state.metamask
const { warning } = state.appState
const selectedIdentity = getSelectedIdentity(state)
@ -76,8 +74,6 @@ function SendTransactionScreen () {
txData: null,
memo: '',
},
blockGasPrice: null,
estimatedGas: null,
activeCurrency: 'USD',
tooltipIsOpen: false,
errors: {},
@ -103,14 +99,19 @@ function SendTransactionScreen () {
}
SendTransactionScreen.prototype.componentWillMount = function () {
const { newTx } = this.state
Promise.all([
this.props.dispatch(getGasPrice()),
this.props.dispatch(estimateGas()),
])
.then(([blockGasPrice, estimatedGas]) => {
this.setState({
blockGasPrice,
estimatedGas,
newTx: {
...newTx,
gasPrice: blockGasPrice,
gas: estimatedGas,
},
})
})
}
@ -329,8 +330,6 @@ SendTransactionScreen.prototype.render = function () {
newTx,
activeCurrency,
isValid,
blockGasPrice,
estimatedGas,
} = this.state
const { gas, gasPrice } = newTx
@ -353,8 +352,8 @@ SendTransactionScreen.prototype.render = function () {
this.renderAmountInput(activeCurrency),
this.renderGasInput(
gasPrice || blockGasPrice || '0x0',
gas || estimatedGas || '0x0',
gasPrice || '0x0',
gas || '0x0',
activeCurrency,
conversionRate,
blockGasLimit