diff --git a/src/components/AuthPages/VerifyYou/index2.jsx b/src/components/AuthPages/VerifyYou/index2.jsx index 5c28f52..6e1031d 100644 --- a/src/components/AuthPages/VerifyYou/index2.jsx +++ b/src/components/AuthPages/VerifyYou/index2.jsx @@ -28,21 +28,14 @@ export default function VerifyYou() {
-
+

- Verify Email. Help us secure your WrenchBoard account - by verifying your email registration address. Verification - will let you access all of WrenchBoard's features. + Please verify your email to secure your account.

- If you do not receive the confirmation message within a few - minutes of signing up, please check your Junk E-mail folder - just in case the confirmation email got delivered there - instead of your inbox. If so, select the confirmation - message and click Not Junk, which will allow future messages - to get through. + If you don't see the confirmation email, check your Junk or Spam folder and mark it as "Not Junk"

diff --git a/src/components/Referral/ReferralDisplay.jsx b/src/components/Referral/ReferralDisplay.jsx index ddb48ba..1714da3 100644 --- a/src/components/Referral/ReferralDisplay.jsx +++ b/src/components/Referral/ReferralDisplay.jsx @@ -7,6 +7,7 @@ import LoadingSpinner from "../Spinners/LoadingSpinner"; import { Form, Formik } from "formik"; import * as Yup from "yup"; import ReferralTable from "../MyWallet/WalletComponent/ReferralTable"; +import TabButton from "../customTabs/TabButton"; const validationSchema = Yup.object().shape({ ref_email: Yup.string() @@ -105,123 +106,165 @@ function ReferralDisplay() { sendReferralMsg({...values}); // FUNCTION TO SEND REFERRAL MESSAGE }; + const [selectedTab, setSelectedTab] = useState("Send Referral"); + const tabs = [ //STATE FOR SWITCHING BETWEEN TABS + { + id: 1, + title: "Send Referral", + iconName: "history", + }, + { + id: 2, + title: "Referral List", + iconName: "history", + }, + ] + useEffect(() => { allReferrals(); }, [refHistoryReload]); return ( -
-
-
-
-

- Refer a Friend -

+
+
+
+ {tabs.map((item) => ( +
+ +
+ ))}
-
+
+
+
+ <> +
+
+
+

+ Refer a Friend +

+
+
+
+ {selectedTab == 'Send Referral' && +
+

+ Send Referral +

+ + {(props) => ( +
+
+ {/* Firstname */} +
+ + {props.errors.ref_firstname && + props.touched.ref_firstname && ( +

+ {props.errors.ref_firstname} +

+ )} +
-
-

- Send Referral -

- - {(props) => ( - -
- {/* Firstname */} -
- - {props.errors.ref_firstname && - props.touched.ref_firstname && ( + {/* Lastname */} +
+ + {props.errors.ref_lastname && + props.touched.ref_lastname && ( +

+ {props.errors.ref_lastname} +

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

- {props.errors.ref_firstname} + {props.errors.ref_email}

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

- {props.errors.ref_lastname} -

+
+ {error.message != "" && ( +

{error.message}

+ )} +
+ {error.loading ? ( + + ) : ( + )} -
-
- -
- - {props.errors.ref_email && props.touched.ref_email && ( -

- {props.errors.ref_email} -

- )} -
- -
- {error.message != "" && ( -

{error.message}

+
+ )} -
- {error.loading ? ( - - ) : ( - - )} -
- - )} - -
+
+
+ } + + {selectedTab == 'Referral List' && + <> +
+

+ Referral List +

+ {referralList.loading ? ( + + ) : ( + + )} +
+ + } + + + -
-

- Referral List -

- {referralList.loading ? ( - - ) : ( - - )} -
); diff --git a/src/services/UsersService.js b/src/services/UsersService.js index 98d3903..ba65ced 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -208,7 +208,7 @@ class usersService { // } getHeroJBanners() { var postData = { - uuid: localStorage.getItem("uid"), + uid: localStorage.getItem("uid"), member_id: localStorage.getItem("member_id"), sessionid: localStorage.getItem("session_token"), page: 0,