diff --git a/src/components/AddJob/AddJob.jsx b/src/components/AddJob/AddJob.jsx index 4715387..23e4339 100644 --- a/src/components/AddJob/AddJob.jsx +++ b/src/components/AddJob/AddJob.jsx @@ -162,7 +162,7 @@ function AddJob({ popUpHandler, categories }) {
- + diff --git a/src/components/AuthPages/UserProfile/ActivitiesTab.jsx b/src/components/AuthPages/UserProfile/ActivitiesTab.jsx index 4ba9f74..9d5c0cf 100644 --- a/src/components/AuthPages/UserProfile/ActivitiesTab.jsx +++ b/src/components/AuthPages/UserProfile/ActivitiesTab.jsx @@ -42,10 +42,10 @@ export default function ActivitiesTab({ className }) {
List Product Name Price
- + - + diff --git a/src/components/Cards/AvailableJobsCard.jsx b/src/components/Cards/AvailableJobsCard.jsx index 04523e7..7c334c8 100644 --- a/src/components/Cards/AvailableJobsCard.jsx +++ b/src/components/Cards/AvailableJobsCard.jsx @@ -175,7 +175,7 @@ export default function AvailableJobsCard({

{datas?.offer_depend_uid && } - Price: {thePrice} + Reward: {thePrice}

Duration:{" "} diff --git a/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx b/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx index 0251004..9efb785 100644 --- a/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx +++ b/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx @@ -74,7 +74,7 @@ export default function FamilyPending({ familyData }) {

{value.description}
- Price:{" "} + Reward:{" "} {thePrice} diff --git a/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx b/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx index 18bd917..b17a263 100644 --- a/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx +++ b/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx @@ -97,7 +97,7 @@ export default function FamilyNewTasks({
- Price:{" "} + Reward:{" "} {thePrice} diff --git a/src/components/FamilyAcc/Tabs/FamilyPending.jsx b/src/components/FamilyAcc/Tabs/FamilyPending.jsx index 71955eb..af42642 100644 --- a/src/components/FamilyAcc/Tabs/FamilyPending.jsx +++ b/src/components/FamilyAcc/Tabs/FamilyPending.jsx @@ -83,7 +83,7 @@ export default function FamilyPending({
{value.description}
- Price:{" "} + Reward:{" "} {thePrice} diff --git a/src/components/FamilyAcc/Tabs/FamilyTasks.jsx b/src/components/FamilyAcc/Tabs/FamilyTasks.jsx index 338f799..eba1473 100644 --- a/src/components/FamilyAcc/Tabs/FamilyTasks.jsx +++ b/src/components/FamilyAcc/Tabs/FamilyTasks.jsx @@ -87,7 +87,7 @@ export default function FamilyTasks({
- Price:{" "} + Reward:{" "} {thePrice} diff --git a/src/components/FamilyAcc/Tabs/wallet/FamilyAddFundPopout.jsx b/src/components/FamilyAcc/Tabs/wallet/FamilyAddFundPopout.jsx index 212b159..6370b07 100644 --- a/src/components/FamilyAcc/Tabs/wallet/FamilyAddFundPopout.jsx +++ b/src/components/FamilyAcc/Tabs/wallet/FamilyAddFundPopout.jsx @@ -1,17 +1,16 @@ -import React, { useEffect, useState } from "react"; -import ModalCom from "../../../Helpers/ModalCom"; -import InputCom from "../../../Helpers/Inputs/InputCom"; import { Form, Formik } from "formik"; +import React, { useEffect, useState } from "react"; import * as Yup from "yup"; +import InputCom from "../../../Helpers/Inputs/InputCom"; +import ModalCom from "../../../Helpers/ModalCom"; -import { AmountTo2DP } from "../../../Helpers/PriceFormatter"; -import usersService from "../../../../services/UsersService"; -import LoadingSpinner from "../../../Spinners/LoadingSpinner"; -import { PriceFormatter } from "../../../Helpers/PriceFormatter"; -import { tableReload } from "../../../../store/TableReloads"; import { useDispatch, useSelector } from "react-redux"; import { apiConst } from "../../../../lib/apiConst"; +import usersService from "../../../../services/UsersService"; +import { tableReload } from "../../../../store/TableReloads"; import { SocketValues } from "../../../Contexts/SocketIOContext"; +import { AmountTo2DP } from "../../../Helpers/PriceFormatter"; +import LoadingSpinner from "../../../Spinners/LoadingSpinner"; const validationSchema = Yup.object().shape({ // amount: Yup.string() @@ -31,10 +30,9 @@ const validationSchema = Yup.object().shape({ }); function FamilyAddFundPopout({ action, situation, wallet, familyData }) { + const { userDetails } = useSelector((state) => state?.userDetails); // Gets User Detail - const {userDetails} = useSelector((state) => state?.userDetails); // Gets User Detail - - const { parentAssignJobToKid } = SocketValues() // socket emit event from FULL account + const { parentAssignJobToKid } = SocketValues(); // socket emit event from FULL account const dispatch = useDispatch(); @@ -60,7 +58,6 @@ function FamilyAddFundPopout({ action, situation, wallet, familyData }) { }; // FUNCTION TO PERFORM FAMILY TRANSFER const handleAddFund = (values) => { - setRequestStatus({ loading: true, status: false, message: "" }); let senderBal = startTransfer?.data?.origing_current_balance || ""; // SENDER'S ACCOUNT BALANCE @@ -143,12 +140,12 @@ function FamilyAddFundPopout({ action, situation, wallet, familyData }) { //SENDS MESSAGE TO SOCKET TO UPDATE CHILD ACCOUNT // message, room let socketMsg = { - "audience": "MEMBER", - "action": "REFRESH_WALLET", - "family_uid": reqData.family_uid, - } - let socketRoom = `FAMILY-${userDetails.uid}` - parentAssignJobToKid(socketMsg, socketRoom) //SENDS MESSAGE TO SOCKET TO UPDATE CHILD ACCOUNT + audience: "MEMBER", + action: "REFRESH_WALLET", + family_uid: reqData.family_uid, + }; + let socketRoom = `FAMILY-${userDetails.uid}`; + parentAssignJobToKid(socketMsg, socketRoom); //SENDS MESSAGE TO SOCKET TO UPDATE CHILD ACCOUNT setTimeout(() => { setRequestStatus({ loading: false, status: false, message: "" }); @@ -189,14 +186,8 @@ function FamilyAddFundPopout({ action, situation, wallet, familyData }) {
-

- Add Fund -

-
List Product NamePriceReward Quantity From To