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

Merge pull request #274 from gnosis/bug/wrong-confirmation-notification 

BUG: Wrong notification for confirmation tx
This commit is contained in:
Mikhail Mikheev 2019-11-19 16:50:03 +04:00 committed by GitHub
parent 2ed259eea4 9282fc053a
commit 515d177c89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/logic/notifications/notificationBuilder.js
View File

@ -34,8 +34,8 @@ const confirmationTxNotificationsQueue: NotificationsQueue = {
pendingExecution: NOTIFICATIONS.TX_CONFIRMATION_PENDING_MSG, pendingExecution: NOTIFICATIONS.TX_CONFIRMATION_PENDING_MSG,
afterRejection: NOTIFICATIONS.TX_REJECTED_MSG, afterRejection: NOTIFICATIONS.TX_REJECTED_MSG,
afterExecution: { afterExecution: {
noMoreConfirmationsNeeded: NOTIFICATIONS.TX_CONFIRMATION_EXECUTED_MSG, noMoreConfirmationsNeeded: NOTIFICATIONS.TX_EXECUTED_MSG,
moreConfirmationsNeeded: null, moreConfirmationsNeeded: NOTIFICATIONS.TX_CONFIRMATION_EXECUTED_MSG,
}, },
afterExecutionError: NOTIFICATIONS.TX_CONFIRMATION_FAILED_MSG, afterExecutionError: NOTIFICATIONS.TX_CONFIRMATION_FAILED_MSG,
} }

2
src/logic/notifications/notificationTypes.js
View File

@ -129,7 +129,7 @@ export const NOTIFICATIONS: Notifications = {
options: { variant: INFO, persist: true }, options: { variant: INFO, persist: true },
}, },
TX_CONFIRMATION_EXECUTED_MSG: { TX_CONFIRMATION_EXECUTED_MSG: {
message: 'Confirmation transaction succesful', message: 'Confirmation transaction was successful',
options: { variant: SUCCESS, persist: false, autoHideDuration: longDuration }, options: { variant: SUCCESS, persist: false, autoHideDuration: longDuration },
}, },
TX_CONFIRMATION_FAILED_MSG: { TX_CONFIRMATION_FAILED_MSG: {

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

@ -108,6 +108,7 @@ const createTransaction = (
return receipt.transactionHash return receipt.transactionHash
}) })
} catch (err) { } catch (err) {
console.error(err)
closeSnackbar(beforeExecutionKey) closeSnackbar(beforeExecutionKey)
closeSnackbar(pendingExecutionKey) closeSnackbar(pendingExecutionKey)
showSnackbar(notificationsQueue.afterExecutionError, enqueueSnackbar, closeSnackbar) showSnackbar(notificationsQueue.afterExecutionError, enqueueSnackbar, closeSnackbar)
@ -116,7 +117,7 @@ const createTransaction = (
.execTransaction(to, valueInWei, txData, CALL, 0, 0, 0, ZERO_ADDRESS, ZERO_ADDRESS, sigs) .execTransaction(to, valueInWei, txData, CALL, 0, 0, 0, ZERO_ADDRESS, ZERO_ADDRESS, sigs)
.encodeABI() .encodeABI()
const errMsg = await getErrorMessage(safeInstance.address, 0, executeDataUsedSignatures, from) const errMsg = await getErrorMessage(safeInstance.address, 0, executeDataUsedSignatures, from)
console.error(`Error executing the TX: ${errMsg}`) console.error(`Error creating the TX: ${errMsg}`)
} }
return txHash return txHash

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

@ -143,6 +143,7 @@ const processTransaction = (
return receipt.transactionHash return receipt.transactionHash
}) })
} catch (err) { } catch (err) {
console.error(err)
closeSnackbar(beforeExecutionKey) closeSnackbar(beforeExecutionKey)
closeSnackbar(pendingExecutionKey) closeSnackbar(pendingExecutionKey)
showSnackbar(notificationsQueue.afterExecutionError, enqueueSnackbar, closeSnackbar) showSnackbar(notificationsQueue.afterExecutionError, enqueueSnackbar, closeSnackbar)