aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/actions.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-03-01 06:08:00 +0800
committerDan Finlay <dan@danfinlay.com>2017-03-01 06:08:00 +0800
commitda88481560f0f2ad7e12b3e94082aa10147b900e (patch)
treed90c02a55451768807babb49ef95519d44f93e1c /ui/app/actions.js
parent5a74c0fcad92cf4192eefedcb092d4525157902f (diff)
downloadtangerine-wallet-browser-da88481560f0f2ad7e12b3e94082aa10147b900e.tar
tangerine-wallet-browser-da88481560f0f2ad7e12b3e94082aa10147b900e.tar.gz
tangerine-wallet-browser-da88481560f0f2ad7e12b3e94082aa10147b900e.tar.bz2
tangerine-wallet-browser-da88481560f0f2ad7e12b3e94082aa10147b900e.tar.lz
tangerine-wallet-browser-da88481560f0f2ad7e12b3e94082aa10147b900e.tar.xz
tangerine-wallet-browser-da88481560f0f2ad7e12b3e94082aa10147b900e.tar.zst
tangerine-wallet-browser-da88481560f0f2ad7e12b3e94082aa10147b900e.zip
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.
Diffstat (limited to 'ui/app/actions.js')
-rw-r--r--ui/app/actions.js14
1 files changed, 5 insertions, 9 deletions
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())
}
}