pull/1/head
yann300 7 years ago
parent dc10b21b2e
commit 21836221d0
  1. 2
      src/app/execution/txRunner.js
  2. 17
      src/universal-dapp.js

@ -188,7 +188,7 @@ function sendTransaction (sendTx, tx, pass, callback) {
function run (self, tx, stamp, confirmationCb, gasEstimationForceSend, callback) {
if (!self.runAsync && Object.keys(self.pendingTxs).length) {
self.queusTxs.push({ tx, stamp, callback})
self.queusTxs.push({ tx, stamp, callback })
} else {
self.pendingTxs[stamp] = tx
self.execute(tx, confirmationCb, gasEstimationForceSend, (error, result) => {

@ -316,15 +316,16 @@ UniversalDApp.prototype.runTx = function (args, cb) {
The transaction execution will likely fail. Do you want to force sending? <br>
${msg}
</div>`,
{ label: 'Send Transaction',
fn: () => {
continueTxExecution()
}}, {
label: 'Cancel Transaction',
{
label: 'Send Transaction',
fn: () => {
cancelCb()
}
})
continueTxExecution()
}}, {
label: 'Cancel Transaction',
fn: () => {
cancelCb()
}
})
} else {
continueTxExecution()
}

Loading…
Cancel
Save