From b99cf3a02a465574b42d822b88f91dcee0c5cc3a Mon Sep 17 00:00:00 2001 From: fernandomg Date: Sun, 10 May 2020 17:26:39 -0300 Subject: [PATCH] fix: owner address lookup from tx.confirmation list --- src/logic/safe/safeTxSigner.js | 2 +- src/logic/safe/transactions/awaitingTransactions.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/logic/safe/safeTxSigner.js b/src/logic/safe/safeTxSigner.js index fc46af26..4fd85cbe 100644 --- a/src/logic/safe/safeTxSigner.js +++ b/src/logic/safe/safeTxSigner.js @@ -12,7 +12,7 @@ export const generateSignaturesFromTxConfirmations = ( // The constant parts need to be sorted so that the recovered signers are sorted ascending // (natural order) by address (not checksummed). 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 }, {}) diff --git a/src/logic/safe/transactions/awaitingTransactions.js b/src/logic/safe/transactions/awaitingTransactions.js index 1320b38d..a3d05421 100644 --- a/src/logic/safe/transactions/awaitingTransactions.js +++ b/src/logic/safe/transactions/awaitingTransactions.js @@ -27,9 +27,7 @@ export const getAwaitingTransactions = ( if (!transaction.executionTxHash && !isTransactionCancelled) { // Then we check if the waiting confirmations are not from the current user, otherwise, filters this // transaction - const transactionWaitingUser = transaction.confirmations.filter( - (confirmation) => confirmation.owner && confirmation.owner.address !== userAccount, - ) + const transactionWaitingUser = transaction.confirmations.filter(({ owner }) => owner !== userAccount) return transactionWaitingUser.size > 0 }