pull/3094/head
yann300 7 years ago
parent 234a47219e
commit 4b4c572fbc
  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) { function run (self, tx, stamp, confirmationCb, gasEstimationForceSend, callback) {
if (!self.runAsync && Object.keys(self.pendingTxs).length) { if (!self.runAsync && Object.keys(self.pendingTxs).length) {
self.queusTxs.push({ tx, stamp, callback}) self.queusTxs.push({ tx, stamp, callback })
} else { } else {
self.pendingTxs[stamp] = tx self.pendingTxs[stamp] = tx
self.execute(tx, confirmationCb, gasEstimationForceSend, (error, result) => { 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> The transaction execution will likely fail. Do you want to force sending? <br>
${msg} ${msg}
</div>`, </div>`,
{ label: 'Send Transaction', {
fn: () => { label: 'Send Transaction',
continueTxExecution()
}}, {
label: 'Cancel Transaction',
fn: () => { fn: () => {
cancelCb() continueTxExecution()
} }}, {
}) label: 'Cancel Transaction',
fn: () => {
cancelCb()
}
})
} else { } else {
continueTxExecution() continueTxExecution()
} }

Loading…
Cancel
Save