From 2463ead86303ace94a0a72558268331b673cc376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= <sergiodiassalgado@gmail.com>
Date: Wed, 23 Jun 2021 00:39:40 +0100
Subject: [PATCH] fix: cancel transaction button condition

---
 new-lamassu-admin/src/pages/Transactions/DetailsCard.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
index 897f4d6e..237616a0 100644
--- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
+++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
@@ -297,7 +297,7 @@ const DetailsRow = ({ it: tx, timezone }) => {
               onClick={() => downloadRawLogs(tx, timezone)}>
               Download raw logs
             </ActionButton>
-            {tx.txClass === 'cashOut' && (
+            {tx.txClass === 'cashOut' && getStatus(tx) !== 'Cancelled' && (
               <ActionButton
                 color="primary"
                 Icon={CancelIcon}
@@ -327,6 +327,7 @@ const DetailsRow = ({ it: tx, timezone }) => {
               id: tx.id
             }
           })
+          setAction({ command: null })
         }}
         onDissmised={() => {
           setAction({ command: null })