From bedc1619e68c5ed9c1c1f30763c2f477fd2464a6 Mon Sep 17 00:00:00 2001
From: Tharun T <tharun242424@gmail.com>
Date: Fri, 31 May 2024 20:55:11 +0530
Subject: [PATCH 1/3] fix: package.json module field

- typo has been replaced by correct file name

Signed-off-by: Tharun T <tharun242424@gmail.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7c0599ad2..a40c49967 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "url": "git+ssh://git@github.com/layer5io/sistent.git"
   },
   "main": "./dist/index.js",
-  "module": "./dist/index..js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
     "dist"

From 22cb308bb07368a0893a40bd794c70034ddca3f9 Mon Sep 17 00:00:00 2001
From: aabidsofi19 <mailtoaabid01@gmail.com>
Date: Mon, 3 Jun 2024 22:12:53 +0530
Subject: [PATCH 2/3] feat: enhance stepper

Signed-off-by: aabidsofi19 <mailtoaabid01@gmail.com>
---
 src/custom/Stepper/index.tsx | 22 ++++++++++++++++------
 src/icons/Add/AddIcon.tsx    |  3 +--
 src/theme/index.tsx          |  4 ++++
 src/theme/theme.ts           | 24 ------------------------
 4 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/src/custom/Stepper/index.tsx b/src/custom/Stepper/index.tsx
index 3ecaa8440..f49b99dba 100644
--- a/src/custom/Stepper/index.tsx
+++ b/src/custom/Stepper/index.tsx
@@ -1,8 +1,9 @@
-import { Box, IconProps, Stack, Step, StepConnector, StepLabel, Stepper } from '@mui/material';
+import { Box, Stack, Step, StepConnector, StepLabel, Stepper, useTheme } from '@mui/material';
 import { stepConnectorClasses } from '@mui/material/StepConnector';
 import { StepIconProps } from '@mui/material/StepIcon';
 import { styled } from '@mui/system';
 import React, { useMemo, useState } from 'react';
+import { IconProps } from '../../icons/types';
 
 interface ColorlibStepIconPropsI extends StepIconProps {
   icons: React.ComponentType<IconProps>[];
@@ -23,6 +24,7 @@ interface CustomizedStepperPropsI {
   stepLabels: string[];
   children: React.ReactNode;
   icons: React.ComponentType<IconProps>[];
+  ContentWrapper?: React.ComponentType;
 }
 
 interface UseStepperI {
@@ -100,9 +102,10 @@ function ColorlibStepIcon(props: ColorlibStepIconPropsI) {
   const { active, completed, className, icons } = props;
 
   const Icon = icons[Number(props.icon) - 1];
+  const theme = useTheme();
   return (
     <ColorlibStepIconRoot ownerState={{ completed, active }} className={className}>
-      {Icon ? <Icon /> : null}
+      {Icon ? <Icon fill={theme.palette.icon.secondary} /> : null}
     </ColorlibStepIconRoot>
   );
 }
@@ -111,11 +114,18 @@ const CustomizedStepper: React.FC<CustomizedStepperPropsI> = ({
   stepLabels,
   activeStep,
   children,
-  icons
+  icons,
+  ContentWrapper = StepContentWrapper
 }) => {
+  const theme = useTheme();
+
   return (
-    <Stack spacing={2}>
-      <Stack direction="row" justifyContent="center">
+    <Stack>
+      <Stack
+        direction="row"
+        justifyContent="center"
+        style={{ paddingBlock: '1rem', backgroundColor: theme.palette.background.blur?.heavy }}
+      >
         <Stepper alternativeLabel activeStep={activeStep} connector={<ColorlibConnector />}>
           {stepLabels.map((label) => (
             <Step key={label}>
@@ -128,7 +138,7 @@ const CustomizedStepper: React.FC<CustomizedStepperPropsI> = ({
           ))}
         </Stepper>
       </Stack>
-      <StepContentWrapper>{children}</StepContentWrapper>
+      <ContentWrapper>{children}</ContentWrapper>
     </Stack>
   );
 };
diff --git a/src/icons/Add/AddIcon.tsx b/src/icons/Add/AddIcon.tsx
index b2524af8c..563551257 100644
--- a/src/icons/Add/AddIcon.tsx
+++ b/src/icons/Add/AddIcon.tsx
@@ -16,8 +16,7 @@ export const AddIcon = ({
       data-testid="add-icon-svg"
       {...props}
     >
-      <path d="M0 0h24v24H0z" fill={fill} />
-      <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+      <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" fill={fill} />
     </svg>
   );
 };
diff --git a/src/theme/index.tsx b/src/theme/index.tsx
index 975bb88e0..e054fbd42 100644
--- a/src/theme/index.tsx
+++ b/src/theme/index.tsx
@@ -1,3 +1,5 @@
+import { styled, useTheme } from '@mui/material';
+
 export { darkModePalette, lightModePalette } from './palette';
 export { typography } from './typography';
 
@@ -6,3 +8,5 @@ export {
   SistentThemeProviderWithoutBaseLine
 } from './ThemeProvider';
 export * from './colors';
+
+export { styled, useTheme };
diff --git a/src/theme/theme.ts b/src/theme/theme.ts
index 369afbfac..76b6dfdd6 100644
--- a/src/theme/theme.ts
+++ b/src/theme/theme.ts
@@ -16,27 +16,3 @@ export const createCustomTheme = (mode: PaletteMode) => {
     breakpoints: {}
   });
 };
-
-/*
-  const commonPalette = {
-    palette: {
-      paletteType,
-      ...(paletteType === 'light' ? lightModePalette : darkModePalette)
-    }
-  };
-
-
-  const palette =
-    paletteType === 'dark'
-      ? {
-          mode: 'dark',
-          ...commonPalette,
-          text: {
-            main: '#FFFFFF'
-          }
-        }
-      : {
-          mode: 'light',
-          ...commonPalette
-        };
-        */

From 7df7161c71d63bb6c3128493d0d2765a11e3caa8 Mon Sep 17 00:00:00 2001
From: aabidsofi19 <65964225+aabidsofi19@users.noreply.github.com>
Date: Tue, 4 Jun 2024 17:08:21 +0530
Subject: [PATCH 3/3] Revert "Fix: package.json module field"

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a40c49967..7c0599ad2 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "url": "git+ssh://git@github.com/layer5io/sistent.git"
   },
   "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "module": "./dist/index..js",
   "types": "./dist/index.d.ts",
   "files": [
     "dist"