fix: avoid accessing `txHash` if it's not defined

This scenario can be reproduced by rejecting a tx in the owner's wallet
This commit is contained in:
fernandomg 2020-05-28 01:03:08 -03:00
parent aefe721e8f
commit 1453de1162
1 changed files with 14 additions and 6 deletions

View File

@ -168,6 +168,7 @@ const processTransaction = ({
'status', 'status',
receipt.status ? (isCancelTransaction(record, safeAddress) ? 'cancelled' : 'success') : 'failed', receipt.status ? (isCancelTransaction(record, safeAddress) ? 'cancelled' : 'success') : 'failed',
) )
.updateIn(['ownersWithPendingActions', 'reject'], (prev) => prev.clear())
}) })
: mockedTx.set('status', 'awaiting_confirmations') : mockedTx.set('status', 'awaiting_confirmations')
@ -194,13 +195,20 @@ const processTransaction = ({
}) })
} catch (err) { } catch (err) {
console.error(err) console.error(err)
closeSnackbar(beforeExecutionKey)
closeSnackbar(pendingExecutionKey)
showSnackbar(notificationsQueue.afterExecutionError, enqueueSnackbar, closeSnackbar)
const executeData = safeInstance.contract.methods.approveHash(txHash).encodeABI() if (txHash !== undefined) {
const errMsg = await getErrorMessage(safeInstance.address, 0, executeData, from) closeSnackbar(beforeExecutionKey)
console.error(`Error executing the TX: ${errMsg}`)
if (pendingExecutionKey) {
closeSnackbar(pendingExecutionKey)
}
showSnackbar(notificationsQueue.afterExecutionError, enqueueSnackbar, closeSnackbar)
const executeData = safeInstance.contract.methods.approveHash(txHash).encodeABI()
const errMsg = await getErrorMessage(safeInstance.address, 0, executeData, from)
console.error(`Error executing the TX: ${errMsg}`)
}
} }
return txHash return txHash