diff --git a/src/components/Extensibility/helpers/jsonataWrapper.ts b/src/components/Extensibility/helpers/jsonataWrapper.ts
index b9cefac11e..8dd3dfdf56 100644
--- a/src/components/Extensibility/helpers/jsonataWrapper.ts
+++ b/src/components/Extensibility/helpers/jsonataWrapper.ts
@@ -66,12 +66,12 @@ export function jsonataWrapper(expression: string) {
   );
 
   exp.registerFunction('getModuleState', resource => {
-    const { data: status } = useModuleStatus(resource);
+    const { data: status } = useModuleStatus(resource?.resource);
     return status?.state || 'Unknown';
   });
 
   exp.registerFunction('getModuleDescription', resource => {
-    const { data: status } = useModuleStatus(resource);
+    const { data: status } = useModuleStatus(resource?.resource);
     return status?.description;
   });
 
diff --git a/src/components/KymaModules/KymaModulesAddModule.js b/src/components/KymaModules/KymaModulesAddModule.js
index 8f3c5c74c2..35f4c4ee28 100644
--- a/src/components/KymaModules/KymaModulesAddModule.js
+++ b/src/components/KymaModules/KymaModulesAddModule.js
@@ -11,6 +11,7 @@ import {
 } from './kymaModulesQueries';
 
 import './KymaModulesAddModule.scss';
+import { findStatus } from './support';
 
 export default function KymaModulesAddModule({
   resourceName,
@@ -188,38 +189,6 @@ export default function KymaModulesAddModule({
     setSelectedModules(newSelectedModules);
   };
 
-  const setChannel = (module, channel, index) => {
-    const modulesToUpdate = [...selectedModules];
-    if (
-      selectedModules.find(
-        selectedModule => selectedModule.name === module.name,
-      )
-    ) {
-      if (channel === 'predefined') {
-        delete modulesToUpdate[index].channel;
-      } else modulesToUpdate[index].channel = channel;
-    } else {
-      modulesToUpdate.push({
-        name: module.name,
-      });
-      if (channel !== 'predefined')
-        modulesToUpdate[modulesToUpdate?.length - 1].channel = channel;
-    }
-    setSelectedModules(modulesToUpdate);
-  };
-
-  const findStatus = moduleName => {
-    return kymaResource?.status?.modules?.find(
-      module => moduleName === module.name,
-    );
-  };
-
-  const findSpec = moduleName => {
-    return kymaResource?.spec.modules?.find(
-      module => moduleName === module.name,
-    );
-  };
-
   const checkIfSelectedModuleIsBeta = moduleName => {
     return selectedModules.some(({ name, channel }) => {
       if (moduleName && name !== moduleName) {
@@ -241,7 +210,7 @@ export default function KymaModulesAddModule({
       ?.find(mod => mod.name === moduleName)
       ?.channels.some(
         ({ channel: ch, isBeta }) =>
-          ch === findStatus(moduleName)?.channel ||
+          ch === findStatus(kymaResource, moduleName)?.channel ||
           (kymaResource.spec.channel && isBeta),
       );
   };
@@ -262,9 +231,8 @@ export default function KymaModulesAddModule({
           key={module.name}
           isChecked={isChecked}
           setCheckbox={setCheckbox}
-          setChannel={setChannel}
-          findStatus={findStatus}
-          findSpec={findSpec}
+          selectedModules={selectedModules}
+          setSelectedModules={setSelectedModules}
           checkIfStatusModuleIsBeta={checkIfStatusModuleIsBeta}
         />
       );
diff --git a/src/components/KymaModules/KymaModulesCreate.js b/src/components/KymaModules/KymaModulesEdit.js
similarity index 87%
rename from src/components/KymaModules/KymaModulesCreate.js
rename to src/components/KymaModules/KymaModulesEdit.js
index cd423a473c..36d9e8cb98 100644
--- a/src/components/KymaModules/KymaModulesCreate.js
+++ b/src/components/KymaModules/KymaModulesEdit.js
@@ -35,8 +35,76 @@ import {
   useModulesReleaseQuery,
   useModuleTemplatesQuery,
 } from './kymaModulesQueries';
+import { findSpec, findStatus, setChannel } from './support';
 
-export default function KymaModulesCreate({ resource, ...props }) {
+const addChannelsToModules = moduleReleaseMetas => {
+  return (acc, module) => {
+    const name =
+      module.metadata?.labels['operator.kyma-project.io/module-name'];
+    const existingModule = acc.find(item => item.name === name);
+    if (module.spec.channel) {
+      if (!existingModule) {
+        acc.push({
+          name: name,
+          channels: [
+            {
+              channel: module.spec.channel,
+              version: module.spec.descriptor.component.version,
+              isBeta:
+                module.metadata.labels['operator.kyma-project.io/beta'] ===
+                'true',
+              isMetaRelease: false,
+            },
+          ],
+          docsUrl:
+            module.metadata.annotations['operator.kyma-project.io/doc-url'],
+        });
+      } else if (existingModule) {
+        existingModule.channels?.push({
+          channel: module.spec.channel,
+          version: module.spec.descriptor.component.version,
+          isBeta:
+            module.metadata.labels['operator.kyma-project.io/beta'] === 'true',
+          isMetaRelease: false,
+        });
+      }
+    } else {
+      if (!existingModule) {
+        const moduleMetaRelase = moduleReleaseMetas?.items.find(
+          item => item.spec.moduleName === name,
+        );
+        moduleMetaRelase?.spec.channels.forEach(channel => {
+          if (!acc.find(item => item.name === name)) {
+            acc.push({
+              name: name,
+              channels: [
+                {
+                  channel: channel.channel,
+                  version: channel.version,
+                  isBeta: moduleMetaRelase.spec.beta ?? false,
+                  isMetaRelease: true,
+                },
+              ],
+              docsUrl: module.spec.info.documentation,
+            });
+          } else {
+            acc
+              .find(item => item.name === name)
+              .channels.push({
+                channel: channel.channel,
+                version: channel.version,
+                isBeta: moduleMetaRelase.spec.beta ?? false,
+                isMetaRelease: true,
+              });
+          }
+        });
+      }
+    }
+    return acc;
+  };
+};
+
+export default function KymaModulesEdit({ resource, ...props }) {
   const { t } = useTranslation();
   const [kymaResource, setKymaResource] = useState(cloneDeep(resource));
   const [initialResource] = useState(resource);
@@ -65,10 +133,12 @@ export default function KymaModulesCreate({ resource, ...props }) {
 
   const getRequest = useSingleGet();
   const patchRequest = useUpdate();
-  const [selectedModules] = useState(
+  const [selectedModules, setSelectedModules] = useState(
     cloneDeep(initialResource?.spec?.modules) ?? [],
   );
-  const [isEdited, setIsEdited] = useState(false);
+  const [showChannelChangeWarning, setShowChannelChangeWarning] = useState(
+    false,
+  );
   const [isManagedChanged, setIsManagedChanged] = useState(false);
   const [showMessageBox, setShowMessageBox] = useState({
     isOpen: false,
@@ -86,33 +156,6 @@ export default function KymaModulesCreate({ resource, ...props }) {
     );
   }
 
-  const setChannel = (module, channel, index) => {
-    if (
-      selectedModules.find(
-        selectedModule => selectedModule.name === module.name,
-      )
-    ) {
-      if (channel === 'predefined') {
-        delete selectedModules[index].channel;
-      } else selectedModules[index].channel = channel;
-    } else {
-      selectedModules.push({
-        name: module.name,
-      });
-      if (channel !== 'predefined')
-        selectedModules[selectedModules.length - 1].channel = channel;
-    }
-
-    setKymaResource({
-      ...kymaResource,
-      spec: {
-        ...kymaResource.spec,
-        modules: selectedModules,
-      },
-    });
-    setIsEdited(true);
-  };
-
   const setManaged = (managed, index) => {
     selectedModules[index].managed = managed;
 
@@ -137,83 +180,10 @@ export default function KymaModulesCreate({ resource, ...props }) {
     );
   });
 
-  const modulesEditData = (installedModules || []).reduce((acc, module) => {
-    const name =
-      module.metadata?.labels['operator.kyma-project.io/module-name'];
-    const existingModule = acc.find(item => item.name === name);
-    const moduleMetaRelase = moduleReleaseMetas?.items.find(
-      item => item.spec.moduleName === name,
-    );
-
-    if (module.spec.channel) {
-      if (!existingModule) {
-        acc.push({
-          name: name,
-          channels: [
-            {
-              channel: module.spec.channel,
-              version: module.spec.descriptor.component.version,
-              isBeta:
-                module.metadata.labels['operator.kyma-project.io/beta'] ===
-                'true',
-              isMetaRelease: false,
-            },
-          ],
-          docsUrl:
-            module.metadata.annotations['operator.kyma-project.io/doc-url'],
-        });
-      } else if (existingModule) {
-        existingModule.channels?.push({
-          channel: module.spec.channel,
-          version: module.spec.descriptor.component.version,
-          isBeta:
-            module.metadata.labels['operator.kyma-project.io/beta'] === 'true',
-          isMetaRelease: false,
-        });
-      }
-    } else {
-      if (!existingModule) {
-        moduleMetaRelase?.spec.channels.forEach(channel => {
-          if (!acc.find(item => item.name === name)) {
-            acc.push({
-              name: name,
-              channels: [
-                {
-                  channel: channel.channel,
-                  version: channel.version,
-                  isBeta: moduleMetaRelase.spec.beta ?? false,
-                  isMetaRelease: true,
-                },
-              ],
-              docsUrl: module.spec.info.documentation,
-            });
-          } else {
-            acc
-              .find(item => item.name === name)
-              .channels.push({
-                channel: channel.channel,
-                version: channel.version,
-                isBeta: moduleMetaRelase.spec.beta ?? false,
-                isMetaRelease: true,
-              });
-          }
-        });
-      }
-    }
-    return acc;
-  }, []);
-
-  const findStatus = moduleName => {
-    return kymaResource?.status?.modules?.find(
-      module => moduleName === module.name,
-    );
-  };
-
-  const findSpec = moduleName => {
-    return kymaResource?.spec.modules?.find(
-      module => moduleName === module.name,
-    );
-  };
+  const modulesEditData = (installedModules || []).reduce(
+    addChannelsToModules(moduleReleaseMetas),
+    [],
+  );
 
   const checkIfSelectedModuleIsBeta = moduleName => {
     return selectedModules.some(({ name, channel }) => {
@@ -231,6 +201,18 @@ export default function KymaModulesCreate({ resource, ...props }) {
     });
   };
 
+  const onChange = (module, value, index) => {
+    setChannel(module, value, index, selectedModules, setSelectedModules);
+    setKymaResource({
+      ...kymaResource,
+      spec: {
+        ...kymaResource.spec,
+        modules: selectedModules,
+      },
+    });
+    setShowChannelChangeWarning(true);
+  };
+
   const renderModules = () => {
     const modulesList = [];
     modulesEditData?.forEach((module, i) => {
@@ -248,11 +230,11 @@ export default function KymaModulesCreate({ resource, ...props }) {
           <Select
             accessibleName={`channel-select-${module.name}`}
             onChange={event => {
-              setChannel(module, event.detail.selectedOption.value, index);
+              onChange(module, event.detail.selectedOption.value, index);
             }}
             value={
-              findSpec(module.name)?.channel ||
-              findStatus(module.name)?.channel ||
+              findSpec(kymaResource, module.name)?.channel ||
+              findStatus(kymaResource, module.name)?.channel ||
               'predefined'
             }
             className="channel-select"
@@ -260,7 +242,9 @@ export default function KymaModulesCreate({ resource, ...props }) {
             <Option
               selected={
                 !module.channels?.filter(
-                  channel => channel.channel === findSpec(module.name)?.channel,
+                  channel =>
+                    channel.channel ===
+                    findSpec(kymaResource, module.name)?.channel,
                 )
               }
               value={'predefined'}
@@ -278,7 +262,10 @@ export default function KymaModulesCreate({ resource, ...props }) {
             </Option>
             {module.channels?.map(channel => (
               <Option
-                selected={channel.channel === findSpec(module.name)?.channel}
+                selected={
+                  channel.channel ===
+                  findSpec(kymaResource, module.name)?.channel
+                }
                 key={`${channel.channel}-${module.name}${
                   channel.isMetaRelease ? '-meta' : ''
                 }`}
@@ -296,8 +283,9 @@ export default function KymaModulesCreate({ resource, ...props }) {
           <CheckBox
             accessibleName="managed-checkbox"
             text={t('kyma-modules.managed')}
-            checked={findSpec(module.name)?.managed}
+            checked={findSpec(kymaResource, module.name)?.managed}
             onChange={event => {
+              console.log(event);
               setManaged(event.target.checked, index);
             }}
           />
@@ -405,23 +393,20 @@ export default function KymaModulesCreate({ resource, ...props }) {
   };
 
   const skipModuleFn = () => {
-    const shouldShowManagedWarning = isManagedChanged;
-    const shouldShowChannelWarning = isEdited;
-
-    if (shouldShowManagedWarning) {
+    if (isManagedChanged) {
       setShowManagedBox({
         ...showManagedBox,
         isOpen: true,
         onSave: true,
       });
     }
-    if (shouldShowChannelWarning) {
+    if (showChannelChangeWarning) {
       setShowMessageBox({
         ...showMessageBox,
         isOpen: true,
       });
     }
-    return shouldShowManagedWarning || shouldShowChannelWarning;
+    return isManagedChanged || showChannelChangeWarning;
   };
 
   return (
@@ -439,7 +424,7 @@ export default function KymaModulesCreate({ resource, ...props }) {
           showManagedBox={showManagedBox}
           setShowManagedBox={setShowManagedBox}
           handleCreate={handleCreate}
-          isEdited={isEdited}
+          showChannelChangeWarning={showChannelChangeWarning}
           setShowMessageBox={setShowMessageBox}
         />,
         document.body,
diff --git a/src/components/KymaModules/KymaModulesList.js b/src/components/KymaModules/KymaModulesList.js
index 17aac82e0b..18d01e5431 100644
--- a/src/components/KymaModules/KymaModulesList.js
+++ b/src/components/KymaModules/KymaModulesList.js
@@ -26,7 +26,7 @@ import {
 } from 'shared/hooks/BackendAPI/useGet';
 import { ExternalLink } from 'shared/components/ExternalLink/ExternalLink';
 import { EMPTY_TEXT_PLACEHOLDER } from 'shared/constants';
-import KymaModulesCreate from './KymaModulesCreate';
+import KymaModulesEdit from 'components/KymaModules/KymaModulesEdit.js';
 import {
   apiGroup,
   apiVersion,
@@ -49,6 +49,7 @@ import {
   useModulesReleaseQuery,
   useModuleTemplatesQuery,
 } from './kymaModulesQueries';
+import { findStatus } from './support';
 
 export default function KymaModulesList({
   DeleteMessageBox,
@@ -147,11 +148,6 @@ export default function KymaModulesList({
       );
     };
 
-    const findStatus = moduleName => {
-      return kymaResource?.status?.modules?.find(
-        module => moduleName === module.name,
-      );
-    };
     const findExtension = resourceKind => {
       return kymaExt?.find(ext => {
         const { resource: extensionResource } =
@@ -186,7 +182,7 @@ export default function KymaModulesList({
         selectedModules?.findIndex(kymaResourceModule => {
           return kymaResourceModule?.name === resource?.name;
         }) >= 0;
-      const moduleStatus = findStatus(resource.name);
+      const moduleStatus = findStatus(kymaResource, resource.name);
       const isDeletionFailed = moduleStatus?.state === 'Warning';
       const isError = moduleStatus?.state === 'Error';
 
@@ -200,7 +196,7 @@ export default function KymaModulesList({
     };
 
     const rowRenderer = resource => {
-      const moduleStatus = findStatus(resource.name);
+      const moduleStatus = findStatus(kymaResource, resource.name);
       const showDetailsLink = hasDetailsLink(resource);
       const moduleIndex = kymaResource?.spec?.modules?.findIndex(
         kymaResourceModule => {
@@ -291,10 +287,11 @@ export default function KymaModulesList({
       return {
         resourceName: resource?.name,
         resourceType: pluralize(
-          findStatus(resource.name)?.resource?.kind || '',
+          findStatus(kymaResource, resource.name)?.resource?.kind || '',
         ),
         namespaceId:
-          findStatus(resource.name)?.resource?.metadata?.namespace || '',
+          findStatus(kymaResource, resource.name)?.resource?.metadata
+            ?.namespace || '',
       };
     };
 
@@ -324,7 +321,7 @@ export default function KymaModulesList({
         selectedModules.findIndex(entry => entry.name === resourceName),
       );
       const isExtension = !!findExtension(resource?.resource?.kind);
-      const moduleStatus = findStatus(resourceName);
+      const moduleStatus = findStatus(kymaResource, resourceName);
       const moduleCrd = findCrd(resource?.resource?.kind);
       const skipRedirect = !hasDetailsLink(resource);
 
@@ -390,7 +387,8 @@ export default function KymaModulesList({
         selectedModules[chosenModuleIndex]?.channel ||
           kymaResource?.spec?.channel,
         selectedModules[chosenModuleIndex]?.version ||
-          findStatus(selectedModules[chosenModuleIndex]?.name)?.version,
+          findStatus(kymaResource, selectedModules[chosenModuleIndex]?.name)
+            ?.version,
       );
 
       return module?.spec?.associatedResources || [];
@@ -599,7 +597,7 @@ export default function KymaModulesList({
       namespace={namespace}
       customTitle={t('kyma-modules.title')}
       headerDescription={ResourceDescription}
-      createResourceForm={KymaModulesCreate}
+      createResourceForm={KymaModulesEdit}
       disableResourceDetailsCard
       disableDelete
     />
diff --git a/src/components/KymaModules/ManagedWarnings.tsx b/src/components/KymaModules/ManagedWarnings.tsx
index e658e50bc3..2d7459b3a0 100644
--- a/src/components/KymaModules/ManagedWarnings.tsx
+++ b/src/components/KymaModules/ManagedWarnings.tsx
@@ -9,7 +9,7 @@ type ManagedWarningsTypes = {
   showManagedBox: ShowManagedBox;
   setShowManagedBox(value: ShowManagedBox): void;
   handleCreate(): void;
-  isEdited: boolean;
+  showChannelChangeWarning: boolean;
   setShowMessageBox(value: ShowManagedBox): void;
 };
 
@@ -17,7 +17,7 @@ export const ManagedWarnings = ({
   showManagedBox,
   setShowManagedBox,
   handleCreate,
-  isEdited,
+  showChannelChangeWarning,
   setShowMessageBox,
 }: ManagedWarningsTypes) => {
   const { t } = useTranslation();
@@ -40,7 +40,7 @@ export const ManagedWarnings = ({
             design="Emphasized"
             key={'change-managed'}
             onClick={() =>
-              isEdited
+              showChannelChangeWarning
                 ? setShowManagedBox({
                     isOpen: false,
                     onSave: false,
@@ -48,7 +48,11 @@ export const ManagedWarnings = ({
                 : handleCreate()
             }
           >
-            {t(isEdited ? 'common.buttons.ok' : 'kyma-modules.change')}
+            {t(
+              showChannelChangeWarning
+                ? 'common.buttons.ok'
+                : 'kyma-modules.change',
+            )}
           </Button>,
           <Button
             accessibleName="cancel-managed"
diff --git a/src/components/KymaModules/ModulesCard.js b/src/components/KymaModules/ModulesCard.js
index 87155302e0..7d0b67b81e 100644
--- a/src/components/KymaModules/ModulesCard.js
+++ b/src/components/KymaModules/ModulesCard.js
@@ -12,6 +12,7 @@ import {
 import { ExternalLink } from 'shared/components/ExternalLink/ExternalLink';
 import { useTranslation } from 'react-i18next';
 import { useEffect, useState } from 'react';
+import { findSpec, findStatus, setChannel } from './support';
 
 async function isImageAvailable(url) {
   try {
@@ -38,10 +39,9 @@ export default function ModulesCard({
   index,
   isChecked,
   setCheckbox,
-  setChannel,
-  findStatus,
-  findSpec,
   checkIfStatusModuleIsBeta,
+  selectedModules,
+  setSelectedModules,
 }) {
   const { t } = useTranslation();
   const [imageSrc, setImageSrc] = useState('');
@@ -58,7 +58,7 @@ export default function ModulesCard({
     <Card key={module.name} className="addModuleCard">
       <ListItemStandard
         className="moduleCardHeader"
-        onClick={e => setCheckbox(module, !isChecked(module.name), index)}
+        onClick={() => setCheckbox(module, !isChecked(module.name), index)}
       >
         <CheckBox className="checkbox" checked={isChecked(module.name)} />
         <div className="titles">
@@ -66,8 +66,8 @@ export default function ModulesCard({
             {module.name}
           </Title>
           <Text className="bsl-has-color-status-4">
-            {findStatus(module.name)?.version
-              ? `v${findStatus(module.name)?.version} ${
+            {findStatus(kymaResource, module.name)?.version
+              ? `v${findStatus(kymaResource, module.name)?.version} ${
                   checkIfStatusModuleIsBeta(module.name) ? '(Beta)' : ''
                 }`
               : module.channels.find(
@@ -110,11 +110,17 @@ export default function ModulesCard({
           <Label>{t('kyma-modules.release-channel') + ':'} </Label>
           <Select
             onChange={event => {
-              setChannel(module, event.detail.selectedOption.value, index);
+              setChannel(
+                module,
+                event.detail.selectedOption.value,
+                index,
+                selectedModules,
+                setSelectedModules,
+              );
             }}
             value={
-              findSpec(module.name)?.channel ||
-              findStatus(module.name)?.channel ||
+              findSpec(kymaResource, module.name)?.channel ||
+              findStatus(kymaResource, module.name)?.channel ||
               'predefined'
             }
             className="channel-select"
@@ -122,7 +128,9 @@ export default function ModulesCard({
             <Option
               selected={
                 !module.channels?.filter(
-                  channel => channel.channel === findSpec(module.name)?.channel,
+                  channel =>
+                    channel.channel ===
+                    findSpec(kymaResource, module.name)?.channel,
                 )
               }
               value={'predefined'}
@@ -139,7 +147,10 @@ export default function ModulesCard({
             </Option>
             {module.channels?.map(channel => (
               <Option
-                selected={channel.channel === findSpec(module.name)?.channel}
+                selected={
+                  channel.channel ===
+                  findSpec(kymaResource, module.name)?.channel
+                }
                 key={`${channel.channel}${
                   channel.isMetaRelease ? '-meta' : ''
                 }`}
diff --git a/src/components/KymaModules/components/ModuleStatus.tsx b/src/components/KymaModules/components/ModuleStatus.tsx
index 1063481c7e..8e63f87daf 100644
--- a/src/components/KymaModules/components/ModuleStatus.tsx
+++ b/src/components/KymaModules/components/ModuleStatus.tsx
@@ -20,7 +20,7 @@ export const resolveType = (status: string) => {
 };
 
 export const ModuleStatus = ({ resource }: any) => {
-  const { data: status } = useModuleStatus(resource);
+  const { data: status } = useModuleStatus(resource?.resource);
 
   const moduleState = status?.state || 'Unknown';
   const moduleMessage = status?.description;
diff --git a/src/components/KymaModules/index.tsx b/src/components/KymaModules/index.tsx
index afacd49473..e5bc893fcb 100644
--- a/src/components/KymaModules/index.tsx
+++ b/src/components/KymaModules/index.tsx
@@ -7,7 +7,7 @@ export const apiGroup = 'operator.kyma-project.io';
 export const apiVersion = 'v1beta2';
 
 export const List = React.lazy(() => import('./KymaModulesList'));
-export const Create = React.lazy(() => import('./KymaModulesCreate'));
+export const Create = React.lazy(() => import('./KymaModulesEdit'));
 
 export const ResourceDescription = (
   <Description
diff --git a/src/components/KymaModules/support.ts b/src/components/KymaModules/support.ts
index ee5ee15d53..01a6148d08 100644
--- a/src/components/KymaModules/support.ts
+++ b/src/components/KymaModules/support.ts
@@ -1,26 +1,46 @@
 import pluralize from 'pluralize';
-import { useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { useFetch } from 'shared/hooks/BackendAPI/useFetch';
 
-export function useModuleStatus(resource: any) {
+type KymaResourceType = {
+  apiVersion: string;
+  kind: string;
+  metadata: {
+    name: string;
+    namespace: string;
+  };
+  spec: {
+    modules: {
+      name: string;
+    }[];
+  };
+  status: {
+    modules: {
+      name: string;
+    }[];
+  };
+};
+
+export function useModuleStatus(resource: KymaResourceType) {
   const fetch = useFetch();
   const [data, setData] = useState<any>(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<Error | null>(null);
 
-  const path = resource?.resource?.metadata?.namespace
-    ? `/apis/${resource?.resource?.apiVersion}/namespaces/${
-        resource?.resource?.metadata?.namespace
-      }/${pluralize(resource?.resource?.kind || '').toLowerCase()}/${
-        resource?.resource?.metadata?.name
+  const path = resource?.metadata?.namespace
+    ? `/apis/${resource?.apiVersion}/namespaces/${
+        resource?.metadata?.namespace
+      }/${pluralize(resource?.kind || '').toLowerCase()}/${
+        resource?.metadata?.name
       }`
-    : `/apis/${resource?.resource?.apiVersion}/${pluralize(
-        resource?.resource?.kind || '',
-      ).toLowerCase()}/${resource?.resource?.metadata?.name}`;
+    : `/apis/${resource?.apiVersion}/${pluralize(
+        resource?.kind || '',
+      ).toLowerCase()}/${resource?.metadata?.name}`;
 
   useEffect(() => {
     async function fetchModule() {
+      if (!resource) return;
       try {
         const response = await fetch({ relativeUrl: path });
         const status = (await response.json())?.status;
@@ -33,9 +53,57 @@ export function useModuleStatus(resource: any) {
         setLoading(false);
       }
     }
+
     fetchModule();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [path]);
 
-  return { data: data, loading: loading, error: error };
+  return { data, loading, error };
 }
+
+export const findStatus = (
+  kymaResource: KymaResourceType,
+  moduleName: string,
+) => {
+  return kymaResource?.status?.modules?.find(
+    (module: { name: string }) => moduleName === module.name,
+  );
+};
+
+export const findSpec = (
+  kymaResource: KymaResourceType,
+  moduleName: string,
+) => {
+  return kymaResource?.spec.modules?.find(
+    (module: { name: string }) => moduleName === module.name,
+  );
+};
+
+export const setChannel = (
+  module: { name: string },
+  channel: string,
+  index: number,
+  selectedModules: {
+    name: string;
+    channel?: string;
+  }[],
+  setSelectedModules: React.Dispatch<React.SetStateAction<any[]>>,
+) => {
+  const modulesToUpdate = [...selectedModules];
+  if (
+    selectedModules.find(
+      (selectedModule: { name: string }) => selectedModule.name === module.name,
+    )
+  ) {
+    if (channel === 'predefined') {
+      delete modulesToUpdate[index].channel;
+    } else modulesToUpdate[index].channel = channel;
+  } else {
+    modulesToUpdate.push({
+      name: module.name,
+    });
+    if (channel !== 'predefined')
+      modulesToUpdate[modulesToUpdate?.length - 1].channel = channel;
+  }
+  setSelectedModules(modulesToUpdate);
+};