aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-10-14 07:53:32 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-10-14 07:53:32 +0800
commitaace26c4bda151c71f9f8c73669e789ac258e9ee (patch)
treec6ec247a3fbaf89469c5eedb82add68e2a81bfdf /ui/app
parent328f8b0cac1e19a2f27ca0272930e393b1e9dc8d (diff)
downloadtangerine-wallet-browser-aace26c4bda151c71f9f8c73669e789ac258e9ee.tar
tangerine-wallet-browser-aace26c4bda151c71f9f8c73669e789ac258e9ee.tar.gz
tangerine-wallet-browser-aace26c4bda151c71f9f8c73669e789ac258e9ee.tar.bz2
tangerine-wallet-browser-aace26c4bda151c71f9f8c73669e789ac258e9ee.tar.lz
tangerine-wallet-browser-aace26c4bda151c71f9f8c73669e789ac258e9ee.tar.xz
tangerine-wallet-browser-aace26c4bda151c71f9f8c73669e789ac258e9ee.tar.zst
tangerine-wallet-browser-aace26c4bda151c71f9f8c73669e789ac258e9ee.zip
Create callback and Clean-up details
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/actions.js14
-rw-r--r--ui/app/components/range-slider.js6
-rw-r--r--ui/app/send.js2
3 files changed, 12 insertions, 10 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 9cacadc0d..1f0d8fc78 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -277,15 +277,17 @@ function signMsg (msgData) {
}
function signTx (txData) {
- _accountManager.setGasMultiplier(txData.gasMultiplier)
return (dispatch) => {
- web3.eth.sendTransaction(txData, (err, data) => {
- dispatch(actions.hideLoadingIndication())
+ _accountManager.setGasMultiplier(txData.gasMultiplier, (err) => {
if (err) return dispatch(actions.displayWarning(err.message))
- dispatch(actions.hideWarning())
- dispatch(actions.goHome())
+ web3.eth.sendTransaction(txData, (err, data) => {
+ dispatch(actions.hideLoadingIndication())
+ if (err) return dispatch(actions.displayWarning(err.message))
+ dispatch(actions.hideWarning())
+ dispatch(actions.goHome())
+ })
+ dispatch(this.showConfTxPage())
})
- dispatch(this.showConfTxPage())
}
}
diff --git a/ui/app/components/range-slider.js b/ui/app/components/range-slider.js
index cc1de1ce5..823f5eb01 100644
--- a/ui/app/components/range-slider.js
+++ b/ui/app/components/range-slider.js
@@ -35,7 +35,7 @@ RangeSlider.prototype.render = function () {
step: increment,
style: range,
value: state.value || defaultValue,
- onChange: mirrorInput ? this.mirrorInputs.bind(this, name) : onInput,
+ onChange: mirrorInput ? this.mirrorInputs.bind(this, event) : onInput,
}),
// Mirrored input for range
@@ -47,12 +47,12 @@ RangeSlider.prototype.render = function () {
value: state.value || defaultValue,
step: increment,
style: input,
- onChange: this.mirrorInputs.bind(this, `${name}Mirror`),
+ onChange: this.mirrorInputs.bind(this, event),
}) : null,
])
)
}
-RangeSlider.prototype.mirrorInputs = function (active, event) {
+RangeSlider.prototype.mirrorInputs = function (event) {
this.setState({value: event.target.value})
}
diff --git a/ui/app/send.js b/ui/app/send.js
index 323ddb5e3..97ed29e4a 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -207,7 +207,7 @@ SendTransactionScreen.prototype.render = function () {
},
}),
]),
- // custom gas field
+ // custom gasPrice field
h('h3.flex-center.text-transform-uppercase', {
style: {
background: '#EBEBEB',