status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

send tx to service only after it was mined

This commit is contained in:
Mikhail Mikheev 2019-11-14 17:38:39 +04:00
parent f25f9fb138
commit eb0584feef
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/routes/safe/store/actions/createTransaction.js
View File

@ -72,6 +72,12 @@ const createTransaction = (
closeSnackbar(beforeExecutionKey)
pendingExecutionKey = showSnackbar(notificationsQueue.pendingExecution, enqueueSnackbar, closeSnackbar)
})
.on('error', (error) => {
console.error('Tx error: ', error)
})
.then(async (receipt) => {
closeSnackbar(pendingExecutionKey)
try {
await saveTxToHistory(
@ -88,12 +94,6 @@ const createTransaction = (
} catch (err) {
console.error(err)
}
})
.on('error', (error) => {
console.error('Tx error: ', error)
})
.then((receipt) => {
closeSnackbar(pendingExecutionKey)
showSnackbar(
isExecution

14
src/routes/safe/store/actions/processTransaction.js
View File

@ -103,11 +103,17 @@ const processTransaction = (
await transaction
.send(sendParams)
.once('transactionHash', async (hash) => {
.once('transactionHash', (hash) => {
txHash = hash
closeSnackbar(beforeExecutionKey)
pendingExecutionKey = showSnackbar(notificationsQueue.pendingExecution, enqueueSnackbar, closeSnackbar)
})
.on('error', (error) => {
console.error('Processing transaction error: ', error)
})
.then(async (receipt) => {
closeSnackbar(pendingExecutionKey)
try {
await saveTxToHistory(
@ -124,12 +130,6 @@ const processTransaction = (
} catch (err) {
console.error(err)
}
})
.on('error', (error) => {
console.error('Processing transaction error: ', error)
})
.then((receipt) => {
closeSnackbar(pendingExecutionKey)
showSnackbar(
shouldExecute