From d301f74feba71e4919664e0712cc7ea226e75978 Mon Sep 17 00:00:00 2001
From: Alfonso Hernandez <a.hernandez@newxel.online>
Date: Thu, 18 Jul 2024 02:46:50 +0200
Subject: [PATCH] fix(frontend): interactions SecretApprovalRequestAction

---
 .../components/SecretApprovalRequestAction.tsx             | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/SecretApprovalPage/components/SecretApprovalRequest/components/SecretApprovalRequestAction.tsx b/frontend/src/views/SecretApprovalPage/components/SecretApprovalRequest/components/SecretApprovalRequestAction.tsx
index 05db75a9d6..f56695764b 100644
--- a/frontend/src/views/SecretApprovalPage/components/SecretApprovalRequest/components/SecretApprovalRequestAction.tsx
+++ b/frontend/src/views/SecretApprovalPage/components/SecretApprovalRequest/components/SecretApprovalRequestAction.tsx
@@ -134,8 +134,11 @@ export const SecretApprovalRequestAction = ({
                 Close request
               </Button>
               <Button
-                leftIcon={<FontAwesomeIcon icon={isSoftEnforcement && !canApprove ? faLandMineOn : faCheck} />}
-                isDisabled={!isMergable || (!byPassApproval && !canApprove)}
+                leftIcon={<FontAwesomeIcon icon={!canApprove ? faLandMineOn : faCheck} />}
+                isDisabled={
+                  (!isMergable && canApprove)
+                  || (!canApprove && isSoftEnforcement && !byPassApproval)
+                }
                 isLoading={isMerging}
                 onClick={handleSecretApprovalRequestMerge}
                 colorSchema={isSoftEnforcement && !canApprove ? "danger" : "primary"}