From c7fa8e63fadae96a57b176e79aedc6781214e118 Mon Sep 17 00:00:00 2001
From: Haris <mhaaris0815@gmail.com>
Date: Tue, 19 Mar 2024 01:13:43 +0530
Subject: [PATCH 1/3] fix: changed proptype from icon to subIcon

---
 .../src/components/Modal/ModalHeader/ModalHeader.tsx     | 9 +++++----
 packages/core/src/components/Tabs/Tab/Tab.tsx            | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx b/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx
index bc5d152dea..9985cbdd24 100644
--- a/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx
+++ b/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx
@@ -29,7 +29,8 @@ export interface ModalHeaderProps extends VibeComponentProps {
   /**
    * Icon to be rendered before the title
    */
-  icon?: string | React.FunctionComponent<IconSubComponentProps> | null;
+  // icon?: string | React.FunctionComponent<IconSubComponentProps> | null;
+  SubIcon: string;
   /**
    * Class name for the wrapper
    */
@@ -75,7 +76,7 @@ const ModalHeader: FC<ModalHeaderProps> = ({
   titleClassName,
   description = "",
   descriptionClassName,
-  icon,
+  SubIcon,
   closeModal = NOOP,
   iconSize = 24,
   iconClassName,
@@ -95,10 +96,10 @@ const ModalHeader: FC<ModalHeaderProps> = ({
         children
       ) : (
         <Flex align={Flex.align.START} gap={Flex.gaps.SMALL} className={titleClassName}>
-          {icon && (
+          {SubIcon && (
             <Icon
               className={cx(styles.icon, iconClassName)}
-              icon={icon}
+              icon={SubIcon}
               iconType={Icon.type.SVG}
               iconSize={iconSize}
               ignoreFocusStyle
diff --git a/packages/core/src/components/Tabs/Tab/Tab.tsx b/packages/core/src/components/Tabs/Tab/Tab.tsx
index 2c57619d48..09ad91b2d7 100644
--- a/packages/core/src/components/Tabs/Tab/Tab.tsx
+++ b/packages/core/src/components/Tabs/Tab/Tab.tsx
@@ -22,7 +22,7 @@ export interface TabProps extends VibeComponentProps {
   disabled?: boolean;
   active?: boolean;
   focus?: boolean;
-  icon?: string | React.FunctionComponent<IconSubComponentProps> | null;
+  SubIcon: string;
   iconType?: IconType;
   iconSide?: string;
   onClick?: (value: number) => void;
@@ -43,7 +43,7 @@ const Tab: FC<TabProps> = forwardRef(
       active = false,
       focus = false,
       onClick = NOOP,
-      icon,
+      SubIcon,
       iconType,
       iconSide = "left",
       children,
@@ -55,14 +55,14 @@ const Tab: FC<TabProps> = forwardRef(
     const mergedRef = useMergeRef(ref, componentRef);
 
     function renderIconAndChildren() {
-      if (!icon) return children;
+      if (!SubIcon) return children;
 
       const iconElement = (
         <Icon
           clickable={false}
           ariaHidden={true}
           iconType={iconType}
-          icon={icon}
+          icon={SubIcon}
           className={cx(styles.tabIcon, getStyle(styles, iconSide))}
           iconSize={18}
           ignoreFocusStyle

From 0838db502647c6461a999b0a823a5ddc77274353 Mon Sep 17 00:00:00 2001
From: Haris <mhaaris0815@gmail.com>
Date: Tue, 19 Mar 2024 13:46:25 +0530
Subject: [PATCH 2/3] fix: changed proptypes

---
 .../src/components/Modal/ModalHeader/ModalHeader.tsx  | 11 ++++++-----
 packages/core/src/components/Tabs/Tab/Tab.tsx         | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx b/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx
index 9985cbdd24..1347ce358d 100644
--- a/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx
+++ b/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx
@@ -2,7 +2,7 @@ import React, { FC } from "react";
 import cx from "classnames";
 import IconButton from "../../IconButton/IconButton";
 import CloseSmall from "../../Icon/Icons/components/CloseSmall";
-import Icon, { IconSubComponentProps } from "../../Icon/Icon";
+import Icon from "../../Icon/Icon";
 import VibeComponentProps from "../../../types/VibeComponentProps";
 import { NOOP } from "../../../utils/function-utils";
 import { ElementContent } from "src/types/ElementContent";
@@ -12,6 +12,7 @@ import Text from "../../Text/Text";
 import Heading from "../../Heading/Heading";
 import Flex from "../../Flex/Flex";
 import styles from "./ModalHeader.module.scss";
+import { SubIcon } from "src/types";
 
 export interface ModalHeaderProps extends VibeComponentProps {
   /**
@@ -30,7 +31,7 @@ export interface ModalHeaderProps extends VibeComponentProps {
    * Icon to be rendered before the title
    */
   // icon?: string | React.FunctionComponent<IconSubComponentProps> | null;
-  SubIcon: string;
+  icon?: SubIcon;
   /**
    * Class name for the wrapper
    */
@@ -76,7 +77,7 @@ const ModalHeader: FC<ModalHeaderProps> = ({
   titleClassName,
   description = "",
   descriptionClassName,
-  SubIcon,
+  icon,
   closeModal = NOOP,
   iconSize = 24,
   iconClassName,
@@ -96,10 +97,10 @@ const ModalHeader: FC<ModalHeaderProps> = ({
         children
       ) : (
         <Flex align={Flex.align.START} gap={Flex.gaps.SMALL} className={titleClassName}>
-          {SubIcon && (
+          {icon && (
             <Icon
               className={cx(styles.icon, iconClassName)}
-              icon={SubIcon}
+              icon={icon}
               iconType={Icon.type.SVG}
               iconSize={iconSize}
               ignoreFocusStyle
diff --git a/packages/core/src/components/Tabs/Tab/Tab.tsx b/packages/core/src/components/Tabs/Tab/Tab.tsx
index 09ad91b2d7..b13d3ed7a8 100644
--- a/packages/core/src/components/Tabs/Tab/Tab.tsx
+++ b/packages/core/src/components/Tabs/Tab/Tab.tsx
@@ -4,11 +4,12 @@ import React, { FC, forwardRef, ReactElement, useRef } from "react";
 import { noop as NOOP } from "lodash-es";
 import useMergeRef from "../../../hooks/useMergeRef";
 import { getStyle } from "../../../helpers/typesciptCssModulesHelper";
-import Icon, { IconSubComponentProps } from "../../Icon/Icon";
+import Icon from "../../Icon/Icon";
 import VibeComponentProps from "../../../types/VibeComponentProps";
 import { IconType } from "../../Icon/IconConstants";
 import { ComponentDefaultTestId, getTestId } from "../../../tests/test-ids-utils";
 import styles from "./Tab.module.scss";
+import { SubIcon } from "src/types";
 
 export interface TabProps extends VibeComponentProps {
   /**
@@ -22,7 +23,7 @@ export interface TabProps extends VibeComponentProps {
   disabled?: boolean;
   active?: boolean;
   focus?: boolean;
-  SubIcon: string;
+  icon?: SubIcon;
   iconType?: IconType;
   iconSide?: string;
   onClick?: (value: number) => void;
@@ -43,7 +44,7 @@ const Tab: FC<TabProps> = forwardRef(
       active = false,
       focus = false,
       onClick = NOOP,
-      SubIcon,
+      icon,
       iconType,
       iconSide = "left",
       children,
@@ -55,14 +56,14 @@ const Tab: FC<TabProps> = forwardRef(
     const mergedRef = useMergeRef(ref, componentRef);
 
     function renderIconAndChildren() {
-      if (!SubIcon) return children;
+      if (!icon) return children;
 
       const iconElement = (
         <Icon
           clickable={false}
           ariaHidden={true}
           iconType={iconType}
-          icon={SubIcon}
+          icon={icon}
           className={cx(styles.tabIcon, getStyle(styles, iconSide))}
           iconSize={18}
           ignoreFocusStyle

From 4a417cf93773362f89bfb3f3e356d36a5b89263c Mon Sep 17 00:00:00 2001
From: Haris <mhaaris0815@gmail.com>
Date: Tue, 19 Mar 2024 14:08:09 +0530
Subject: [PATCH 3/3] fix: changed relative paths

---
 packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx | 2 +-
 packages/core/src/components/Tabs/Tab/Tab.tsx                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx b/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx
index 1347ce358d..3b2ed35f39 100644
--- a/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx
+++ b/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx
@@ -12,7 +12,7 @@ import Text from "../../Text/Text";
 import Heading from "../../Heading/Heading";
 import Flex from "../../Flex/Flex";
 import styles from "./ModalHeader.module.scss";
-import { SubIcon } from "src/types";
+import { SubIcon } from "../../../types/SubIcon";
 
 export interface ModalHeaderProps extends VibeComponentProps {
   /**
diff --git a/packages/core/src/components/Tabs/Tab/Tab.tsx b/packages/core/src/components/Tabs/Tab/Tab.tsx
index b13d3ed7a8..adbf5a1283 100644
--- a/packages/core/src/components/Tabs/Tab/Tab.tsx
+++ b/packages/core/src/components/Tabs/Tab/Tab.tsx
@@ -9,7 +9,7 @@ import VibeComponentProps from "../../../types/VibeComponentProps";
 import { IconType } from "../../Icon/IconConstants";
 import { ComponentDefaultTestId, getTestId } from "../../../tests/test-ids-utils";
 import styles from "./Tab.module.scss";
-import { SubIcon } from "src/types";
+import { SubIcon } from "../../../types/SubIcon";
 
 export interface TabProps extends VibeComponentProps {
   /**