diff --git a/src/components/Expenses/ManageExpense.jsx b/src/components/Expenses/ManageExpense.jsx
index 11ea0999..d595421d 100644
--- a/src/components/Expenses/ManageExpense.jsx
+++ b/src/components/Expenses/ManageExpense.jsx
@@ -566,7 +566,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
? "Please Wait..."
: expenseToEdit
? "Update"
- : "Submit"}
+ : "Save as Draft"}
diff --git a/src/components/PaymentRequest/ManagePaymentRequest.jsx b/src/components/PaymentRequest/ManagePaymentRequest.jsx
index b740beef..14f911fa 100644
--- a/src/components/PaymentRequest/ManagePaymentRequest.jsx
+++ b/src/components/PaymentRequest/ManagePaymentRequest.jsx
@@ -564,7 +564,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
? "Please Wait..."
: requestToEdit
? "Update"
- : "Submit"}
+ : "Save as Draft"}
diff --git a/src/components/RecurringExpense/ManageRecurringExpense.jsx b/src/components/RecurringExpense/ManageRecurringExpense.jsx
index d0c87b58..4750c0cf 100644
--- a/src/components/RecurringExpense/ManageRecurringExpense.jsx
+++ b/src/components/RecurringExpense/ManageRecurringExpense.jsx
@@ -570,7 +570,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
? "Please wait...."
: requestToEdit
? "Update"
- : "Submit"}
+ : "Save as Draft"}
diff --git a/src/components/RecurringExpense/ViewRecurringExpense.jsx b/src/components/RecurringExpense/ViewRecurringExpense.jsx
index 1284c2ce..5c9d2baa 100644
--- a/src/components/RecurringExpense/ViewRecurringExpense.jsx
+++ b/src/components/RecurringExpense/ViewRecurringExpense.jsx
@@ -31,9 +31,8 @@ const ViewRecurringExpense = ({ RecurringId }) => {
{data?.recurringPaymentUID}
{data?.status?.name || "N/A"}
@@ -68,8 +67,8 @@ const ViewRecurringExpense = ({ RecurringId }) => {
{data?.amount != null
? `${data?.currency?.symbol ?? "¥"} ${Number(
- data.amount
- ).toFixed(2)} ${data?.currency?.currencyCode ?? "CN"}`
+ data.amount
+ ).toFixed(2)} ${data?.currency?.currencyCode ?? "CN"}`
: "N/A"}
@@ -83,7 +82,7 @@ const ViewRecurringExpense = ({ RecurringId }) => {
>
Project :
- {data?.project?.name || "N/A"}
+ {data?.project?.name || "N/A"}
@@ -117,7 +116,7 @@ const ViewRecurringExpense = ({ RecurringId }) => {
>
Title :
- {data?.title || "N/A"}
+ {data?.title || "N/A"}
@@ -131,7 +130,7 @@ const ViewRecurringExpense = ({ RecurringId }) => {
>
Payee :
- {data?.payee || "N/A"}
+ {data?.payee || "N/A"}
@@ -147,11 +146,11 @@ const ViewRecurringExpense = ({ RecurringId }) => {
{data?.notifyTo?.length > 0
? data.notifyTo?.map((user, index) => (
-
- {user.email}
- {index < data?.notifyTo?.length - 1 && ", "}
-
- ))
+
+ {user.email}
+ {index < data?.notifyTo?.length - 1 && ", "}
+
+ ))
: "N/A"}
@@ -220,7 +219,7 @@ const ViewRecurringExpense = ({ RecurringId }) => {
>
Updated At :
-
+
{data?.updatedAt
? formatUTCToLocalTime(data.updatedAt, true)
: "N/A"}
@@ -234,10 +233,12 @@ const ViewRecurringExpense = ({ RecurringId }) => {
className="form-label me-2 mb-0 fw-semibold text-start"
style={{ minWidth: "130px" }}
>
- Number of Iteration :
+ End Date :
-
- {data?.numberOfIteration || "N/A"}
+
+ {data?.endDate
+ ? formatUTCToLocalTime(data.endDate, true)
+ : "N/A"}
@@ -259,9 +260,8 @@ const ViewRecurringExpense = ({ RecurringId }) => {
lastName={data?.createdBy?.lastName}
/>
- {`${data?.createdBy?.firstName ?? ""} ${
- data?.createdBy?.lastName ?? ""
- }`.trim() || "N/A"}
+ {`${data?.createdBy?.firstName ?? ""} ${data?.createdBy?.lastName ?? ""
+ }`.trim() || "N/A"}
@@ -283,9 +283,8 @@ const ViewRecurringExpense = ({ RecurringId }) => {
lastName={data.updatedBy.lastName}
/>
- {`${data.updatedBy.firstName ?? ""} ${
- data.updatedBy.lastName ?? ""
- }`.trim() || "N/A"}
+ {`${data.updatedBy.firstName ?? ""} ${data.updatedBy.lastName ?? ""
+ }`.trim() || "N/A"}
>