diff --git a/src/components/History/JobsCompleted.jsx b/src/components/History/JobsCompleted.jsx
index d060491..b56118f 100644
--- a/src/components/History/JobsCompleted.jsx
+++ b/src/components/History/JobsCompleted.jsx
@@ -7,7 +7,8 @@ import PaginatedList from '../../components/Pagination/PaginatedList';
import LoadingSpinner from '../Spinners/LoadingSpinner';
-import { AmountTo2DP } from '../Helpers/PriceFormatter';
+import { AmountTo2DP, PriceFormatter } from '../Helpers/PriceFormatter';
+import {NewDateTimeFormatter} from '../../lib/NewDateTimeFormatter'
function JobsCompleted() {
@@ -47,7 +48,7 @@ function JobsCompleted() {
}, [])
return (
-
+
{jobHistory?.loading ?
: jobHistory?.data?.length ?
@@ -71,10 +72,12 @@ function JobsCompleted() {
{item?.title}
{item?.description}
+
{NewDateTimeFormatter(item?.delivery_date)}
-
{AmountTo2DP(item?.price*0.01)} {item?.currency} |
+
{AmountTo2DP(item?.price*0.01)} {item?.currency_code} |
+ {/*
{PriceFormatter(item?.price*0.01, item?.currency_code)} | */}
{/*
{date} |
{item?.contract} | */}
diff --git a/src/components/History/RewardsTable.jsx b/src/components/History/RewardsTable.jsx
index dc9f55c..d9aed8f 100644
--- a/src/components/History/RewardsTable.jsx
+++ b/src/components/History/RewardsTable.jsx
@@ -47,7 +47,7 @@ export const RewardsTable = memo(() => {
}, [])
return (
-
+
{familyRewardHistory.loading ?
: familyRewardHistory.data.length ?
@@ -65,10 +65,10 @@ export const RewardsTable = memo(() => {
let date = new Date(item.added).toLocaleDateString()
return (
-
-
+
+

-
+
Reward to {item.rec_firstname} {item.rec_lastname}
{item.description}
diff --git a/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx b/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx
index 11b1e15..ccf84e8 100644
--- a/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx
+++ b/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx
@@ -12,7 +12,7 @@ function CurrentTaskAction({jobDetails}) {
const currTime = new Date().getTime() / (1000*60*60)
const minDueTime = new Date(jobDetails?.minimum_due).getTime() / (1000*60*60)
- const canSendForReview = jobDetails.strict_timeline ? currTime >= minDueTime : true // calculation to determine when send for review button will be active
+ const canSendForReview = Number(jobDetails.strict_timeline) ? currTime >= minDueTime : true // calculation to determine when send for review button will be active
const apiCall = new usersService()
const navigate = useNavigate()
diff --git a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx
index 4f49df8..3bfd6aa 100644
--- a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx
+++ b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx
@@ -15,7 +15,7 @@ function PurchasesTable({purchase}) {
}
return (
-
+
{purchase.data.length ?
diff --git a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx
index 631b282..c8ea4dd 100644
--- a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx
+++ b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx
@@ -18,7 +18,7 @@ function RecentActivityTable({ payment }) {
};
return (
-
+
{payment?.data?.length > 0 ?
diff --git a/src/components/jobPopout/PendingJobsPopout.jsx b/src/components/jobPopout/PendingJobsPopout.jsx
index 2def195..61bbb0c 100644
--- a/src/components/jobPopout/PendingJobsPopout.jsx
+++ b/src/components/jobPopout/PendingJobsPopout.jsx
@@ -5,6 +5,7 @@ import usersService from "../../services/UsersService";
import ModalCom from "../Helpers/ModalCom";
import LoadingSpinner from "../Spinners/LoadingSpinner";
import Detail from "./popoutcomponent/Detail";
+import {PriceFormatter} from '../Helpers/PriceFormatter'
import { useDispatch } from "react-redux";
import { NewDateTimeFormatter } from "../../lib/NewDateTimeFormatter";
| |