From 9a3fa2a4a41ad74fadc4da727c8ae1a90ccc1c47 Mon Sep 17 00:00:00 2001 From: Ebube Date: Sun, 18 Jun 2023 23:06:16 +0100 Subject: [PATCH 1/2] added fix --- src/components/Referral/Index.jsx | 12 ++-- src/components/Referral/ReferralDisplay.jsx | 66 ++++++++++----------- src/views/ReferralPage.jsx | 10 ++-- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/components/Referral/Index.jsx b/src/components/Referral/Index.jsx index c162b16..08af400 100644 --- a/src/components/Referral/Index.jsx +++ b/src/components/Referral/Index.jsx @@ -1,13 +1,13 @@ -import React from 'react' -import Layout from '../Partials/Layout' -import ReferralDisplay from './ReferralDisplay' +import React from "react"; +import Layout from "../Partials/Layout"; +import ReferralDisplay from "./ReferralDisplay"; function Referral() { return ( - + - ) + ); } -export default Referral \ No newline at end of file +export default Referral; diff --git a/src/components/Referral/ReferralDisplay.jsx b/src/components/Referral/ReferralDisplay.jsx index d5b1a89..69c415f 100644 --- a/src/components/Referral/ReferralDisplay.jsx +++ b/src/components/Referral/ReferralDisplay.jsx @@ -10,25 +10,25 @@ import * as Yup from "yup"; import ReferralTable from "../MyWallet/WalletComponent/ReferralTable"; const validationSchema = Yup.object().shape({ - email: Yup.string() + ref_email: Yup.string() .email("Wrong email format") .min(3, "Minimum 3 characters") .max(50, "Maximum 50 characters") .required("Email is required"), - firstname: Yup.string() + ref_firstname: Yup.string() .min(3, "Minimum 3 characters") .max(25, "Maximum 25 characters") .required("Firstname is required"), - lastname: Yup.string() + ref_lastname: Yup.string() .min(3, "Minimum 3 characters") .max(25, "Maximum 25 characters") .required("Lastname is required"), }); const initialValues = { - firstname: "", - lastname: "", - email: "", + ref_firstname: "", + ref_lastname: "", + ref_email: "", }; function ReferralDisplay() { @@ -121,12 +121,9 @@ function ReferralDisplay() {

- - Refer a Friend - + Refer a Friend

-
@@ -147,17 +144,18 @@ function ReferralDisplay() { fieldClass="px-6" label="Firstname" type="text" - name="firstname" + name="ref_firstname" placeholder="Firstname" - value={props.values.firstname} + value={props.values.ref_firstname} inputHandler={props.handleChange} blurHandler={props.handleBlur} /> - {props.errors.firstname && props.touched.firstname && ( -

- {props.errors.firstname} -

- )} + {props.errors.ref_firstname && + props.touched.ref_firstname && ( +

+ {props.errors.ref_firstname} +

+ )}
{/* Lastname */} @@ -166,17 +164,18 @@ function ReferralDisplay() { fieldClass="px-6" label="Lastname" type="text" - name="lastname" + name="ref_lastname" placeholder="Lastname" - value={props.values.lastname} + value={props.values.ref_lastname} inputHandler={props.handleChange} blurHandler={props.handleBlur} /> - {props.errors.lastname && props.touched.lastname && ( -

- {props.errors.lastname} -

- )} + {props.errors.ref_lastname && + props.touched.ref_lastname && ( +

+ {props.errors.ref_lastname} +

+ )} @@ -185,14 +184,16 @@ function ReferralDisplay() { fieldClass="px-6" label="Email" type="text" - name="email" + name="ref_email" placeholder="Email" - value={props.values.email} + value={props.values.ref_email} inputHandler={props.handleChange} blurHandler={props.handleBlur} /> - {props.errors.email && props.touched.email && ( -

{props.errors.email}

+ {props.errors.ref_email && props.touched.ref_email && ( +

+ {props.errors.ref_email} +

)} @@ -206,7 +207,8 @@ function ReferralDisplay() { ) : ( )} @@ -221,14 +223,12 @@ function ReferralDisplay() { Referral List {referralList.loading ? ( - + ) : ( - + )} - - ); } diff --git a/src/views/ReferralPage.jsx b/src/views/ReferralPage.jsx index 8247e86..1430548 100644 --- a/src/views/ReferralPage.jsx +++ b/src/views/ReferralPage.jsx @@ -1,12 +1,12 @@ -import React from 'react' -import Referral from '../components/Referral/Index' +import React from "react"; +import Referral from "../components/Referral/Index"; function ReferralPage() { return ( <> - + - ) + ); } -export default ReferralPage \ No newline at end of file +export default ReferralPage; From d34895c64c78299467118b54db660af86f8d5631 Mon Sep 17 00:00:00 2001 From: Ebube Date: Sun, 18 Jun 2023 23:09:18 +0100 Subject: [PATCH 2/2] . --- src/components/Cards/AvailableJobsCard.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Cards/AvailableJobsCard.jsx b/src/components/Cards/AvailableJobsCard.jsx index a76ae0b..25f0a66 100644 --- a/src/components/Cards/AvailableJobsCard.jsx +++ b/src/components/Cards/AvailableJobsCard.jsx @@ -125,7 +125,7 @@ export default function AvailableJobsCard({

( {datas.offer_code}) | - {datas.timeline_days} day(s) ago + {datas.timeline_days} day(s)