From a199b0588acc49e461ab2e1027a2b9f5e5851e51 Mon Sep 17 00:00:00 2001
From: mmv <mmvsha73@gmail.com>
Date: Wed, 10 Jul 2019 14:56:36 +0400
Subject: [PATCH] minor fixes

---
 .../ExpandedTx/OwnersColumn/index.jsx         | 26 +++++++++----------
 src/routes/safe/container/selector.js         |  4 +--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/routes/safe/components/TransactionsNew/TxsTable/ExpandedTx/OwnersColumn/index.jsx b/src/routes/safe/components/TransactionsNew/TxsTable/ExpandedTx/OwnersColumn/index.jsx
index 51806173..526be21c 100644
--- a/src/routes/safe/components/TransactionsNew/TxsTable/ExpandedTx/OwnersColumn/index.jsx
+++ b/src/routes/safe/components/TransactionsNew/TxsTable/ExpandedTx/OwnersColumn/index.jsx
@@ -52,25 +52,23 @@ const OwnersColumn = ({
   const cancellationTx = isCancellationTransaction(tx, safeAddress)
 
   const ownersWhoConfirmed = []
-  const ownersUnconfirmed = []
   let currentUserAlreadyConfirmed = false
   let executionConfirmation
-  owners.forEach((owner) => {
-    const ownerConfirmation = tx.confirmations.find(conf => conf.owner.address === owner.address)
-    if (ownerConfirmation) {
-      if (ownerConfirmation.type === TX_TYPE_CONFIRMATION) {
-        ownersWhoConfirmed.push(owner)
-      } else {
-        executionConfirmation = owner
-      }
 
-      if (owner.address === userAddress) {
-        currentUserAlreadyConfirmed = true
-      }
+  tx.confirmations.forEach((conf) => {
+    if (conf.owner.address === userAddress) {
+      currentUserAlreadyConfirmed = true
+    }
+
+    if (conf.type === TX_TYPE_CONFIRMATION) {
+      ownersWhoConfirmed.push(conf.owner)
     } else {
-      ownersUnconfirmed.push(owner)
+      executionConfirmation = conf.owner
     }
   })
+  const ownersUnconfirmed = owners.filter(
+    owner => tx.confirmations.findIndex(conf => conf.owner.address === owner.address) === -1,
+  )
 
   let displayButtonRow = true
   if (tx.executionTxHash) {
@@ -86,7 +84,7 @@ const OwnersColumn = ({
   }
 
   const confirmedLabel = `Confirmed [${tx.confirmations.size}/${threshold}]`
-  const unconfirmedLabel = `Unconfirmed [${owners.size - tx.confirmations.size}]`
+  const unconfirmedLabel = `Unconfirmed [${ownersUnconfirmed.size}]`
 
   return (
     <Col xs={6} className={classes.rightCol} layout="block">
diff --git a/src/routes/safe/container/selector.js b/src/routes/safe/container/selector.js
index 2e32307a..e29eee1f 100644
--- a/src/routes/safe/container/selector.js
+++ b/src/routes/safe/container/selector.js
@@ -36,11 +36,11 @@ export type SelectorProps = {
 const getTxStatus = (tx: Transaction, safe: Safe): TransactionStatus => {
   let txStatus = 'awaiting_confirmations'
 
-  if (tx.isExecuted) {
+  if (tx.executionTxHash) {
     txStatus = 'success'
   } else if (tx.cancelled) {
     txStatus = 'cancelled'
-  } else if (tx.confirmations.size === safe.owners.size) {
+  } else if (tx.confirmations.size === safe.threshold) {
     txStatus = 'awaiting_execution'
   }