From dc1f8f82f9d7142ed06b2be185e84862798ad544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= <sergiodiassalgado@gmail.com>
Date: Fri, 14 Jan 2022 19:45:18 +0000
Subject: [PATCH] fix: remove duplicate code

---
 new-lamassu-admin/src/pages/Triggers/TriggerView.js |  5 +----
 new-lamassu-admin/src/pages/Triggers/Triggers.js    | 10 +++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/new-lamassu-admin/src/pages/Triggers/TriggerView.js b/new-lamassu-admin/src/pages/Triggers/TriggerView.js
index 93bbdc87..d07bdce9 100644
--- a/new-lamassu-admin/src/pages/Triggers/TriggerView.js
+++ b/new-lamassu-admin/src/pages/Triggers/TriggerView.js
@@ -75,10 +75,7 @@ const TriggerView = ({
           error={error?.message}
           save={add}
           onClose={toggleWizard}
-          customInfoRequests={R.filter(
-            it => it.enabled === true,
-            customInfoRequests
-          )}
+          customInfoRequests={customInfoRequests}
         />
       )}
       {R.isEmpty(triggers) && (
diff --git a/new-lamassu-admin/src/pages/Triggers/Triggers.js b/new-lamassu-admin/src/pages/Triggers/Triggers.js
index af4046bc..c7e82550 100644
--- a/new-lamassu-admin/src/pages/Triggers/Triggers.js
+++ b/new-lamassu-admin/src/pages/Triggers/Triggers.js
@@ -48,8 +48,10 @@ const GET_CUSTOM_REQUESTS = gql`
 const Triggers = () => {
   const classes = useStyles()
   const [wizardType, setWizard] = useState(false)
-  const { data, loading } = useQuery(GET_CONFIG)
-  const { data: customInfoReqData } = useQuery(GET_CUSTOM_REQUESTS)
+  const { data, loading: configLoading } = useQuery(GET_CONFIG)
+  const { data: customInfoReqData, loading: customInfoLoading } = useQuery(
+    GET_CUSTOM_REQUESTS
+  )
   const [error, setError] = useState(null)
   const [subMenu, setSubMenu] = useState(false)
 
@@ -94,6 +96,8 @@ const Triggers = () => {
     return setWizard(wizardName)
   }
 
+  const loading = configLoading || customInfoLoading
+
   return (
     <>
       <TitleSection
@@ -178,7 +182,7 @@ const Triggers = () => {
           showWizard={wizardType === 'newTrigger'}
           config={data?.config ?? {}}
           toggleWizard={toggleWizard('newTrigger')}
-          customInfoRequests={customInfoRequests}
+          customInfoRequests={enabledCustomInfoRequests}
         />
       )}
       {!loading && subMenu === 'advancedSettings' && (