From f89b76653434ff801779e10b9f8a9a546997cb9b Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 25 Oct 2017 14:10:03 -0230 Subject: [PATCH] Adds revert feature to customize gas modal. --- .../components/customize-gas-modal/index.js | 23 ++++++++++++------- yarn.lock | 8 +------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ui/app/components/customize-gas-modal/index.js b/ui/app/components/customize-gas-modal/index.js index 598247497..722ed2b23 100644 --- a/ui/app/components/customize-gas-modal/index.js +++ b/ui/app/components/customize-gas-modal/index.js @@ -58,10 +58,7 @@ function mapDispatchToProps (dispatch) { } } -inherits(CustomizeGasModal, Component) -function CustomizeGasModal (props) { - Component.call(this) - +function getOriginalState(props) { const gasPrice = props.gasPrice || MIN_GAS_PRICE_DEC const gasLimit = props.gasLimit || MIN_GAS_LIMIT_DEC @@ -71,7 +68,7 @@ function CustomizeGasModal (props) { multiplierBase: 16, }) - this.state = { + return { gasPrice, gasLimit, gasTotal, @@ -79,6 +76,13 @@ function CustomizeGasModal (props) { } } +inherits(CustomizeGasModal, Component) +function CustomizeGasModal (props) { + Component.call(this) + + this.state = getOriginalState(props) +} + module.exports = connect(mapStateToProps, mapDispatchToProps)(CustomizeGasModal) CustomizeGasModal.prototype.save = function (gasPrice, gasLimit, gasTotal) { @@ -95,6 +99,10 @@ CustomizeGasModal.prototype.save = function (gasPrice, gasLimit, gasTotal) { hideModal() } +CustomizeGasModal.prototype.revert = function () { + this.setState(getOriginalState(this.props)) +} + CustomizeGasModal.prototype.validate = function ({ gasTotal, gasLimit }) { const { amount, @@ -241,9 +249,8 @@ CustomizeGasModal.prototype.render = function () { ]), h('div.send-v2__customize-gas__revert', { - // onClick: () => console.log('Revert'), - }, ['']), - // }, ['Revert']), + onClick: () => this.revert(), + }, ['Revert']), h('div.send-v2__customize-gas__buttons', [ h('div.send-v2__customize-gas__cancel', { diff --git a/yarn.lock b/yarn.lock index 08c6f9ca4..8f63c1fff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -404,13 +404,7 @@ async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" -async-eventemitter@^0.2.2: - version "0.2.3" - resolved "https://registry.yarnpkg.com/async-eventemitter/-/async-eventemitter-0.2.3.tgz#f79f480dfda6645a97bd6142c017150d63b4e70e" - dependencies: - async "^2.4.0" - -async-eventemitter@ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c: +async-eventemitter@^0.2.2, async-eventemitter@ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c: version "0.2.3" resolved "https://codeload.github.com/ahultgren/async-eventemitter/tar.gz/fa06e39e56786ba541c180061dbf2c0a5bbf951c" dependencies: