From ca1a4da954541f966a54ab5a9e4b33a770e1dc85 Mon Sep 17 00:00:00 2001 From: =bhagwanSingh <=bhagwan.r@hicglobalsolutions.com> Date: Mon, 27 Oct 2025 12:25:48 +0530 Subject: [PATCH] 27-10 --- src/components/CommonNav.tsx | 46 +- src/components/ConfirmationModal.tsx | 45 ++ src/components/accounts/AccountNav.tsx | 3 +- src/components/accounts/DownloadDocument.tsx | 3 +- .../accounts/TransactionDataTable.tsx | 2 +- src/components/client/DocumentPages.tsx | 1 + src/components/client/SignDocument.tsx | 148 +++-- src/components/contacts/Contacts.tsx | 40 +- src/components/home/StartNow.tsx | 4 - .../process/processStepOne/ProcessStepOne.tsx | 9 + .../processStepTwo/DocumentContainer.tsx | 1 + .../process/processStepTwo/LeftSideBar.tsx | 6 +- src/components/setting/Setting.tsx | 9 +- .../setting/Signature/AddSignatureModal.tsx | 18 +- .../setting/Signature/DrawSignatureCanvas.tsx | 624 ++++++++++++------ .../setting/Signature/Signature.tsx | 51 +- src/components/signature/ClientSignCon.tsx | 82 ++- .../templates/TemplateDeleteWarnModal.tsx | 4 +- src/components/templates/TemplateTable.tsx | 11 +- src/components/templates/Templates.tsx | 6 +- src/utlity/getInitialUtils.ts | 12 + 21 files changed, 757 insertions(+), 368 deletions(-) create mode 100644 src/components/ConfirmationModal.tsx create mode 100644 src/utlity/getInitialUtils.ts diff --git a/src/components/CommonNav.tsx b/src/components/CommonNav.tsx index c75692d..887a094 100644 --- a/src/components/CommonNav.tsx +++ b/src/components/CommonNav.tsx @@ -6,6 +6,7 @@ import { IoSettings, IoSettingsOutline } from 'react-icons/io5'; import { useSelector } from 'react-redux'; import { RootState } from '../store/store'; import { GoBell } from 'react-icons/go'; +import getInitialsUtils from '../utlity/getInitialUtils'; interface AccountNavProps { accountName?: string | null; @@ -65,7 +66,7 @@ const CommonNav: React.FC = ({ const [hasModalBeenClosed, setHasModalBeenClosed] = useState(false); const dropdownRef = useRef(null); - const [initial, setInitial] = useState(""); + // const [initial, setInitial] = useState(""); const [user, setUser] = useState({ id: 0, @@ -86,13 +87,13 @@ const CommonNav: React.FC = ({ navigate("/s/settings#profile-info"); } - useEffect(() => { - if (initial != "") return - console.log(userDetailsAsync, 'line 89') - let initialN = (userDetailsAsync.firstName && userDetailsAsync.firstName[0]) - initialN = initialN + "" + (userDetailsAsync.lastName && userDetailsAsync.lastName[0]) - setInitial(initialN) - }, [userDetailsAsync]) + // useEffect(() => { + // if (initial != "") return + // console.log(userDetailsAsync, 'line 89') + // let initialN = (userDetailsAsync.firstName && userDetailsAsync.firstName[0]) + // initialN = initialN + "" + (userDetailsAsync.lastName && userDetailsAsync.lastName[0]) + // setInitial(initialN) + // }, [userDetailsAsync]) const getAccountDetails = async () => { try { @@ -153,11 +154,11 @@ const CommonNav: React.FC = ({ }, }); - if (account.firstName && account.lastName) { - setInitial((account?.firstName?.slice(0, 1)).toUpperCase() + "" + (account?.lastName?.slice(0, 1)).toUpperCase()) - } else { - setInitial((account?.name?.slice(0, 1)).toUpperCase()) - } + // if (account.firstName && account.lastName) { + // setInitial((account?.firstName?.slice(0, 1)).toUpperCase() + "" + (account?.lastName?.slice(0, 1)).toUpperCase()) + // } else { + // setInitial((account?.name?.slice(0, 1)).toUpperCase()) + // } sessionStorage.setItem('userDetails', JSON.stringify({ id: account.userId, @@ -198,11 +199,12 @@ const CommonNav: React.FC = ({ }; setUser(userData); - if (userData.firstName && userData.lastName) { - setInitial((userData?.firstName?.slice(0, 1)).toUpperCase() + "" + (userData?.lastName?.slice(0, 1)).toUpperCase()) - } else { - setInitial((userData?.name?.slice(0, 1)).toUpperCase()) - } + + // if (userData.firstName && userData.lastName) { + // setInitial((userData?.firstName?.slice(0, 1)).toUpperCase() + "" + (userData?.lastName?.slice(0, 1)).toUpperCase()) + // } else { + // setInitial((userData?.name?.slice(0, 1)).toUpperCase()) + // } sessionStorage.setItem('userDetails', JSON.stringify(userData)); sessionStorage.setItem('activeAccountId', JSON.stringify(userData.account.id)); @@ -405,8 +407,8 @@ const CommonNav: React.FC = ({ >
{user ? ( - - {initial} + + {getInitialsUtils((user.firstName ?? '') + (user.firstName && user.lastName ? ' ' : '') + (user.lastName ?? ''))} ) : ( @@ -420,8 +422,8 @@ const CommonNav: React.FC = ({
{user ? ( - - {initial} + + {getInitialsUtils((user.firstName ?? '') + (user.firstName && user.lastName ? ' ' : '') + (user.lastName ?? ''))} ) : ( diff --git a/src/components/ConfirmationModal.tsx b/src/components/ConfirmationModal.tsx new file mode 100644 index 0000000..57c2ce0 --- /dev/null +++ b/src/components/ConfirmationModal.tsx @@ -0,0 +1,45 @@ +type PropsType = { + setShowConfirmationModal: React.Dispatch<{ show: boolean, id: string }>; + onConfirm: () => void; + message: string; + title: string; + textColor: string; + hoverTextColor: string; + rejectBtnText: string; + confirmBtnText: string; +}; + +const ConfirmationModal = ({ setShowConfirmationModal, onConfirm, message, title, textColor, hoverTextColor, rejectBtnText, confirmBtnText }: PropsType) => { + + return ( +
+
+

{title}

+

+ {message} +

+
+ + +
+
+
+ ); +}; + +export default ConfirmationModal; diff --git a/src/components/accounts/AccountNav.tsx b/src/components/accounts/AccountNav.tsx index 8665970..8945fcf 100644 --- a/src/components/accounts/AccountNav.tsx +++ b/src/components/accounts/AccountNav.tsx @@ -2,6 +2,7 @@ import React, { useEffect, useRef, useState } from 'react'; import { Link, useLocation, useNavigate } from 'react-router-dom'; import { FaSignOutAlt, FaUser, FaBuilding, FaChevronDown, FaCheck } from "react-icons/fa"; import api from '../../config/api'; +import getInitialsUtils from '../../utlity/getInitialUtils'; interface AccountNavProps { accountName?: string | null; @@ -294,7 +295,7 @@ const AccountNav: React.FC = ({ accountName = null, transaction
{user ? ( - {(user?.name?.slice(0, 2)).toUpperCase()} + {(user?.name?.slice(0, 2)).toUpperCase()} ) : ( diff --git a/src/components/accounts/DownloadDocument.tsx b/src/components/accounts/DownloadDocument.tsx index 5b8ee86..e794c5e 100644 --- a/src/components/accounts/DownloadDocument.tsx +++ b/src/components/accounts/DownloadDocument.tsx @@ -20,6 +20,7 @@ const DownloadDocument: React.FC = ({ showMenu, setShowMenu const includeCertificate = formData.get('download-doc-type-include-cert'); downloadDocumentUtils(accountId, showMenu.transactionId as string, docType as string, includeCertificate as string | null) + setShowMenu({ open: false, transactionId: null }); } @@ -51,7 +52,7 @@ const DownloadDocument: React.FC = ({ showMenu, setShowMenu Certificate - +