diff --git a/src/components/dashboard/Dashboard.tsx b/src/components/dashboard/Dashboard.tsx index d9e2339..0549225 100644 --- a/src/components/dashboard/Dashboard.tsx +++ b/src/components/dashboard/Dashboard.tsx @@ -137,7 +137,7 @@ function Dashboard() { {/* Close Icon */} + + + + + + ); +}; + +export default CloseConfirmationModal; \ No newline at end of file diff --git a/src/components/process/processStepTwo/NavTwo.tsx b/src/components/process/processStepTwo/NavTwo.tsx index f820529..29ca7fb 100644 --- a/src/components/process/processStepTwo/NavTwo.tsx +++ b/src/components/process/processStepTwo/NavTwo.tsx @@ -3,10 +3,10 @@ import React, { useEffect, useState } from 'react' import { useDispatch, useSelector } from 'react-redux' import { RootState } from '../../../store/store' -import { FaCheck, FaPaste, FaRegCopy, FaSave, FaSignature } from 'react-icons/fa' -import { IoIosDocument } from 'react-icons/io' +import { FaAngleRight, FaCheck, FaChevronRight, FaPaste, FaRegCopy, FaSave, FaSignature } from 'react-icons/fa' +import { IoIosDocument, IoMdArrowRoundBack, IoMdHome } from 'react-icons/io' import { LuRedo2, LuTableOfContents, LuUndo2 } from 'react-icons/lu' -import { MdKeyboardArrowDown } from 'react-icons/md' +import { MdKeyboardArrowDown, MdOutlineKeyboardBackspace } from 'react-icons/md' import { RiResetRightLine } from 'react-icons/ri' import { fetchRecipients, recipientType, toggleToTemplates, TRANSACTION_TEMPLATE_TOGGLE } from '../../../store/slices/selectedRecipientsSlice' import { fetchDocuments } from '../../../store/slices/documentSlice' @@ -15,9 +15,11 @@ import { Bounce, toast } from 'react-toastify' import { FiChevronDown } from 'react-icons/fi' import RecipientsCon from '../processStepOne/RecipientsCon' import MessageCon from '../processStepOne/MessageCon' -import { IoCopy } from 'react-icons/io5' +import { IoArrowBackSharp, IoCopy } from 'react-icons/io5' import { FaRegPaste } from 'react-icons/fa6' import ConfirmSendModal from './TransactionSendConfirmationModal' +import { RxDividerVertical } from 'react-icons/rx' +import CloseConfirmationModal from './CloseCofirmationModal' interface NavTwoProps { transactionSaving?: boolean; @@ -108,6 +110,8 @@ const NavTwo: React.FC = ({ // const [transactionSaving, setTransactionSaving] = useState(false); const [dotCount, setDotCount] = useState(0); + const [closePage, setClosePage] = useState(false); + const [isFitDd, setIsFitDd] = useState(false) const [selFitIndx, setSelFitIndx] = useState(0); const [selfUserSign, setSelfUserSign] = useState({ sign: false, recipientId: 0 }); @@ -240,6 +244,12 @@ const NavTwo: React.FC = ({ return ( <> + {closePage && setClosePage(false)} // Cancel not closing + onConfirm={() => navigate("/")} + />} + { setConfirmSendModalOpen({ open: false, confirm: false, loading: false }) }} @@ -261,11 +271,36 @@ const NavTwo: React.FC = ({ */} - {/*
- - Sign Made Easy - -
*/} +
+
+ + +
+ +
+ + +
+ + +

Add Fields

+
+