fixed some build bug issues

.env.development

@@ -9,15 +9,15 @@ REACT_APP_APPSITE="https://myfitapp.mermsemr.com"
 
 # REACT_APP_AUX_ENDPOINT="http://10.20.30.32:9083/svs/user"
 # REACT_APP_USERS_ENDPOINT="http://10.20.30.32:9083/svs/user"
-# REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
-# REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
+#REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
+#REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
 
-REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
-REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
 REACT_APP_ENDPOINT_KEY="WRENCH-BOARD-2024"
 
 #SOCKETS ENDS
-REACT_APP_PRIMARY_SOCKET="https://socket-dev.wrenchboard.com"
+REACT_APP_PRIMARY_SOCKET="https://socket.wrenchboard.com"
 
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
@@ -35,13 +35,20 @@ REACT_APP_RESET_START_ERROR_TIMEOUT=3000
 #NUMBER OF ITEMS PER PAGE
 REACT_APP_ITEM_PER_PAGE=5
 
-#apigate.lotus.g1.wrenchboard.com:76.209.103.227
+#apigate.orion.g1.wrenchboard.com:76.209.103.227
 #apigate.orion.g1.wrenchboard.com:76.209.103.227
 
 REACT_APP_GOOGLE_CLIENT_ID=817021856543-ad9nsjgdpsu2s2jrl63j3ihrv7lbf6ma.apps.googleusercontent.com
 REACT_APP_GOOGLE_CLIENT_SECRET=aozK_2G8UjaCmLgPPkv9abIm
 REACT_APP_GOOGLE_CLIENT_SCOPE="https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile"
-REACT_APP_GOOGLE_REDIRECT_URL=http://localhost:9082/login/auth/
+REACT_APP_GOOGLE_REDIRECT_URL=https://users.wrenchboard.com/login/auth/
+
+REACT_APP_FACEBOOK_CLIENT_ID2=390204307987009
+REACT_APP_FACEBOOK_CLIENT_SECRET2=19f778e312f2ab96d147bacb612910c2
+REACT_APP_FACEBOOK_CLIENT_SCOPE="email,public_profile"
+REACT_APP_FACEBOOK_REDIRECT_URL="https://users.wrenchboard.com/login/auth/flogin"
+
+DISABLE_ESLINT_PLUGIN=true
 
 #File Handling
 REACT_APP_MAX_FILE_SIZE=1048576
@@ -49,7 +56,6 @@ REACT_APP_MAX_VIDEO_FILE_SIZE=31457280
 REACT_APP_TOTAL_NUM_FILE=4
 
 REACT_APP_LOGOUT_TEXT="Sign Out"
-
 REACT_APP_APPLE_SOCIAL_LOGIN=0
 REACT_APP_LINKEDIN_SOCIAL_LOGIN=0
 
@@ -88,7 +94,7 @@ REACT_APP_SHOW_ACCOUNT_DASH=1
 REACT_APP_SHOW_SLIDER_BANNERS=0
 
 # FOR MEDIA LINK
-REACT_APP_MEDIA_LINK='https://dev-media.wrenchboard.com'
+REACT_APP_MEDIA_LINK='https://media.wrenchboard.com'
 
 # FOR FAMILY GAME LINK
 REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
@@ -97,4 +103,4 @@ REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
 REACT_APP_CUSTOMTIMER=90
 
 #SHOW OR HIDE MY PAGE LINK ROUTE
-REACT_APP_SHOW_USER_PAGE=1
+REACT_APP_SHOW_USER_PAGE=0

package.json

@@ -30,13 +30,13 @@
     "react-to-print": "^2.14.12",
     "react-toastify": "^9.0.1",
     "redux": "^4.2.0",
-    "socket.io-client": "^4.4.1",
     "slick-carousel": "^1.8.1",
+    "socket.io-client": "^4.4.1",
     "web-vitals": "^1.0.1",
     "yup": "^1.1.1"
   },
   "scripts": {
-    "start": "react-scripts start -e .env.development",
+    "start": "react-scripts start -e .env.production",
     "build": "react-scripts build -e .env.production",
     "test": "react-scripts test",
     "eject": "react-scripts eject"

run.sh

@@ -13,7 +13,8 @@ else
   # build the app and serve it via nginx
   echo "Production build"
   npm install --legacy-peer-deps
-  npm run build
+  #npm run build
+  npm start
   nginx -g 'daemon off;' -c /usr/src/app/nginx.conf
   nginx -c /usr/src/app/nginx.conf
 fi

src/components/AuthPages/Login/LoginLanding.jsx

@@ -16,11 +16,12 @@ import IOSDownload from '../../../assets/images/download/apple.jpg'
 
 
 export default function LoginLanding() {
+  const dispatch = useDispatch();
+  const location = useLocation();
+
   const queryParams = new URLSearchParams(location?.search);
   // const sessionExpired = queryParams.get("sessionExpired");
 
-  const dispatch = useDispatch();
-  const { state } = useLocation();
 
   const navigate = useNavigate();
   const userApi = new usersService();

src/components/AuthPages/Login/index.jsx

@@ -17,12 +17,13 @@ import { updateUserDetails } from "../../../store/UserDetails";
 import ReCAPTCHA from "react-google-recaptcha";
 
 export default function Login() {
+  const dispatch = useDispatch();
+  const location = useLocation();
+
   // eslint-disable-next-line no-restricted-globals
   const queryParams = new URLSearchParams(location?.search);
   // const sessionExpired = queryParams.get("sessionExpired");
 
-  const dispatch = useDispatch();
-  const { state } = useLocation();
 
   const [sessionExpired, setSessionExpired] = useState(queryParams.get("sessionExpired"))
 
@@ -220,7 +221,7 @@ export default function Login() {
     let loginValue = readCookie("loginType");
     setLoginType(loginValue);
 
-    if (state?.error) {
+    if (location?.state?.error) {
       //check if the login path has an error state indicating any social handle login with error
       setMsgError("Unexpected Error, Please try again soon.");
       setTimeout(() => {

src/components/AuthPages/Login/index2.jsx

@@ -20,12 +20,13 @@ import GoogleDownload from '../../../assets/images/download/andriod.jpg'
 import IOSDownload from '../../../assets/images/download/apple.jpg'
 
 export default function Login() {
+  const dispatch = useDispatch();
+  const location = useLocation();
+
   // eslint-disable-next-line no-restricted-globals
   const queryParams = new URLSearchParams(location?.search);
   // const sessionExpired = queryParams.get("sessionExpired");
 
-  const dispatch = useDispatch();
-  const { state } = useLocation();
 
   const [sessionExpired, setSessionExpired] = useState(
     queryParams.get("sessionExpired")
@@ -200,8 +201,8 @@ export default function Login() {
   // }, []);
 
   useEffect(()=>{
-    if(state && state.loginType){
-      setLoginType(state.loginType)
+    if(location?.state && location?.state.loginType){
+      setLoginType(location?.state.loginType)
     }else{
       navigate('/login', {replace: true})
     }

src/components/AuthPages/SignUp/index.jsx

@@ -6,12 +6,13 @@ import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
 
 export default function SignUp() {
+  const location = useLocation()
+
   // eslint-disable-next-line no-restricted-globals
   const queryParams = new URLSearchParams(location?.search);
   const country = queryParams.get("cnt")?.toUpperCase();
   
-  const {pathname} = useLocation()
-  const currentPath = country ? `${pathname}?cnt=${country.toLowerCase()}`:pathname // Determines the new pathname is country query params exist
+  const currentPath = country ? `${location?.pathname}?cnt=${country.toLowerCase()}`:location?.pathname // Determines the new pathname is country query params exist
 
   const [signUpLoading, setSignUpLoading] = useState(false);
   const [checked, setValue] = useState(false);

src/components/AuthPages/SignUp/index2.jsx

@@ -9,14 +9,15 @@ import GoogleDownload from '../../../assets/images/download/andriod.jpg'
 import IOSDownload from '../../../assets/images/download/apple.jpg'
 
 export default function SignUp() {
+  const location = useLocation();
+
   // eslint-disable-next-line no-restricted-globals
   const queryParams = new URLSearchParams(location?.search);
   const country = queryParams.get("cnt")?.toUpperCase();
 
-  const { pathname } = useLocation();
   const currentPath = country
-    ? `${pathname}?cnt=${country.toLowerCase()}`
-    : pathname; // Determines the new pathname is country query params exist
+    ? `${location?.pathname}?cnt=${country.toLowerCase()}`
+    : location?.pathname; // Determines the new pathname is country query params exist
 
   const [signUpLoading, setSignUpLoading] = useState(false);
   const [checked, setValue] = useState(false);

src/components/AuthPages/VerifyLink/index.jsx

@@ -84,7 +84,7 @@ export default function VerifyLink() {
       const verifyRes = await userApi.verifyEmail(code);
       if (verifyRes.status === 200) {
         let { data } = verifyRes;
-        console.log("TESTING VERIFY", data);
+        // console.log("TESTING VERIFY", data);
         if (
           data &&
           data.internal_return >= 0 &&

src/components/AuthPages/VerifyLink/index2.jsx

@@ -92,7 +92,7 @@ export default function VerifyLink() {
       const verifyRes = await userApi.verifyEmail(code);
       if (verifyRes.status === 200) {
         let { data } = verifyRes;
-        console.log("TESTING VERIFY", data);
+        // console.log("TESTING VERIFY", data);
         if (
           data &&
           data.internal_return >= 0 &&

src/components/Blogs/index.jsx

@@ -1,14 +1,16 @@
 import React, { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { useSelector } from "react-redux";
+import { useNavigate, useLocation } from "react-router-dom";
 import usersService from "../../services/UsersService";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
 import Layout from "../Partials/Layout";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import CommonHead from "../UserHeader/CommonHead";
-import { useSelector } from "react-redux";
-import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
 
 export default function BlogItem(props) {
 
+    const location = useLocation()
+
     const {
         userDetails: { account_type },
       } = useSelector((state) => state?.userDetails); // CHECKS IF USER Details account type
@@ -26,7 +28,7 @@ export default function BlogItem(props) {
     const queryParams = new URLSearchParams(location?.search);
     const blog_id = queryParams.get("blog_id");
     
-    // console.log('MUMU', 'meta_value', blogdata, blogdata.data.image_url)
+    // ('MUMU', 'meta_value', blogdata, blogdata.data.image_url)
 
     useEffect(()=>{
         if(!blog_id){

src/components/Contexts/SocketIOContext.js

@@ -83,7 +83,7 @@ export default function SocketIOContextProvider({children}) {
             if(message.action == "REFRESH_OFFERS" && message.audience == "MERCHANT" && message.market_uid == user_uid){  // for refreshing job owner offer interest list when any worker sends interest
                 dispatch(tableReload({type:'OFFERINTERESTLISTRELOAD'}))
             }
-            console.log('data', data)
+            // console.log('data', data)
         });
         // dispatch(tableReload({ type: "HOMEBANNERS" })); // RELOADS HOME BANNERS
 

src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx

@@ -93,7 +93,7 @@ const AssignTaskPopout = ({
   const [formState, setFormState] = useState({
     // Initialize form state with desired fields
     banner: details?.banner || "default.jpg",
-    country: details?.country ? details?.country : walletDetails.data.length == 1 ? walletDetails.data[0].country : '',
+    country: details?.country ? details?.country : walletDetails?.data?.length == 1 ? walletDetails?.data[0].country : '',
     price: details?.price || "",
     title: details?.title || "",
     description: details?.description || "",
@@ -115,7 +115,7 @@ const AssignTaskPopout = ({
     let reqData = {};
     if (taskType == "select" && assignType == 'task') {
       // RUNS HERE IF TASK TYPE IS SELECT
-      if (!Object.keys(activeTask.data).length) {
+      if (!Object.keys(activeTask.data)?.length) {
         setRequestStatus({
           loading: false,
           status: false,

src/components/FamilyAcc/FamilySettings/Tabs/RelativePopout.jsx

@@ -105,7 +105,7 @@ const RelativePopout = ({
                         const isChecked = relativeSettings?.data?.filter(value => value?.family_uid == item?.family_uid)
                         const image = localStorage.getItem("session_token") ? `${familyList?.imageServer}${localStorage.getItem("session_token")}/family/${item?.family_uid}` : "";
                         return (
-                        <div key={item.family_uid || index} className="flex items-center border-b dark:border-[#5356fb29] hover:bg-gray-50">
+                        <div key={item.family_uid} className="flex items-center border-b dark:border-[#5356fb29] hover:bg-gray-50">
                             <div className='p-2 flex justify-center items-center'>
                               {relativeEditKids.loading && relativeEditKids.family_uid == item.family_uid?
                                 <LoadingSpinner size='4' color='bg-sky-500' />
@@ -122,7 +122,7 @@ const RelativePopout = ({
                                 <div className="flex space-x-2 items-center w-full">
                                     <div className="min-w-[30px] min-h-[30px] max-w-[30px] max-h-[30px] rounded-full overflow-hidden flex justify-center items-center">
                                         <img
-                                            src={image || localImgLoad(`images/icons/${banner}`)}
+                                            src={image || localImgLoad(`images/icons/family.svg`)}
                                             alt={`Avatar`}
                                             className="w-full h-full"
                                         />

src/components/FamilyAcc/FamilyTableNew.jsx

@@ -18,7 +18,7 @@ export default function FamilyTableNew() {
   const { jobListTable, pendingListTable, parentFamilyTaskList } = useSelector((state) => state.tableReload); // TABLE RELOAD TRIGGERS
 
 
-  let { pathname } = useLocation();
+  let location = useLocation();
 
   const queryParams = new URLSearchParams(location?.search);
   const preSelectedTab = queryParams.get("tab");

src/components/FamilyAcc/Tabs/FamilyNewWaitlist.jsx

@@ -43,7 +43,7 @@ const FamilyNewWaitlist = ({
     setContinueTaskPopup({ show: false, data: {} });
   };
 
-  console.log("Check this >>",continueTaskPopup)
+  // console.log("Check this >>",continueTaskPopup)
 
   return (
     <div

src/components/FamilyAcc/Tabs/FamilyWaitlist.jsx

@@ -148,18 +148,18 @@ const FamilyWaitlist = memo(
         )}
         {popUp.show && (
           <SuggestTask
-            details={popUp.data}
+            details={popUp?.data}
             onClose={closePopUp}
             continuePopupData={openContinueTaskPopup}
-            situation={popUp.show}
+            situation={popUp?.show}
           />
         )}
 
         {continueTaskPopup.show && (
           <AssignTaskPopout
-            details={continueTaskPopup.data}
+            details={continueTaskPopup?.data}
             action={closeContinueTaskPopup}
-            situation={continueTaskPopup.show}
+            situation={continueTaskPopup?.show}
             setUpdatePage={setUpdatePage}
             jobList={jobList}
             setActiveTask={setActiveTask}

src/components/FamilyAcc/Tabs/wallet/Wallet.jsx

@@ -6,7 +6,7 @@ import VirtualAddCardFamilyPopout from './VirtualAddCardFamilyPopout'
 
 function Wallet({wallet, familyData, setFamilyWalletReload}) {
     const [addFundPopout, setAddFundPopout] = useState({ show: false, data: {} })
-    console.log('WALLET', wallet.brand)
+    // console.log('WALLET', wallet.brand)
 
     // virtual add card popout
     const [virtualPopup, setVirtualPopup] = useState({ show: false, data: {} }); 
@@ -91,7 +91,7 @@ function Wallet({wallet, familyData, setFamilyWalletReload}) {
                       action == 'ADD_VIRTUAL_CARD' ? 
                       openVirtualPopUp({wallet})
                       :
-                      null
+                      ()=>{}
                     }}
                     className={`w-[150px] h-[48px] rounded-full text-base text-white bg-[#4687ba] hover:bg-[#009ef7]`}
                   >

src/components/Home/HomeActivities.jsx

@@ -49,7 +49,7 @@ export default function HomeActivities({ className }) {
     getRecentActivities();
   }, []);
 
-  console.log(recentActivitiesData);
+  // console.log(recentActivitiesData);
 
   return (
     <div

src/components/MarketPlace/PopUp/LockJob.jsx

@@ -41,7 +41,7 @@ export default function LockJob({
     apiCall
       .getVerifyCompletedTask({ offer_depend_uid: details?.offer_depend_uid })
       .then((res) => {
-        console.log("RES", res.data);
+        // console.log("RES", res.data);
         setCompletedTask({ loading: false, data: res?.data?.result_list });
       })
       .catch((err) => {

src/components/MyActiveJobs/ActiveJobsMedia.jsx

@@ -10,13 +10,14 @@ import ActiveJobMessageMedia from "./ActiveJobMessageMedia";
 import IndexJobActions from "./JobActions/IndexJobActions";
 import MediaLayout from "../Partials/MediaLayout";
 
-const VideoElement = lazy(() => import("../VideoCom/VideoElement"));
-
 import usersService from "../../services/UsersService";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 import { SocketValues } from "../Contexts/SocketIOContext";
 import TabButton from "../customTabs/TabButton";
 
+const VideoElement = lazy(() => import("../VideoCom/VideoElement"));
+
+
 function ActiveJobsMedia(props) {
   let {sendMessage, joinRoom} = SocketValues() // destructures 'SEND MESSAGE' and 'JOIN ROOM' FUNCTIONS FROM SOCKET
   

src/components/MyActiveJobs/index.jsx

@@ -9,7 +9,7 @@ export default function MyActiveJobs(props) {
   const filterHandler = (value) => {
     setValue(value);
   };
-  console.log("AMEYE LOC1", props.MyJobList);
+  // console.log("AMEYE LOC1", props.MyJobList);
   
   return (
     <Layout>

src/components/MyTasks/MyOffersTable.jsx

@@ -41,7 +41,7 @@ export default function MyOffersTable({ className, MyActiveOffersList }) {
     ],
 };
 
-  console.log("YES WE SEE OFFERS", MyActiveOffersList);
+  // console.log("YES WE SEE OFFERS", MyActiveOffersList);
   const sellSlider = useRef(null);
   //const buySlider = useRef(null);
   const prevHandler = (value) => {

src/components/MyTasks/index.jsx

@@ -26,7 +26,7 @@ export default function MyTasks({
 
   let accountType = userDetails?.account_type == "FULL"
 
-  console.log("Active something >>", MyActiveOffersList)
+  // console.log("Active something >>", MyActiveOffersList)
 
   return (
     <Layout>

src/components/MyWaitingJobs/index.jsx

@@ -9,7 +9,7 @@ export default function MyWaitingJobs(props) {
   const filterHandler = (value) => {
     setValue(value);
   };
-  console.log("AMEYE LOC1", props.MyJobList);
+  // console.log("AMEYE LOC1", props.MyJobList);
   return (
     <Layout>
       <CommonHead

src/components/MyWallet/WalletAction.jsx

@@ -52,7 +52,7 @@ function WalletAction({ walletItem, payment, openPopUp }) {
               : action == 'ADD_VIRTUAL_CARD' ? 
               openVirtualPopUp({walletItem})
               :
-              null
+              ()=>{}
             }}
             className={`${
               walletItem?.code != "NAIRA" && ""

src/components/OffersInterest/ManageInterestOffer.jsx

@@ -399,7 +399,8 @@ export default function ManageInterestOffer(props) {
                                 <div className='mb-4 border-b-2 flex flex-col xxs:flex-row md:flex-col justify-center items-center gap-4'>
                                     <div className='w-full flex flex-col lg:flex-row justify-center items-center gap-2'>
                                         <p className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">Wallet:</p>
-                                        <span className="font-medium text-dark-gray dark:text-white">{ walletDetails?.loading ? 'loading...' : PriceFormatter(walletBal[0]?.amount * 0.01,props?.offerDetails?.currency_code,props?.offerDetails?.currency)}</span>
+                                        {/* <span className="font-medium text-dark-gray dark:text-white">{ walletDetails?.loading ? 'loading...' : PriceFormatter(walletBal[0]?.amount * 0.01,props?.offerDetails?.currency_code,props?.offerDetails?.currency)}</span> */}
+                                        <span className="font-medium text-dark-gray dark:text-white">{ walletBal.length > 0 ? PriceFormatter(walletBal[0]?.amount * 0.01,props?.offerDetails?.currency_code,props?.offerDetails?.currency) : 'loading...'}</span>
                                     </div>
                                     <div className='w-full flex flex-col lg:flex-row justify-center items-center gap-2'>
                                         <p className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">Reward:</p>

src/components/Partials/Default.jsx

@@ -1,8 +1,11 @@
 import React, { useEffect, useState } from "react";
+import {useLocation} from 'react-router-dom'
 import DarkModeContext from "../Contexts/DarkModeContext";
 import axios from 'axios'
 
 function Default({ children }) {
+  const location = useLocation()
+
   // dark mode setup
   const [theme, setTheme] = useState(null);
 

src/components/Resources/index.jsx

@@ -35,8 +35,8 @@ export default function Resources(props) {
   const CreatedBits = __resources?.productdata?.datas;
   const blogItems = __resources?.blogdata?.payload;
 
-  console.log(__resources);
-  console.log("Blog data >> ", blogItems);
+  // console.log(__resources);
+  // console.log("Blog data >> ", blogItems);
 
   // My Items Data
   const [uploadedFiles, setUploadedFiles] = useState({

src/components/Resources/tabs/QuestionsTab.jsx

@@ -42,7 +42,7 @@ export default function QuestionsTab({ className, products }) {
             question: ''
         }
         apiCall.askResourcesResult().then(res => {
-            console.log(res.data.choices[0].text)
+            // console.log(res.data.choices[0].text)
             if(!res.data || res.data?.choices?.length < 1){
             setRequestStatus({loading: false, status: false, message: 'No result found!'})
             }

src/components/familyResources/FamAIQuestion.jsx

@@ -44,7 +44,7 @@ export default function FamAIQuestion() {
           question: ''
       }
       apiCall.askResourcesResult().then(res => {
-          console.log(res.data.choices[0].text)
+        //   console.log(res.data.choices[0].text)
           if(!res.data || res.data?.choices?.length < 1){
           setRequestStatus({loading: false, status: false, message: 'No result found!'})
           }

src/components/familyResources/FamGames.jsx

@@ -11,7 +11,7 @@ import { useReactToPrint } from 'react-to-print'
 
 const Iframe = lazy(() => import("../Iframe/Iframe"));
 
-export default function FamGames() {
+export default function FamGames(props) {
 
   const ApiCall = new usersService();
   const navigate = useNavigate();
@@ -40,7 +40,7 @@ export default function FamGames() {
 
   // FUNCTION TO HANDLE POPOUT
   const popUpHandler = () => {
-    setPopUp((prev) => !prev);
+    // setPopUp((prev) => !prev);
   };
 
   // FUNCTION TO HANDLE MESSAGE CHANGE
@@ -136,7 +136,7 @@ export default function FamGames() {
           message: "Message Sent Successfully",
         });
         // function to trigger socket to emit 'send_message'
-        sendMessage(messageToSend, `${props.details.contract}-${props.details.contract_uid}`)
+        // sendMessage(messageToSend, `${props.details.contract}-${props.details.contract_uid}`)
         
         props.reloadActiveJobList((prev) => !prev); // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
         setMessageToSend(""); // SENDS MESSAGE TO SEND BACK TO EMPTY STRINGS
@@ -176,12 +176,12 @@ export default function FamGames() {
 
       const fileToBase64 = async () => {
         // Converts file data to base64 string
-        try {
-          const base64String = await convertFileToBase64(filesToSend[i]);
-          return base64String;
-        } catch (error) {
-          return false;
-        }
+        // try {
+        //   const base64String = await convertFileToBase64(filesToSend[i]);
+        //   return base64String;
+        // } catch (error) {
+        //   return false;
+        // }
       };
 
       // if(await !fileToBase64()){

src/components/infiniteScroll/InfiniteScroll.jsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'
 import LoadingSpinner from '../Spinners/LoadingSpinner'
 
 export default function InfiniteScroll({
-    allData=data,
+    allData=[],
     addItemBy=12,
     intialItemsToShow=39,
     children

src/middleware/AuthRoute.jsx

@@ -93,7 +93,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
         apiCall
           .loadProfile()
           .then((res) => {
-            if (res.data.internal_return < 0) {
+            if (res?.data?.internal_return < 0) {
               setIsLogin({ loading: false, status: false });
               return;
             }
@@ -119,13 +119,13 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
       apiCall
         .getHeroJBanners()
         .then((res) => {
-          if (res.data?.internal_return < 0) {
+          if (res?.data?.internal_return < 0) {
             return;
           }
           dispatch(commonHeadBanner(res.data));
         })
         .catch((error) => {
-          console.log("ERROR ", error);
+          // console.log("ERROR ", error);
         });
   }, [isLogin.status, homeBanners]);
 
@@ -136,7 +136,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
       apiCall
         .getMyNotifications()
         .then((res) => {
-          if (res.data.internal_return < 0) {
+          if (res?.data?.internal_return < 0) {
             dispatch(updateNotifications({ loading: false, data: null }));
             return;
           }
@@ -201,11 +201,11 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
         const res = await apiCall.getMyJobList();
         // setMyJobList({loading: false, data:res.data})
         // setMyJobList(res.data);
-        dispatch(updateUserJobList({ loading: false, data: res.data }));
+        dispatch(updateUserJobList({ loading: false, data: res?.data }));
       } catch (error) {
         dispatch(updateUserJobList({ loading: false, data: [] }));
         // setMyJobList({loading: false, data:[]})
-        console.log("Error getting mode");
+        // console.log("Error getting mode");
       }
     };
     getMyJobList();
@@ -220,13 +220,13 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
       dispatch(updateWalletDetails({ loading: true, data: [] }));
       try {
         const res = await apiCall.getUserWallets();
-        console.log("wallet - >", res.data);
+        // console.log("wallet - >", res.data);
         dispatch(
-          updateWalletDetails({ loading: false, data: res.data?.result_list })
+          updateWalletDetails({ loading: false, data: res?.data?.result_list })
         );
       } catch (error) {
         dispatch(updateWalletDetails({ loading: false, data: [] }));
-        console.log("Error getting mode");
+        // console.log("Error getting mode");
       }
     };
     getMyWalletList();
@@ -246,7 +246,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
         dispatch(updateJobs({loading: false, ...res.data}));
       } catch (error) {
         dispatch(updateJobs({loading: false}));
-        console.log("Error getting mode");
+        // console.log("Error getting mode");
       }
     };
     getMarketActiveJobList();
@@ -281,10 +281,10 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
       // setFamilyBannersList({loading:true, result:[]});
       try {
         const res = await apiCall.getFamilyBannersList();
-        dispatch(familyBannersList({...res.data, loading:false}))
+        dispatch(familyBannersList({...res?.data, loading:false}))
       } catch (error) {
         dispatch(familyBannersList({loading:false}))
-        console.log("Error getting tasks");
+        // console.log("Error getting tasks");
       }
     };
     getFamilyBanners()
@@ -301,7 +301,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
         dispatch(familyResources(res?.data?.result_list))
         // console.log('RESPONSE', res?.data?.result_list)
       } catch (error) {
-        console.log("Error getting tasks");
+        // console.log("Error getting tasks");
       }
     };
     getFamilyResourcesList()
@@ -318,7 +318,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
       apiCall.getFamilyWalletRedeemOptions().then((res)=>{
           dispatch(familyWalletRedeemOptList({loading: false, image: res?.data?.session_image_server, data:res?.data?.result_list}))
       }).catch((err)=>{
-          console.log(err)
+          // console.log(err)
           dispatch(familyWalletRedeemOptList({loading: false, image: '', data:{}}))
       })
     };
@@ -332,7 +332,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   useEffect(()=>{ // sends an event to the socket to enable user join a room to be able to receive update for parent child job assign
     if(loggedIn || isLogin.status){
       joinRoom(`FAMILY-${account_type == 'FULL' ? uid : sessionStorage.getItem('parent_uid')}`)
-      console.log(`Room joined for parent child task assign as ${account_type} with ${account_type == 'FULL' ? uid : sessionStorage.getItem('parent_uid')}}`)
+      // console.log(`Room joined for parent child task assign as ${account_type} with ${account_type == 'FULL' ? uid : sessionStorage.getItem('parent_uid')}}`)
     }
   },[isLogin.status])
 

src/services/UsersService.js

@@ -3,7 +3,7 @@ import { apiConst } from "../lib/apiConst";
 
 class usersService {
   constructor() {
-    console.log("WRB Service Entry");
+    // console.log("WRB Service Entry");
   }
 
   MyPageIntro(reqData) {
@@ -1644,19 +1644,22 @@ class usersService {
       },
     })
       .then((response) => {
-        console.log("~~~~~~~ Toks2 GET ~~~~~~~~");
+        // console.log("~~~~~~~ Toks2 GET ~~~~~~~~");
         return response;
       })
       .catch((error) => {
         if (error.response) {
           //response status is an error code
-          console.log(error.response.status);
+          // console.log(error.response.status);
+          return
         } else if (error.request) {
           //response not received though the request was sent
-          console.log(error.request);
+          // console.log(error.request);
+          return
         } else {
           //an error occurred when setting up the request
-          console.log(error.message);
+          // console.log(error.message);
+          return
         }
       });
   }
@@ -1685,8 +1688,8 @@ class usersService {
     }
     return Axios.post(endPoint, reqData)
         .then((response) => {
-          console.log(response);
-          console.log("~~~~~~~ WrenchBoard::POST ~~~~~~~~");
+          // console.log(response);
+          // console.log("~~~~~~~ WrenchBoard::POST ~~~~~~~~");
           if (response.data.internal_return == "-9999") {
             localStorage.clear();
             window.location.href = `/login?sessionExpired=true`;
@@ -1696,31 +1699,34 @@ class usersService {
         .catch((error) => {
           if (error.response) {
             //response status is an error code
-            console.log(
-                "ERROR-------------------------------------------------------"
-            );
-            console.log(error.response.status);
-            console.log(
-                "ERROR-------------------------------------------------------"
-            );
+            // console.log(
+            //     "ERROR-------------------------------------------------------"
+            // );
+            // console.log(error.response.status);
+            // console.log(
+            //     "ERROR-------------------------------------------------------"
+            // );
+            return
           } else if (error.request) {
             //response not received though the request was sent
-            console.log(
-                "ERROR2-------------------------------------------------------"
-            );
-            console.log(error?.request);
-            console.log(
-                "ERROR2-------------------------------------------------------"
-            );
+            // console.log(
+            //     "ERROR2-------------------------------------------------------"
+            // );
+            // console.log(error?.request);
+            // console.log(
+            //     "ERROR2-------------------------------------------------------"
+            // );
+            return
           } else {
             //an error occurred when setting up the request
-            console.log(
-                "ERROR3-------------------------------------------------------"
-            );
-            console.log(error);
-            console.log(
-                "ERROR3-------------------------------------------------------"
-            );
+            // console.log(
+            //     "ERROR3-------------------------------------------------------"
+            // );
+            // console.log(error);
+            // console.log(
+            //     "ERROR3-------------------------------------------------------"
+            // );
+            return
           }
         });
   }
@@ -1751,9 +1757,9 @@ class usersService {
    // Axios.defaults.headers['X-API-KEY'] = endPointKey;
     return Axios.post(endPoint, reqData)
       .then((response) => {
-        console.log(response);
+        // console.log(response);
         // res = response;
-        console.log("~~~~~~~ Toks2 POST ~~~~~~~~");
+        // console.log("~~~~~~~ Toks2 POST ~~~~~~~~");
         if (response.data.internal_return == "-9999") {
           localStorage.clear();
           window.location.href = `/login?sessionExpired=true`;
@@ -1763,31 +1769,34 @@ class usersService {
       .catch((error) => {
         if (error.response) {
           //response status is an error code
-          console.log(
-            "ERROR-------------------------------------------------------"
-          );
-          console.log(error.response.status);
-          console.log(
-            "ERROR-------------------------------------------------------"
-          );
+          // console.log(
+          //   "ERROR-------------------------------------------------------"
+          // );
+          // console.log(error.response.status);
+          // console.log(
+          //   "ERROR-------------------------------------------------------"
+          // );
+          return
         } else if (error.request) {
           //response not received though the request was sent
-          console.log(
-            "ERROR2-------------------------------------------------------"
-          );
-          console.log(error?.request);
-          console.log(
-            "ERROR2-------------------------------------------------------"
-          );
+          // console.log(
+          //   "ERROR2-------------------------------------------------------"
+          // );
+          // console.log(error?.request);
+          // console.log(
+          //   "ERROR2-------------------------------------------------------"
+          // );
+          return
         } else {
           //an error occurred when setting up the request
-          console.log(
-            "ERROR3-------------------------------------------------------"
-          );
-          console.log(error);
-          console.log(
-            "ERROR3-------------------------------------------------------"
-          );
+          // console.log(
+          //   "ERROR3-------------------------------------------------------"
+          // );
+          // console.log(error);
+          // console.log(
+          //   "ERROR3-------------------------------------------------------"
+          // );
+          return
         }
       });
   }

src/views/MyPastDueTasksPage.jsx

@@ -12,7 +12,7 @@ export default function MyPastDueTasksPage() {
     const getMyJobList = async () => {
         try {
             const res = await api.getMyPastDueJobList();
-            console.log("DATA", res.data);
+            // console.log("DATA", res.data);
             setMyJobList({loading:false, data:res.data})
         } catch (error) {
             setMyJobList({loading:false, data:[]})

src/views/MyTaskPage.jsx

@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from "react";
 import MyTasks from "../components/MyTasks";
+import {useLocation} from 'react-router-dom'
 // import UsersService from "../services/UsersService";
 import usersService from "../services/UsersService";
 
@@ -7,6 +8,8 @@ import { useSelector } from "react-redux";
 import RecentlyPastDue from "../components/MyTasks/RecentlyPastDue";
 
 export default function MyTaskPage() {
+  const location = useLocation()
+
   const api = new usersService();
   const queryParams = new URLSearchParams(location?.search);
   const tab = queryParams.get("tab")?.toLowerCase();