diff --git a/src/components/client/SignDocument.tsx b/src/components/client/SignDocument.tsx index 6fe79ac..a8a02e2 100644 --- a/src/components/client/SignDocument.tsx +++ b/src/components/client/SignDocument.tsx @@ -689,6 +689,11 @@ const SignDocument = () => { isDeleted: false } + if(prepData.type === "NAME") { + prepData.firstName = true + prepData.lastName = true + } + if ("group" in dragElemData) { prepData.group = dragElemData.group; prepData.isGroupExist = false; @@ -931,7 +936,7 @@ const SignDocument = () => { })() }; - + console.log(droppedItems, "droppedItems Line 934") // const [showTerms, setShowTerms] = useState(true); @@ -1260,9 +1265,11 @@ const SignDocument = () => { e.currentTarget.focus(); // Optional: return focus if invalid } }} - contentEditable={true} + // contentEditable={true} className="outline-none whitespace-nowrap w-full max-h-max" - >

+ > + {recipient?.email || ""} +

} } @@ -1294,9 +1301,14 @@ const SignDocument = () => { onBlur={(e) => { }} - contentEditable={true} + // contentEditable={true} className="outline-none whitespace-nowrap w-full max-h-max" - >

+ > + {item.firstName && recipient?.firstName+" " } + {item.lastName && recipient?.lastName } + + +

} } diff --git a/src/components/process/processStepTwo/NavTwo.tsx b/src/components/process/processStepTwo/NavTwo.tsx index e500160..2845fd0 100644 --- a/src/components/process/processStepTwo/NavTwo.tsx +++ b/src/components/process/processStepTwo/NavTwo.tsx @@ -126,10 +126,10 @@ const NavTwo: React.FC = ({ transactionSaving, isFields, setIsField setTimeout(() => { if (transactionTemplateToggle === TRANSACTION_TEMPLATE_TOGGLE.TRANSACTIONS) { if (isSignSend) { - // navigate(`./../../../sign/${selfUserSign.recipientId}`,{ replace: true }); + navigate(`./../../../sign/${selfUserSign.recipientId}`,{ replace: true }); } else { - // navigate(`/document-completion-screen/${accountId}/${transactionId}`, { replace: true }) + navigate(`/document-completion-screen/${accountId}/${transactionId}`, { replace: true }) } } else { navigate(`/templates`); diff --git a/src/components/transactions/AuditModal.tsx b/src/components/transactions/AuditModal.tsx index fd893fb..2317b98 100644 --- a/src/components/transactions/AuditModal.tsx +++ b/src/components/transactions/AuditModal.tsx @@ -50,6 +50,7 @@ const AuditModal: React.FC = ({ closeModal }) => { setLoading(true) try { let res = await api.get(`/api/accounts/${accountId}/transactions/${transactionId}/audit?lang=${userDetails.language || ''}`) + // let res = await api.get(`/api/accounts/${accountId}/transactions/${transactionId}/audit?lang=hi`) if (res?.status === 200) { // console.log(res?.data?.events) let auditResponse = res?.data?.events diff --git a/src/store/slices/selectedRecipientsSlice.tsx b/src/store/slices/selectedRecipientsSlice.tsx index e1a0957..1853be1 100644 --- a/src/store/slices/selectedRecipientsSlice.tsx +++ b/src/store/slices/selectedRecipientsSlice.tsx @@ -465,8 +465,12 @@ export const fetchRecipients = createAsyncThunk< const basePath = `/api/accounts/${accountId}/${toggle}/${transactionId}/recipients`; const response = await api.get(basePath); - const data = response.data as Recipient[]; + let data = response.data as Recipient[]; + data = data.filter((recipient, indx) => { + return recipient.type !== "CC"; + }) + if (data.length === 0 && window.location.pathname.includes('/process-step-two')) { window.location.href = window.location.href.replace("process-step-two", "process-step-one") // ✅ navigate using window }