Merge branch 'dev-rohit' of http://git.wdipl.com/Siddhesh.More/SSA-Admin-Panel into testing

src/Layouts/DefaultLayout.tsx

@@ -78,8 +78,8 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => {
             <HStack cursor={'pointer'} onClick={() => navigate('/profile')} >
               <Avatar size={'sm'} src="https://i.pinimg.com/736x/d6/cd/0f/d6cd0ffd4634b0763d3958a7325ce26e.jpg" />
               <VStack color={'#013e3e'} gap={0} alignItems={'flex-start'}>
-                <Text fontSize={'sm'} fontWeight={'bold'}>{`${data?.data?.first_name.charAt(0).toUpperCase()}${data?.data.first_name.slice(1)}`}</Text>
-                <Text fontSize={'xs'} >{data?.data?.phone_number}</Text>
+                <Text fontSize={'sm'} fontWeight={'bold'}>{data?.data?.first_name ? `${data?.data?.first_name.charAt(0).toUpperCase()}${data?.data.first_name.slice(1)}` : ''}</Text>
+                <Text fontSize={'xs'} >{data?.data?.phone_number ? data?.data?.phone_number : ''}</Text>
               </VStack>
             </HStack>
           </HStack>

src/Pages/ManageJobs/ManageJobs.tsx

@@ -20,7 +20,7 @@ import {
 import { useEffect, useState } from "react";
 import { Spinner } from "../../components/Sipnner/Spinner";
 import Delete from "../../components/ActionIcons/Delete";
-import { toaster } from "../../components/ui/toaster";
+import { Toaster, toaster } from "../../components/ui/toaster";
 import AlertDailog from "../../components/AlertDailog";
 import { useDebounce } from "../../components/Hooks/useDebounce";
 import SearchComponent from "../../components/SearchComponent";
@@ -177,6 +177,7 @@ const ManageJobs = () => {
           isError={isError}
         />
       </Box>
+      <Toaster />
     </MainFrame>
   );
 };

src/Pages/MasterModule/WorkspaceMode/WorkAddModel.tsx

@@ -2,7 +2,7 @@ import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHead
 import { Field, Input, Stack, Text } from "@chakra-ui/react"
 import { IoMdAdd } from "react-icons/io"
 import { Button } from "../../../components/ui/button"
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { useCreateWorkspacePostMutation } from "../../../Redux/Service/workspace.mode";
 import { Toaster, toaster } from "../../../components/ui/toaster";
 
@@ -40,6 +40,12 @@ function WorkAddModel({ refetch }: { refetch: VoidFunction }) {
         }
     };
 
+    useEffect(() => {
+        if (!isOpen) {
+            setTitle("");
+        }
+    }, [isOpen]);
+
     return (
 
         <DialogRoot placement="center" open={isOpen}>

src/Pages/Profile/ChangePassword.tsx

@@ -1,7 +1,7 @@
 
 import { DialogCloseTrigger, Field, IconButton, Input, Stack, Text } from "@chakra-ui/react";
 import { Button } from "../../components/ui/button";
-import { DialogBody, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../components/ui/dialog";
+import { DialogBody, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle } from "../../components/ui/dialog";
 // import EnterPassword from "./EnterPassword";
 import { useForm } from "react-hook-form";
 import { useEffect, useState } from "react";
@@ -114,11 +114,11 @@ function Changepassword({ onClose, isOpen }: EnterPasswordProps) {
                 onOpenChange={(open) => !open && onClose()}
             >
 
-                <DialogTrigger asChild>
+                {/* <DialogTrigger asChild>
                     <Button bg="#02A0A0" size={'2xs'} color={"#fff"} px={2}  >
                         Change Password
                     </Button>
-                </DialogTrigger>
+                </DialogTrigger> */}
 
                 <DialogContent
                     bg={"#fff"}
@@ -203,7 +203,7 @@ function Changepassword({ onClose, isOpen }: EnterPasswordProps) {
                                             pl={1}
                                             fontSize="12px"
                                             height="30px"
-                                            type= {showNewPassword ? "password" : "Text"}
+                                            type= {showNewPassword ? "text" : "password"}
                                             border={errors.confirm_password ? "1px solid red" : "1px solid grey"}
                                             {...register("confirm_password", {
                                                 required: "Please confirm your password",

src/components/ui/dialog.tsx

@@ -44,7 +44,7 @@ export const DialogCloseTrigger = React.forwardRef<
       {...props}
       asChild
     >
-      <CloseButton size="sm" ref={ref}>
+      <CloseButton size="sm" ref={ref} _hover={{ color: "gray.200" }}>
         {props.children}
       </CloseButton>
     </ChakraDialog.CloseTrigger>