From da88481560f0f2ad7e12b3e94082aa10147b900e Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 28 Feb 2017 14:08:00 -0800 Subject: Remove gasMultiplier txMeta param This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter. --- ui/app/actions.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'ui/app/actions.js') diff --git a/ui/app/actions.js b/ui/app/actions.js index b9169a106..8177696f1 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -388,17 +388,13 @@ function signPersonalMsg (msgData) { function signTx (txData) { return (dispatch) => { - log.debug(`background.setGasMultiplier`) - background.setGasMultiplier(txData.gasMultiplier, (err) => { + web3.eth.sendTransaction(txData, (err, data) => { + dispatch(actions.hideLoadingIndication()) if (err) return dispatch(actions.displayWarning(err.message)) - 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(actions.hideWarning()) + dispatch(actions.goHome()) }) + dispatch(this.showConfTxPage()) } } -- cgit