diff --git a/src/App.tsx b/src/App.tsx index 91e1ca5..045023e 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -49,8 +49,8 @@ const App = () => { {/* } /> */} } /> {/* */} + } /> - {/* */} } /> diff --git a/src/components/accounts/Account.tsx b/src/components/accounts/Account.tsx index 3612665..8a6c996 100644 --- a/src/components/accounts/Account.tsx +++ b/src/components/accounts/Account.tsx @@ -213,10 +213,6 @@ const Account = () => { const navigate = useNavigate(); - const handleTransactionClick = (id: number) => { - navigate(`/accounts/${activeAccountId}/transactions/${id}`); - }; - const handleInvite = async (data: { i_accountName: number; email: string; role: string }) => { setInviteLoading(true); try { diff --git a/src/components/accounts/TransactionDataTable.tsx b/src/components/accounts/TransactionDataTable.tsx index 908909c..c5178fd 100644 --- a/src/components/accounts/TransactionDataTable.tsx +++ b/src/components/accounts/TransactionDataTable.tsx @@ -2,6 +2,8 @@ import React, { useEffect, useState } from 'react' import { PiDotsThreeOutlineVerticalFill } from 'react-icons/pi'; import api from '../../config/api'; import { Transaction } from '../transactions/Transactions'; +import { useNavigate } from 'react-router-dom'; +import { FaCheck } from 'react-icons/fa'; @@ -16,10 +18,12 @@ const TransactionDataTable = () => { JSON.parse(sessionStorage.getItem('activeAccountId') || 'null') ); + const navigate = useNavigate(); + const fetchTransactions = async () => { console.log("fetchTransactions") try { - const response = await api(`/api/accounts/${activeAccountId}/transactions`); + const response = await api.get(`/api/accounts/${activeAccountId}/transactions?sortBy=lastModifiedAt desc`); setTransactions(response.data || []); } catch (error) { console.error("Error fetching transactions:", error); @@ -28,6 +32,10 @@ const TransactionDataTable = () => { const [transactions, setTransactions] = useState([]); + const handleTransactionClick = (id: number) => { + navigate(`/accounts/${activeAccountId}/transactions/${id}`); + }; + useEffect(() => { if (activeAccountId) { fetchTransactions(); diff --git a/src/components/process/processStepOne/ProcessStepOne.tsx b/src/components/process/processStepOne/ProcessStepOne.tsx index 3150468..bdd1270 100644 --- a/src/components/process/processStepOne/ProcessStepOne.tsx +++ b/src/components/process/processStepOne/ProcessStepOne.tsx @@ -65,7 +65,7 @@ const ProcessStepOne = () => { console.log("selectedRecipients", selectedRecipients) useEffect(() => { -// <<<<<<< HEAD + // <<<<<<< HEAD // Fetching Transaction Details - START (async () => { try { @@ -75,18 +75,19 @@ const ProcessStepOne = () => { console.log("Error - transactions details") } })() - // Fetching Transaction Details - END + // Fetching Transaction Details - END -// ======= - // (async () => { - // const res = await api.get(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`) - // console.log(res.data); - // })() -// >>>>>>> origin/main - (async () => { - const res = await api.get(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`) - console.log(res.data); - })() + // ======= + // (async () => { + // const res = await api.get(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`) + // console.log(res.data); + // })() + // >>>>>>> origin/main + + // (async () => { + // const res = await api.get(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`) + // console.log(res.data); + // })() selectedRecipients.length === 0 && dispatch(fetchRecipients({ accountId, transactionId })); selectedDocuments.length === 0 && dispatch(fetchDocuments({ accountId, transactionId })); @@ -315,9 +316,9 @@ const ProcessStepOne = () => {

Add Recipient and Message

-
+
diff --git a/src/components/transactions/TransactionView.tsx b/src/components/transactions/TransactionView.tsx index 5ec0c86..b97dc0c 100644 --- a/src/components/transactions/TransactionView.tsx +++ b/src/components/transactions/TransactionView.tsx @@ -1,5 +1,5 @@ import { AiFillSignature } from 'react-icons/ai'; -import { Link, useParams } from 'react-router-dom'; +import { Link, useNavigate, useParams } from 'react-router-dom'; import { LuGitGraph } from 'react-icons/lu'; import AccountNav from '../accounts/AccountNav'; import { useEffect, useState } from 'react'; @@ -7,6 +7,8 @@ import api from '../../config/api'; import SigningOrderDiagram from '../../SigningOrderDiagram '; import { IoCloseOutline } from 'react-icons/io5'; import { MdEditDocument } from "react-icons/md"; +import { useSelector } from 'react-redux'; +import { RootState } from '../../store/store'; // Sample recipient data β€” you can replace this with actual API data later const recipients = [ @@ -30,8 +32,8 @@ const recipients = [ const TransactionView = () => { const { accountId, transactionId } = useParams<{ accountId: string, transactionId: string }>(); - console.log("account" , accountId , transactionId) - + + const navigate = useNavigate(); if (!accountId || !transactionId) { window.location.href = "/"; @@ -40,6 +42,8 @@ const TransactionView = () => { const [transactionDetails, setTransactionDetails] = useState(null); const [signingOrderModal, setSigningOrderModal] = useState({ open: false }); + const user = useSelector((state: RootState) => state.user) + console.log(transactionDetails, "line 37"); const fetchData = async () => { @@ -56,6 +60,11 @@ const TransactionView = () => { fetchData() }, [accountId, transactionId]) + + const handleNavigateToSign = (id: number) => { + window.open(`./../../../../sign/${id}`) + } + return ( <> {transactionDetails && @@ -64,17 +73,17 @@ const TransactionView = () => {
{/* Header */}

- Complete with Forms Made Easy: { transactionDetails?.transaction?.subject ?? "Untitled"} + Complete with Forms Made Easy: {transactionDetails?.transaction?.subject ?? "Untitled"}

{/* new Date(transactionDetails?.transaction?.lastModifiedAt * 1000) */} -

From Shanu.R

+

From {transactionDetails?.transaction.createdBy.firstName + " " + transactionDetails?.transaction.createdBy.lastName}

Last Change on {new Date(transactionDetails?.transaction?.lastModifiedAt * 1000).toISOString()}

Created at {new Date(transactionDetails?.transaction?.createdAt * 1000).toISOString()}

-

Draft

+

{transactionDetails?.transaction.status}

{/* Buttons */}
@@ -97,51 +106,66 @@ const TransactionView = () => {
{/* Recipients Section */} - {transactionDetails.recipients.length > 0 && -
-
-

Signers

-

setSigningOrderModal({ ...signingOrderModal, open: true })}> - - Signing Graph -

-
+ {transactionDetails.recipients.length > 0 && +
+
+

Signers

+

setSigningOrderModal({ ...signingOrderModal, open: true })}> + + Signing Graph +

+
- {/* Recipients List */} - {transactionDetails.recipients.map((recipient, index) => ( -
-
-
-

{recipient.id}

-
-

{recipient.name}

-

{recipient.email}

- {recipient.hostEmail !== null &&

Host: {recipient.hostEmail}

} + {/* Recipients List */} + {transactionDetails.recipients.map((recipient, index) => ( +
+
+
+ {/*

{index+1}

*/} +
+

{recipient.name}

+

{recipient.email}

+ {recipient.hostEmail !== null && recipient.hostEmail !== "" &&

Host: {recipient.hostEmail}

} +
-
- +
-
-
- ))} -
+ ))} +
} -
-

Message

-

{ transactionDetails?.transaction?.message ?? "No Message Found...!"}

-
+ {transactionDetails?.transaction?.subject !== "" && +
+

Subject

+

{`${transactionDetails?.transaction?.subject ? transactionDetails?.transaction?.subject : "Not Found"} `}

+
} + + {transactionDetails?.transaction?.message !== "" && +
+

Message

+

{`${transactionDetails?.transaction?.message ? transactionDetails?.transaction?.message : "Not Found"} `}

+
}
@@ -152,10 +176,10 @@ const TransactionView = () => {

- 1 of 10 - -

- + 1 of 10 + +

+
@@ -165,7 +189,7 @@ const TransactionView = () => {
- {signingOrderModal.open && + {signingOrderModal.open &&
diff --git a/src/utlity/JoyRideTour.tsx b/src/utlity/JoyRideTour.tsx index b582928..b564cc6 100644 --- a/src/utlity/JoyRideTour.tsx +++ b/src/utlity/JoyRideTour.tsx @@ -144,7 +144,7 @@ const JoyrideController = () => { target: "body", // This makes the welcome step show in center of screen content: (
-

πŸ‘‹ Welcome to SME, Let's Start the tour

+

πŸ‘‹ Hi there! Welcome to SME. Let’s start signing.

), placement: "center",