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

fix: owner address lookup from tx.confirmation list

This commit is contained in:
fernandomg 2020-05-10 17:26:39 -03:00
parent de65b2914b
commit b99cf3a02a
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/logic/safe/safeTxSigner.js
View File

@ -12,7 +12,7 @@ export const generateSignaturesFromTxConfirmations = (
// The constant parts need to be sorted so that the recovered signers are sorted ascending // The constant parts need to be sorted so that the recovered signers are sorted ascending
// (natural order) by address (not checksummed). // (natural order) by address (not checksummed).
const confirmationsMap = confirmations.reduce((map, obj) => { const confirmationsMap = confirmations.reduce((map, obj) => {
map[obj.owner.address.toLowerCase()] = obj // eslint-disable-line no-param-reassign map[obj.owner.toLowerCase()] = obj // eslint-disable-line no-param-reassign
return map return map
}, {}) }, {})

4
src/logic/safe/transactions/awaitingTransactions.js
View File

@ -27,9 +27,7 @@ export const getAwaitingTransactions = (
if (!transaction.executionTxHash && !isTransactionCancelled) { if (!transaction.executionTxHash && !isTransactionCancelled) {
// Then we check if the waiting confirmations are not from the current user, otherwise, filters this // Then we check if the waiting confirmations are not from the current user, otherwise, filters this
// transaction // transaction
const transactionWaitingUser = transaction.confirmations.filter( const transactionWaitingUser = transaction.confirmations.filter(({ owner }) => owner !== userAccount)
(confirmation) => confirmation.owner && confirmation.owner.address !== userAccount,
)
return transactionWaitingUser.size > 0 return transactionWaitingUser.size > 0
} }