From c40ea98b5b58ef90b953cba9286736d7fef378c1 Mon Sep 17 00:00:00 2001
From: mmv <mmvsha73@gmail.com>
Date: Tue, 9 Jul 2019 16:25:53 +0400
Subject: [PATCH] hide confirm button if the threshold is already reached

---
 .../TxsTable/ExpandedTx/OwnersColumn/index.jsx         | 10 ++++------
 1 file changed, 4 insertions(+), 6 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 79a8f690..a242a68d 100644
--- a/src/routes/safe/components/TransactionsNew/TxsTable/ExpandedTx/OwnersColumn/index.jsx
+++ b/src/routes/safe/components/TransactionsNew/TxsTable/ExpandedTx/OwnersColumn/index.jsx
@@ -50,14 +50,9 @@ const OwnersColumn = ({
   }
 
   const cancellationTx = isCancellationTransaction(tx, safeAddress)
-  const confirmedLabel = `Confirmed [${
-    tx.confirmations.filter(conf => conf.type === TX_TYPE_CONFIRMATION).size
-  }/${threshold}]`
-  const unconfirmedLabel = `Unconfirmed [${owners.size - tx.confirmations.size}]`
 
   const ownersWhoConfirmed = []
   const ownersUnconfirmed = []
-
   let currentUserAlreadyConfirmed = false
   let executionConfirmation
   owners.forEach((owner) => {
@@ -90,6 +85,9 @@ const OwnersColumn = ({
     displayButtonRow = false
   }
 
+  const confirmedLabel = `Confirmed [${tx.confirmations.size}/${threshold}]`
+  const unconfirmedLabel = `Unconfirmed [${owners.size - tx.confirmations.size}]`
+
   return (
     <Col xs={6} className={classes.rightCol} layout="block">
       <Row>
@@ -107,7 +105,7 @@ const OwnersColumn = ({
         <ButtonRow
           onTxConfirm={onTxConfirm}
           onTxCancel={onTxCancel}
-          showConfirmBtn={!currentUserAlreadyConfirmed}
+          showConfirmBtn={!currentUserAlreadyConfirmed && !thresholdReached}
           showCancelBtn={!cancellationTx}
           showExecuteBtn={thresholdReached}
           onTxExecute={onTxExecute}