From 5b24b60d3154213e98038174368a3fd80a94e007 Mon Sep 17 00:00:00 2001
From: Fredrik Strand Oseberg <fredrik.no@gmail.com>
Date: Tue, 29 Nov 2022 13:34:30 +0100
Subject: [PATCH] fix: flickering dialogue (#2558)

* This PR fixes an issue with flickering states in the change request
dialogue
---
 .../ChangeRequestMessages/UpdateEnabledMessage.tsx          | 2 +-
 frontend/src/hooks/useChangeRequestToggle.ts                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/component/changeRequest/ChangeRequestConfirmDialog/ChangeRequestMessages/UpdateEnabledMessage.tsx b/frontend/src/component/changeRequest/ChangeRequestConfirmDialog/ChangeRequestMessages/UpdateEnabledMessage.tsx
index 0eeb9156bb..83f8930ed8 100644
--- a/frontend/src/component/changeRequest/ChangeRequestConfirmDialog/ChangeRequestMessages/UpdateEnabledMessage.tsx
+++ b/frontend/src/component/changeRequest/ChangeRequestConfirmDialog/ChangeRequestMessages/UpdateEnabledMessage.tsx
@@ -12,7 +12,7 @@ export const UpdateEnabledMessage = ({
     environment,
 }: UpdateEnabledMsg) => (
     <Typography>
-        <strong>{enabled ? 'Disable' : 'Enable'}</strong> feature toggle{' '}
+        <strong>{enabled ? 'Enable' : 'Disable'}</strong> feature toggle{' '}
         <strong>{featureName}</strong> in <strong>{environment}</strong>
     </Typography>
 );
diff --git a/frontend/src/hooks/useChangeRequestToggle.ts b/frontend/src/hooks/useChangeRequestToggle.ts
index e9ba1b402e..f7fffdeebb 100644
--- a/frontend/src/hooks/useChangeRequestToggle.ts
+++ b/frontend/src/hooks/useChangeRequestToggle.ts
@@ -31,7 +31,7 @@ export const useChangeRequestToggle = (project: string) => {
     );
 
     const onChangeRequestToggleClose = useCallback(() => {
-        setChangeRequestDialogDetails({ isOpen: false });
+        setChangeRequestDialogDetails(prev => ({ ...prev, isOpen: false }));
     }, []);
 
     const onChangeRequestToggleConfirm = useCallback(async () => {
@@ -48,14 +48,14 @@ export const useChangeRequestToggle = (project: string) => {
                 }
             );
             refetchChangeRequests();
-            setChangeRequestDialogDetails({ isOpen: false });
+            setChangeRequestDialogDetails(prev => ({ ...prev, isOpen: false }));
             setToastData({
                 type: 'success',
                 title: 'Changes added to the draft!',
             });
         } catch (error) {
             setToastApiError(formatUnknownError(error));
-            setChangeRequestDialogDetails({ isOpen: false });
+            setChangeRequestDialogDetails(prev => ({ ...prev, isOpen: false }));
         }
     }, [addChangeRequest]);