refactor: remove unnecessary level of depth from runInNode

pull/1/head
Iuri Matias 7 years ago
parent 9e3c80298f
commit 1c7b325a9b
  1. 57
      src/app/execution/txRunner.js

@ -155,37 +155,36 @@ TxRunner.prototype.runInNode = function (from, to, data, value, gasLimit, useCal
tx.gas = gasEstimation tx.gas = gasEstimation
if (!self._api.config.getUnpersistedProperty('doNotShowTransactionConfirmationAgain')) { if (self._api.config.getUnpersistedProperty('doNotShowTransactionConfirmationAgain')) {
self._api.detectNetwork((err, network) => { return executeTx(tx, null, self._api, callback)
if (err) { }
console.log(err) self._api.detectNetwork((err, network) => {
} else { if (err) {
if (network.name === 'Main') { console.log(err)
var content = confirmDialog(tx, gasEstimation, self) } else {
modalDialog('Confirm transaction', content, if (network.name === 'Main') {
{ label: 'Confirm', var content = confirmDialog(tx, gasEstimation, self)
modalDialog('Confirm transaction', content,
{ label: 'Confirm',
fn: () => {
self._api.config.setUnpersistedProperty('doNotShowTransactionConfirmationAgain', content.querySelector('input#confirmsetting').checked)
if (!content.gasPriceStatus) {
callback('Given gas grice is not correct')
} else {
var gasPrice = executionContext.web3().toWei(content.querySelector('#gasprice').value, 'gwei')
executeTx(tx, gasPrice, self._api, callback)
}
}}, {
label: 'Cancel',
fn: () => { fn: () => {
self._api.config.setUnpersistedProperty('doNotShowTransactionConfirmationAgain', content.querySelector('input#confirmsetting').checked) return callback('Transaction canceled by user.')
if (!content.gasPriceStatus) { }
callback('Given gas grice is not correct') })
} else { } else {
var gasPrice = executionContext.web3().toWei(content.querySelector('#gasprice').value, 'gwei') executeTx(tx, null, self._api, callback)
executeTx(tx, gasPrice, self._api, callback)
}
}}, {
label: 'Cancel',
fn: () => {
return callback('Transaction canceled by user.')
}
})
} else {
executeTx(tx, null, self._api, callback)
}
} }
}) }
} else { })
executeTx(tx, null, self._api, callback)
}
}) })
} }

Loading…
Cancel
Save