Merge pull request #156 from suvarnakale/release-1.0.0

Issue #PS-0000 chore: compilation error fixed and buttons fixed
tekdi · Aug 16, 2024 · adc15d6 · adc15d6
2 parents 28472bb + 8efd733
commit adc15d6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/components/FormButtons.tsx b/src/components/FormButtons.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 
 interface IFormButtons {
   formData: any;
-  onClick: (formData: any) => void; 
+  onClick: (formData: any) => void;
   isCreateCentered?: boolean;
   isCreatedFacilitator?: boolean;
   isCreatedLearner?: boolean;
@@ -26,7 +26,7 @@ const FormButtons: React.FC<IFormButtons> = ({
   const buttonText = isSingleButton
     ? t('COMMON.SAVE')
     : (isCreateCentered && !isCreatedFacilitator && !isCreatedLearner) ||
-      (isCreatedLearner && !isCreatedFacilitator && !isCreateCentered)
+        (isCreatedLearner && !isCreatedFacilitator && !isCreateCentered)
       ? t('COMMON.CREATE')
       : t('GUIDE_TOUR.NEXT');
 
@@ -75,7 +75,10 @@ const FormButtons: React.FC<IFormButtons> = ({
             height: '2.5rem',
             padding: theme.spacing(1),
             fontWeight: '500',
-            width: '100%',
+            width:
+              !isSingleButton && !isCreateCentered && !isCreatedFacilitator
+                ? '50%'
+                : '100%',
           }}
           type="submit"
           onClick={() => onClick(formData)}

diff --git a/src/components/Header.tsx b/src/components/Header.tsx
@@ -16,6 +16,7 @@ import menuIcon from '../assets/images/menuIcon.svg';
 import { useTheme } from '@mui/material/styles';
 import { useTranslation } from 'next-i18next';
 import StyledMenu from './StyledMenu';
+import MenuDrawer from './MenuDrawer';
 
 interface HeaderProps {
   toggleDrawer?: (newOpen: boolean) => () => void;
@@ -43,7 +44,7 @@ const Header: React.FC<HeaderProps> = ({ toggleDrawer, openDrawer }) => {
       logEvent({
         action: 'my-profile-clicked-header',
         category: 'Dashboard',
-        label: 'Profile Clicked'
+        label: 'Profile Clicked',
       });
     }
   };
@@ -54,7 +55,6 @@ const Header: React.FC<HeaderProps> = ({ toggleDrawer, openDrawer }) => {
       action: 'logout-clicked-header',
       category: 'Dashboard',
       label: 'Logout Clicked',
-
     });
   };
 
@@ -73,9 +73,9 @@ const Header: React.FC<HeaderProps> = ({ toggleDrawer, openDrawer }) => {
   const handleToggleDrawer = (newOpen: boolean) => () => {
     setOpenMenu(newOpen);
   };
-  const MenuDrawer = dynamic(() => import('./MenuDrawer'), {
-    ssr: false,
-  });
+  // const MenuDrawer = dynamic(() => import('./MenuDrawer'), {
+  //   ssr: false,
+  // });
 
   const [selectedLanguage, setSelectedLanguage] = useState('en');
   useEffect(() => {
@@ -141,7 +141,6 @@ const Header: React.FC<HeaderProps> = ({ toggleDrawer, openDrawer }) => {
           <Box
             onClick={() => {
               if (openDrawer) {
-
                 if (toggleDrawer) {
                   toggleDrawer(true)();
                 }
@@ -246,8 +245,8 @@ const Header: React.FC<HeaderProps> = ({ toggleDrawer, openDrawer }) => {
       />
 
       <MenuDrawer
-        toggleDrawer={ openDrawer ? toggleDrawer : handleToggleDrawer}
-        open={openDrawer? openDrawer: openMenu}
+        toggleDrawer={openDrawer ? toggleDrawer : handleToggleDrawer}
+        open={openDrawer ? openDrawer : openMenu}
         language={language}
         setLanguage={setLanguage}
       />