From c958abdfcf67dd8ea9357d3d5f71e4084ff812d8 Mon Sep 17 00:00:00 2001
From: Ali BARIN <ali.barin53@gmail.com>
Date: Fri, 7 Oct 2022 12:43:59 +0200
Subject: [PATCH] fix(web): correct types

---
 .../web/src/components/ChooseAppAndEventSubstep/index.tsx | 8 ++++----
 packages/web/src/components/FlowStep/index.tsx            | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/web/src/components/ChooseAppAndEventSubstep/index.tsx b/packages/web/src/components/ChooseAppAndEventSubstep/index.tsx
index b6bcb461..396d4b78 100644
--- a/packages/web/src/components/ChooseAppAndEventSubstep/index.tsx
+++ b/packages/web/src/components/ChooseAppAndEventSubstep/index.tsx
@@ -60,14 +60,14 @@ function ChooseAppAndEventSubstep(
     () => apps?.map((app) => optionGenerator(app)),
     [apps]
   );
-  const actionsOrTriggers = isTrigger ? app?.triggers : app?.actions;
+  const actionsOrTriggers: Array<ITrigger | IAction> = (isTrigger ? app?.triggers : app?.actions) || [];
   const actionOptions = React.useMemo(
-    () => actionsOrTriggers?.map((trigger) => optionGenerator(trigger)) ?? [],
+    () => actionsOrTriggers.map((trigger) => optionGenerator(trigger)),
     [app?.key]
   );
   const selectedActionOrTrigger =
-    actionsOrTriggers?.find(
-      (actionOrTrigger) => actionOrTrigger.key === step?.key
+    actionsOrTriggers.find(
+      (actionOrTrigger: IAction | ITrigger) => actionOrTrigger.key === step?.key
     );
 
   const { name } = substep;
diff --git a/packages/web/src/components/FlowStep/index.tsx b/packages/web/src/components/FlowStep/index.tsx
index 1e695973..17c4bbb7 100644
--- a/packages/web/src/components/FlowStep/index.tsx
+++ b/packages/web/src/components/FlowStep/index.tsx
@@ -13,7 +13,7 @@ import CheckCircleIcon from '@mui/icons-material/CheckCircle';
 import { yupResolver } from '@hookform/resolvers/yup';
 import * as yup from 'yup';
 import type { BaseSchema } from 'yup';
-import type { IApp, IField, IStep, ISubstep } from '@automatisch/types';
+import type { IApp, ITrigger, IAction, IStep, ISubstep } from '@automatisch/types';
 
 import { EditorContext } from 'contexts/Editor';
 import { StepExecutionsProvider } from 'contexts/StepExecutions';
@@ -139,10 +139,10 @@ export default function FlowStep(
   const apps: IApp[] = data?.getApps;
   const app = apps?.find((currentApp: IApp) => currentApp.key === step.appKey);
 
-  const actionsOrTriggers = isTrigger ? app?.triggers : app?.actions;
+  const actionsOrTriggers: Array<ITrigger | IAction> = (isTrigger ? app?.triggers : app?.actions) || [];
   const substeps = React.useMemo(
     () =>
-      actionsOrTriggers?.find(({ key }) => key === step.key)?.substeps || [],
+      actionsOrTriggers?.find(({ key }: ITrigger | IAction) => key === step.key)?.substeps || [],
     [actionsOrTriggers, step?.key]
   );