From aba14bfb8c2dd8b394a4ebb896b7b9198f989e97 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Fri, 13 Nov 2020 10:10:40 -0500
Subject: [PATCH] Combine approve/deny modals into one modal

---
 .../WorkflowApprovalList.jsx                  | 34 ++++++-------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.jsx b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.jsx
index 0d76c9fa17..2d357223df 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.jsx
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.jsx
@@ -129,11 +129,6 @@ function WorkflowApprovalsList({ i18n }) {
     setSelected([]);
   };
 
-  const {
-    error: approveError,
-    dismissError: dismissApproveError,
-  } = useDismissableError(approveApprovalError);
-
   const {
     error: denyApprovalError,
     isLoading: isDenyLoading,
@@ -153,9 +148,9 @@ function WorkflowApprovalsList({ i18n }) {
   };
 
   const {
-    error: denyError,
-    dismissError: dismissDenyError,
-  } = useDismissableError(denyApprovalError);
+    error: actionError,
+    dismissError: dismissActionError,
+  } = useDismissableError(approveApprovalError || denyApprovalError);
 
   return (
     <>
@@ -248,26 +243,17 @@ function WorkflowApprovalsList({ i18n }) {
           <ErrorDetail error={deletionError} />
         </AlertModal>
       )}
-      {approveError && (
+      {actionError && (
         <AlertModal
-          isOpen={approveError}
+          isOpen={actionError}
           variant="error"
           title={i18n._(t`Error!`)}
-          onClose={dismissApproveError}
+          onClose={dismissActionError}
         >
-          {i18n._(t`Failed to approve one or more workflow approval.`)}
-          <ErrorDetail error={approveError} />
-        </AlertModal>
-      )}
-      {denyError && (
-        <AlertModal
-          isOpen={denyError}
-          variant="error"
-          title={i18n._(t`Error!`)}
-          onClose={dismissDenyError}
-        >
-          {i18n._(t`Failed to deny one or more workflow approval.`)}
-          <ErrorDetail error={denyError} />
+          {approveApprovalError
+            ? i18n._(t`Failed to approve one or more workflow approval.`)
+            : i18n._(t`Failed to deny one or more workflow approval.`)}
+          <ErrorDetail error={actionError} />
         </AlertModal>
       )}
     </>