history table list adjusted and wallet display fixed

.env

@@ -72,7 +72,8 @@ REACT_APP_APPLE_SOCIAL_LOGIN=0
 REACT_APP_LINKEDIN_SOCIAL_LOGIN=0
 
 #File Handling
-REACT_APP_MAX_FILE_SIZE=1000000
+REACT_APP_MAX_FILE_SIZE=1048576
+REACT_APP_MAX_VIDEO_FILE_SIZE=31457280
 REACT_APP_TOTAL_NUM_FILE=4
 
 #Auth Text(s)
@@ -124,4 +125,7 @@ REACT_APP_MEDIA_LINK='https://dev-media.wrenchboard.com'
 REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
 
 # REACT APP CUSTOMTIMER
-REACT_APP_CUSTOMTIMER=90
+REACT_APP_CUSTOMTIMER=90
+
+#SHOW OR HIDE MY PAGE LINK ROUTE
+REACT_APP_SHOW_USER_PAGE=1

.env.development

@@ -43,7 +43,9 @@ 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_MAX_FILE_SIZE=1000000
+#File Handling
+REACT_APP_MAX_FILE_SIZE=1048576
+REACT_APP_MAX_VIDEO_FILE_SIZE=31457280
 REACT_APP_TOTAL_NUM_FILE=4
 
 REACT_APP_LOGOUT_TEXT="Sign Out"
@@ -92,4 +94,7 @@ REACT_APP_MEDIA_LINK='https://dev-media.wrenchboard.com'
 REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
 
 # REACT APP CUSTOMTIMER
-REACT_APP_CUSTOMTIMER=90
+REACT_APP_CUSTOMTIMER=90
+
+#SHOW OR HIDE MY PAGE LINK ROUTE
+REACT_APP_SHOW_USER_PAGE=1

.env.production

@@ -50,7 +50,9 @@ REACT_APP_FACEBOOK_REDIRECT_URL="https://users.wrenchboard.com/login/auth/flogin
 
 DISABLE_ESLINT_PLUGIN=true
 
-REACT_APP_MAX_FILE_SIZE=1000000
+#File Handling
+REACT_APP_MAX_FILE_SIZE=1048576
+REACT_APP_MAX_VIDEO_FILE_SIZE=31457280
 REACT_APP_TOTAL_NUM_FILE=4
 
 REACT_APP_LOGOUT_TEXT="Sign Out"
@@ -98,4 +100,7 @@ REACT_APP_MEDIA_LINK='https://media.wrenchboard.com'
 REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
 
 # REACT APP CUSTOMTIMER
-REACT_APP_CUSTOMTIMER=90
+REACT_APP_CUSTOMTIMER=90
+
+#SHOW OR HIDE MY PAGE LINK ROUTE
+REACT_APP_SHOW_USER_PAGE=0

src/components/AuthPages/Login/index2.jsx

@@ -145,6 +145,7 @@ export default function Login() {
         localStorage.setItem("member_id", `${res.data.member_id}`);
         localStorage.setItem("uid", `${res.data.uid}`);
         localStorage.setItem("session_token", `${res.data.session}`);
+        localStorage.setItem("wallet_available_status", `${res.data.wallet_available_status}`);
         if (res.data?.account_type == "FAMILY") {
           sessionStorage.setItem("family_uid", res.data?.family_uid);
           sessionStorage.setItem("parent_uid", res.data?.parent_uid);

src/components/AuthPages/VerifyLink/index2.jsx

@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useState } from "react";
+import { useDispatch } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import WrenchBoard from "../../../assets/images/wrenchboard-logo-text.png";
 import debounce from "../../../hooks/debounce";
@@ -6,8 +7,12 @@ import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout2";
 import LoadingSpinner from '../../../components/Spinners/LoadingSpinner'
+import { updateUserDetails } from "../../../store/UserDetails";
 
 export default function VerifyLink() {
+
+  const dispatch = useDispatch();
+
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
   const [msgError, setMsgError] = useState("");
@@ -50,12 +55,14 @@ export default function VerifyLink() {
           ) {
             localStorage.setItem("email", `${data?.email}`);
             localStorage.setItem("member_id", `${data?.member_id}`);
+            localStorage.setItem("uid", `${data?.uid}`);
             localStorage.setItem("session_token", `${data?.session}`);
-            localStorage.setItem("session", `${data?.session}`);
-            localStorage.setItem("uid", data?.uid);
-
-            navigate("/", { replace: true });
-            setLinkLoader(false);
+            localStorage.setItem("wallet_available_status", `${data?.wallet_available_status}`);
+            dispatch(updateUserDetails({ ...data }));
+            setTimeout(() => {
+              navigate("/", { replace: true });
+              setLinkLoader(false);
+            }, 2000);
           } else {
             setLinkLoader(false);
             setMsgError("Invalid Link or Password Combination");

src/components/Cards/AvailableJobsCard.jsx

@@ -34,7 +34,7 @@ export default function AvailableJobsCard({
     <>
       {contentDisplay == "grid" ? (
         <div
-          className={`card-style-two w-full h-[426px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
+          className={`card-style-two w-full p-[10px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
             className || ""
           }`}
         >
@@ -42,7 +42,7 @@ export default function AvailableJobsCard({
             onClick={() => {
               setMarketPopUp({ show: true, data: datas });
             }}
-            className="flex flex-col justify-between w-full h-full"
+            className="flex flex-col gap-2 justify-between w-full h-full"
           >
             <div className='w-full flex items-center gap-4'>
               <div className='min-w-[60px] min-h-[60px] max-w-[60px] max-h-[60px] rounded-full overflow-hidden'>
@@ -64,7 +64,7 @@ export default function AvailableJobsCard({
                       </p>
                     </div>
                   </div>
-                  <div className="w-[1px] bg-light-purple dark:bg-dark-light-purple  h-7"></div>
+                  <div className="w-[1px] bg-light-purple dark:bg-dark-light-purple h-7"></div>
                   <div className="created-by flex space-x-2 items-center flex-row-reverse">
                     <div>
                       <p className="text-thin-light-gray text-sm leading-3 text-right">
@@ -80,23 +80,22 @@ export default function AvailableJobsCard({
             </div>
             <div className="thumbnail-area w-full">
               <div
-                className="w-full h-[236px] p-6  rounded-xl overflow-hidden bg-center bg-cover bg-no-repeat"
+                className="w-full h-[236px] rounded-xl overflow-y-auto bg-center bg-cover bg-no-repeat"
                 // style={{
                 //   backgroundImage: `url('${image}')`,
                 // }}
               >
-                <div className="flex justify-center bg-slate-100 p-2 rounded-md">
-                  {datas.description}
+                <div className="flex flex-col min-h-full bg-slate-100 p-2 rounded-md">
+                  <p>{datas.description}</p>
                 </div>
               </div>
             </div>
             <div className="details-area">
-              <div className="product-two-options flex justify-between mb-5 relative"></div>
-
+              {/* <div className="product-two-options flex justify-between mb-5 relative"></div> */}
               <div className="flex justify-between">
                 <div className="flex items-center space-x-2">
                   <div>
-                    <p className="font-bold text-xl tracking-wide line-clamp-1   text-dark-gray dark:text-white">
+                    <p className="w-full font-bold text-xl tracking-wide text-dark-gray dark:text-white">
                       {/* {thePrice} | {datas.timeline_days} day(s) */}
                       {thePrice}
                     </p>

src/components/History/JobsCompleted.jsx

@@ -55,20 +55,20 @@ function JobsCompleted() {
     <LoadingSpinner size='16' color='sky-blue' height='h-[500px]' />
     : familyRewardHistory.data.length ?
     <table className="wallet-activity w-full table-auto border-collapse text-left">
-        <thead className='border-b-2'>
-            <tr className='text-slate-600'>
-            <th className="p-2"></th>
-            <th className="p-2">Amount</th>
-            <th className="p-2">Date</th>
-            <th className="p-2">Confirmation</th>
+        <thead className='w-full'>
+            <tr className='text-slate-600 dark:text-white'>
+            <th className="p-4"></th>
+            <th className="p-4">Amount</th>
+            <th className="p-4">Date</th>
+            <th className="p-4">Confirmation</th>
             </tr>
         </thead>
         <tbody>
             {currentReward.map((item, index) => {
                 let date = new Date(item.added).toLocaleDateString()
                 return (
-                    <tr key={index} className='text-slate-500'>
-                        <td className="p-2">
+                    <tr key={index} className='dark:text-white dark:bg-dark-white border-y dark:border-[#5356fb29] hover:bg-gray-50 dark:hover:bg-gray-50 dark:hover:text-black transition-all duration-300'>
+                        <td className="p-4">
                             <div className='flex items-center gap-2'>
                                 <img src={item.icon} className='min-w-[60px] max-w-[60px] min-h-[60px] max-h-[60px] rounded-full bg-slate-500' alt='Reward Logo' />
                                 <div className='flex flex-col'>
@@ -77,9 +77,9 @@ function JobsCompleted() {
                                 </div>
                             </div>
                         </td>
-                        <td className="p-2">{AmountTo2DP(item.amount*0.01)} {item.currency}</td>
-                        <td className="p-2">{date}</td>
-                        <td className="p-2">{item.confirmation}</td>
+                        <td className="p-4">{AmountTo2DP(item.amount*0.01)} {item.currency}</td>
+                        <td className="p-4">{date}</td>
+                        <td className="p-4">{item.confirmation}</td>
                     </tr>
                 )
             }
@@ -97,7 +97,7 @@ function JobsCompleted() {
     }
 
     {/* PAGINATION BUTTON */}
-    <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= familyRewardHistory?.data?.length ? true : false} data={familyRewardHistory?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
+    <PaginatedList borderTop={false} onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= familyRewardHistory?.data?.length ? true : false} data={familyRewardHistory?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
     {/* END OF PAGINATION BUTTON */}
     </div>
   )

src/components/History/RewardsTable.jsx

@@ -52,20 +52,20 @@ export const RewardsTable = memo(() => {
     <LoadingSpinner size='16' color='sky-blue' height='h-[500px]' />
     : familyRewardHistory.data.length ?
     <table className="wallet-activity w-full table-auto border-collapse text-left">
-        <thead className='border-b-2'>
-            <tr className='text-slate-600'>
-            <th className="p-2"></th>
-            <th className="p-2">Amount</th>
-            <th className="p-2">Date</th>
-            <th className="p-2">Confirmation</th>
+        <thead className='w-full'>
+            <tr className='text-slate-600 dark:text-white'>
+            <th className="p-4"></th>
+            <th className="p-4">Amount</th>
+            <th className="p-4">Date</th>
+            <th className="p-4">Confirmation</th>
             </tr>
         </thead>
         <tbody>
             {currentReward.map((item, index) => {
                 let date = new Date(item.added).toLocaleDateString()
                 return (
-                    <tr key={index} className='text-slate-500'>
-                        <td className="p-2">
+                    <tr key={index} className='dark:text-white dark:bg-dark-white border-y dark:border-[#5356fb29] hover:bg-gray-50 dark:hover:bg-gray-50 dark:hover:text-black transition-all duration-300'>
+                        <td className="p-4">
                             <div className='flex items-center gap-2'>
                                 <img src={item.icon} className='min-w-[60px] max-w-[60px] min-h-[60px] max-h-[60px] rounded-full bg-slate-500' alt='Reward Logo' />
                                 <div className='flex flex-col'>
@@ -74,9 +74,9 @@ export const RewardsTable = memo(() => {
                                 </div>
                             </div>
                         </td>
-                        <td className="p-2">{AmountTo2DP(item.amount*0.01)} {item.currency}</td>
-                        <td className="p-2">{date}</td>
-                        <td className="p-2">{item.confirmation}</td>
+                        <td className="p-4">{AmountTo2DP(item.amount*0.01)} {item.currency}</td>
+                        <td className="p-4">{date}</td>
+                        <td className="p-4">{item.confirmation}</td>
                     </tr>
                 )
             }
@@ -94,7 +94,7 @@ export const RewardsTable = memo(() => {
     }
 
     {/* PAGINATION BUTTON */}
-    <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= familyRewardHistory?.data?.length ? true : false} data={familyRewardHistory?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
+    <PaginatedList borderTop={false} onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= familyRewardHistory?.data?.length ? true : false} data={familyRewardHistory?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
     {/* END OF PAGINATION BUTTON */}
     </div>
   )

src/components/History/index.jsx

@@ -276,7 +276,7 @@ export default function History() {
                     </button>
                 </div> */}
                 {/* END OF switch button */}
-                <div className="history-tables w-full bg-red-50 overflow-x-auto">
+                <div className="history-tables w-full bg-red-50 dark:bg-dark-white overflow-x-auto">
                     {/* PURCHASE SECTION */}
                     {selectedTab == 'purchases' &&
                         <div className="wallet w-full">

src/components/MarketPlace/MainSection.jsx

@@ -20,7 +20,7 @@ export default function MainSection({
   );
   const [tab, setTab] = useState(Object.keys(marketCategories)[0]);
 
-  let [contentDisplay, setContentDisplay] = useState("list"); // STATE TO HOLD LIST VIEW STYLE
+  let [contentDisplay, setContentDisplay] = useState("grid"); // STATE TO HOLD LIST VIEW STYLE
 
   // Convert to array in order to map
   const mappedArray = Object.entries(marketCategories).map(([key, value]) => {

src/components/MarketPlace/PopUp/MarketPopUp.jsx

@@ -252,7 +252,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
             <div className="mx-auto bg-[#f1f8ff] dark:bg-[#C2C8D3] px-4 rounded-md md:min-h-[420px] flex flex-col justify-between">
               <div className="w-full flex flex-col justify-center pb-4 gap-2">
                 <p className="job-label w-full">
-                  Interested in the task?
+                  Interested?
                 </p>
                 <hr />
                 <button
@@ -262,9 +262,8 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
                 >
                   {" "}
                   <div className="w-full flex flex-col justify-between gap-2">
-                    <span>Send</span>
-                    <span>Interest</span>
-                    <span>Request</span>
+                    <span>Notify</span>
+                    <span>Owner</span>
                   </div>
                 </button>
                 <>

src/components/MyActiveJobs/ActiveJobs.jsx

@@ -75,11 +75,23 @@ function ActiveJobs(props) {
       // IF NO FILE SELECTED RETURN
       return;
     }
-    if (files[0].size > Number(process.env.REACT_APP_MAX_FILE_SIZE)) {
+    let fileType = files[0].type.split('/')[0].toLowerCase()
+    if (fileType == 'video' && files[0].size > Number(process.env.REACT_APP_MAX_VIDEO_FILE_SIZE)) { // return if video file is more than 30mb
       setRequestStatus({
         loading: false,
         status: false,
-        message: "File must be <= 1mb",
+        message: `File must be <= ${Number(process.env.REACT_APP_MAX_VIDEO_FILE_SIZE)/1048576} mb`,
+      });
+      setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 5000);
+      return;
+    }
+    if (fileType != 'video' && files[0].size > Number(process.env.REACT_APP_MAX_FILE_SIZE)) { // return if other files is more than 1mb
+      setRequestStatus({
+        loading: false,
+        status: false,
+        message: `File must be <= ${Number(process.env.REACT_APP_MAX_FILE_SIZE)/1048576} mb`,
       });
       setTimeout(() => {
         setRequestStatus({ loading: false, status: false, message: "" });
@@ -100,7 +112,8 @@ function ActiveJobs(props) {
       return;
     }
     // INCLUDE FILE IF NO ERROR
-    setFilesToSend((prev) => [...prev, files[0]]);
+    // setFilesToSend((prev) => [...prev, files[0]]); //for sending multiple file if need be
+    setFilesToSend([files[0]])
   };
 
   // FUNCTION TO CLEAR ALL TYPED MESSAGE OR FILES
@@ -189,61 +202,46 @@ function ActiveJobs(props) {
         setRequestStatus({ loading: false, status: false, message: "" });
       }, 5000);
     }
+    // const fileToBase64 = async () => {
+    //   // Converts file data to base64 string
+    //   try {
+    //     const base64String = await convertFileToBase64(filesToSend[i]);
+    //     return base64String;
+    //   } catch (error) {
+    //     return false;
+    //   }
+    // };
 
-    for (let i = 0; i <= filesToSend.length - 1; i++) {
-      // Loops through files to send array and trigger upload API call
+    let reqData = {
+      // file_name: filesToSend[i].name,
+      // file_size: filesToSend[i].size,
+      // file_type: "image/png",
+      // file_data: await fileToBase64(),
+      msg_type: "FILE",
+      contract: props.details.contract,
+      file: filesToSend[0],
+    };
 
-      const fileToBase64 = async () => {
-        // Converts file data to base64 string
-        try {
-          const base64String = await convertFileToBase64(filesToSend[i]);
-          return base64String;
-        } catch (error) {
-          return false;
+    ApiCall.sendFilesNew(reqData)
+      .then((res) => {
+        if(res.status != 200 || res.data.internal_return < 0){
+          setRequestStatus({loading: false, status: false, message: 'File could not be sent, try again later'})
+          return
         }
-      };
-
-      // if(await !fileToBase64()){
-      //   return
-      // }
-
-      let reqData = {
-        file_name: filesToSend[i].name,
-        file_size: filesToSend[i].size,
-        file_type: "image/png",
-        file_data: await fileToBase64(),
-        msg_type: "FILE",
-        contract: props.details.contract,
-      };
-
-      ApiCall.sendFiles(reqData)
-        .then((res) => {
-          // if(res.status != 200 || res.data.internal_return < 0){
-          //   setRequestStatus({loading: false, status: false, message: 'Files(s) could not be sent, try again later'})
-          //   return
-          // }
-          // setRequestStatus({loading: false, status: true, message: 'File(s) Uploaded Successfully'})
-          // props.reloadActiveJobList(prev => !prev) // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
-          // setFilesToSend([]) // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
-        })
-        .catch((error) => {
-          // setRequestStatus({loading: false, status: false, message: 'Opps! something went wrong'})
-        })
-        .finally(() => {
-          if (i == filesToSend.length - 1) {
-            setRequestStatus({
-              loading: false,
-              status: true,
-              message: "File(s) Uploaded Successfully",
-            });
-            setFilesToSend([]); // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
-            props.reloadActiveJobList((prev) => !prev); // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
-            setTimeout(() => {
-              setRequestStatus({ loading: false, status: false, message: "" });
-            }, 5000);
-          }
-        });
-    }
+        setRequestStatus({loading: false, status: true, message: 'File Uploaded Successfully'})
+        // props.reloadActiveJobList(prev => !prev) // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
+        // setFilesToSend([]) // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
+      })
+      .catch((error) => {
+        setRequestStatus({loading: false, status: false, message: 'Opps! something went wrong'})
+      })
+      .finally(() => {
+          setFilesToSend([]); // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
+          props.reloadActiveJobList((prev) => !prev); // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
+          setTimeout(() => {
+            setRequestStatus({ loading: false, status: false, message: "" });
+          }, 5000);
+      });
   };
 
   // FUNCTION TO CHECK IF TASK PASS DUE IS REACHED
@@ -445,7 +443,7 @@ function ActiveJobs(props) {
                         <input
                             type="file"
                             id="file"
-                            accept="image/*"
+                            accept="image/*,video/*"
                             style={{ display: "none" }}
                             onChange={handleFileChange}
                         />

src/components/MyActiveJobs/ActiveJobsMedia.jsx

@@ -69,11 +69,23 @@ function ActiveJobsMedia(props) {
       // IF NO FILE SELECTED RETURN
       return;
     }
-    if (files[0].size > Number(process.env.REACT_APP_MAX_FILE_SIZE)) {
+    let fileType = files[0].type.split('/')[0].toLowerCase()
+    if (fileType == 'video' && files[0].size > Number(process.env.REACT_APP_MAX_VIDEO_FILE_SIZE)) {  // return if video file is more than 30mb
       setRequestStatus({
         loading: false,
         status: false,
-        message: "File must be <= 1mb",
+        message: `File must be <= ${Number(process.env.REACT_APP_MAX_VIDEO_FILE_SIZE)/1048576} mb`,
+      });
+      setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 5000);
+      return;
+    }
+    if (fileType != 'video' && files[0].size > Number(process.env.REACT_APP_MAX_FILE_SIZE)) { // return if other files is more than 1mb
+      setRequestStatus({
+        loading: false,
+        status: false,
+        message: `File must be <= ${Number(process.env.REACT_APP_MAX_FILE_SIZE)/1048576} mb`,
       });
       setTimeout(() => {
         setRequestStatus({ loading: false, status: false, message: "" });
@@ -94,7 +106,8 @@ function ActiveJobsMedia(props) {
       return;
     }
     // INCLUDE FILE IF NO ERROR
-    setFilesToSend((prev) => [...prev, files[0]]);
+    // setFilesToSend((prev) => [...prev, files[0]]); //for sending multiple file if need be
+    setFilesToSend([files[0]])
   };
 
   // FUNCTION TO CLEAR ALL TYPED MESSAGE OR FILES
@@ -184,60 +197,42 @@ function ActiveJobsMedia(props) {
       }, 5000);
     }
 
-    for (let i = 0; i <= filesToSend.length - 1; i++) {
-      // Loops through files to send array and trigger upload API call
+    // const fileToBase64 = async () => {
+    //   // Converts file data to base64 string
+    //   try {
+    //     const base64String = await convertFileToBase64(filesToSend[i]);
+    //     return base64String;
+    //   } catch (error) {
+    //     return false;
+    //   }
+    // };
 
-      const fileToBase64 = async () => {
-        // Converts file data to base64 string
-        try {
-          const base64String = await convertFileToBase64(filesToSend[i]);
-          return base64String;
-        } catch (error) {
-          return false;
-        }
-      };
+    let reqData = {
+      msg_type: "FILE",
+      contract: props.details.contract,
+      file: filesToSend[0],
+    };
 
-      // if(await !fileToBase64()){
-      //   return
-      // }
-
-      let reqData = {
-        file_name: filesToSend[i].name,
-        file_size: filesToSend[i].size,
-        file_type: "image/png",
-        file_data: await fileToBase64(),
-        msg_type: "FILE",
-        contract: props.details.contract,
-      };
-
-      ApiCall.sendFiles(reqData)
-        .then((res) => {
-          // if(res.status != 200 || res.data.internal_return < 0){
-          //   setRequestStatus({loading: false, status: false, message: 'Files(s) could not be sent, try again later'})
-          //   return
-          // }
-          // setRequestStatus({loading: false, status: true, message: 'File(s) Uploaded Successfully'})
-          // props.reloadActiveJobList(prev => !prev) // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
-          // setFilesToSend([]) // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
-        })
-        .catch((error) => {
-          // setRequestStatus({loading: false, status: false, message: 'Opps! something went wrong'})
-        })
-        .finally(() => {
-          if (i == filesToSend.length - 1) {
-            setRequestStatus({
-              loading: false,
-              status: true,
-              message: "File(s) Uploaded Successfully",
-            });
-            setFilesToSend([]); // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
-            props.reloadActiveJobList((prev) => !prev); // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
-            setTimeout(() => {
-              setRequestStatus({ loading: false, status: false, message: "" });
-            }, 5000);
-          }
-        });
-    }
+    ApiCall.sendFilesNew(reqData)
+    .then((res) => {
+      if(res.status != 200 || res.data.internal_return < 0){
+        setRequestStatus({loading: false, status: false, message: 'File could not be sent, try again later'})
+        return
+      }
+      setRequestStatus({loading: false, status: true, message: 'File Uploaded Successfully'})
+      // props.reloadActiveJobList(prev => !prev) // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
+      // setFilesToSend([]) // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
+    })
+    .catch((error) => {
+      setRequestStatus({loading: false, status: false, message: 'Opps! something went wrong'})
+    })
+    .finally(() => {
+        setFilesToSend([]); // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
+        props.reloadActiveJobList((prev) => !prev); // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
+        setTimeout(() => {
+          setRequestStatus({ loading: false, status: false, message: "" });
+        }, 5000);
+    });
   };
 
   // FUNCTION TO CHECK IF TASK PASS DUE IS REACHED
@@ -437,7 +432,7 @@ function ActiveJobsMedia(props) {
                               <input
                                   type="file"
                                   id="file"
-                                  accept="image/*"
+                                  accept="image/*,video/*"
                                   style={{ display: "none" }}
                                   onChange={handleFileChange}
                               />

src/components/MyWallet/Wallet.jsx

@@ -60,13 +60,6 @@ const WalletRoutes = () => {
     getPaymentHistory();
   }, [walletTable]);
 
-  console.log(
-    "Testing all country: ",
-    allCountries,
-    "Testing wallet: ",
-    walletDetails
-  );
-
   return (
     <Layout>
       <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>

src/components/MyWallet/WalletComponent/PurchasesTable.jsx

@@ -18,21 +18,21 @@ function PurchasesTable({purchase}) {
     <div className='flex flex-col justify-between min-h-[500px]'>
         {purchase.data.length ?
         <table className="wallet-activity w-full table-auto border-collapse text-left">
-            <thead className='border-b-2'>
-                <tr className='text-slate-600'>
-                <th className="p-2">Trx.</th>
-                <th className="p-2">Amount</th>
-                <th className="p-2">Fee</th>
+            <thead className='w-full'>
+                <tr className='text-slate-600 dark:text-white'>
+                <th className="p-4">Trx.</th>
+                <th className="p-4">Amount</th>
+                <th className="p-4">Fee</th>
                 </tr>
             </thead>
             <tbody>
                 {currentPurchase.map((item, index) => (
-                <tr key={index} className='text-slate-500'>
-                    <td className="p-2">{item.added_date}<br />
+                <tr key={index} className='dark:text-white dark:bg-dark-white border-y dark:border-[#5356fb29] hover:bg-gray-50 dark:hover:bg-gray-50 dark:hover:text-black transition-all duration-300'>
+                    <td className="p-4">{item.added_date}<br />
                     <b>{item.confirmation} </b>
                     </td>
-                    <td className="p-2">{item.amount}</td>
-                    <td className="p-2">{item.fee}</td>
+                    <td className="p-4">{item.amount}</td>
+                    <td className="p-4">{item.fee}</td>
                 </tr>
                 ))}
             </tbody>
@@ -48,7 +48,7 @@ function PurchasesTable({purchase}) {
         }
 
     {/* PAGINATION BUTTON */}
-    <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= purchase?.data?.length ? true : false} data={purchase?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
+    <PaginatedList borderTop={false} onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= purchase?.data?.length ? true : false} data={purchase?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
     {/* END OF PAGINATION BUTTON */}
     </div>
   )

src/components/MyWallet/WalletComponent/RecentActivityTable.jsx

@@ -21,28 +21,28 @@ function RecentActivityTable({ payment }) {
     <div className="flex flex-col justify-between min-h-[500px]">
       {payment?.data?.length > 0 ? 
         <table className="wallet-activity w-full table-auto border-collapse text-left">
-          <thead className="border-b-2">
-            <tr className="text-slate-600">
-              <th className="p-2">Date</th>
-              <th className="p-2">Trx.</th>
-              <th className="p-2">Amnt./Fee</th>
-              <th className="p-2">Status</th>
+          <thead className="w-full">
+            <tr className="text-slate-600 dark:text-white">
+              <th className="p-4">Date</th>
+              <th className="p-4">Trx.</th>
+              <th className="p-4">Amnt./Fee</th>
+              <th className="p-4">Status</th>
             </tr>
           </thead>
           <tbody>
             {currentActivity.map((item, index) => (
-              <tr key={index} className="text-slate-500">
-                <td className="p-2">{item.trx_date}</td>
+              <tr key={index} className="dark:text-white dark:bg-dark-white border-y dark:border-[#5356fb29] hover:bg-gray-50 dark:hover:bg-gray-50 dark:hover:text-black transition-all duration-300">
+                <td className="p-4">{item.trx_date}</td>
                 <td
                   className="p-4"
                   dangerouslySetInnerHTML={{ __html: item.recipient }}
                 ></td>
-                <td className="p-2">
+                <td className="p-4">
                   {item.amount}
                   <br />
                   {item.fee}
                 </td>
-                <td className="p-2">{item.status}</td>
+                <td className="p-4">{item.status}</td>
               </tr>
             ))}
           </tbody>
@@ -70,6 +70,7 @@ function RecentActivityTable({ payment }) {
         data={payment?.data}
         start={indexOfFirstItem}
         stop={indexOfLastItem}
+        borderTop={false}
       />
       {/* END OF PAGINATION BUTTON */}
     </div>

src/components/MyWallet/WalletHeader.jsx

@@ -11,7 +11,7 @@ import { useSelector } from "react-redux";
 
 export default function WalletHeader(props) {
 
-  const {userDetails: { account_type }} = useSelector((state) => state?.userDetails);
+  const {userDetails: { account_type, wallet_available_status }} = useSelector((state) => state?.userDetails);
   //  debugger;
   //props.myWalletList.result_list
   let { pathname } = useLocation();
@@ -22,6 +22,7 @@ export default function WalletHeader(props) {
       props.setBalanceDropdown.toggle();
     else navigate("/my-wallet", { replace: true });
   }
+  // console.log('props.myWalletList', wallet_available_status)
   return (
     <>
       {account_type == 'FULL' ?
@@ -49,6 +50,8 @@ export default function WalletHeader(props) {
               </h3>
             </div>
             <div className="content px-7 pb-7">
+            {/* wallet_available_status == 'WALLET_AVAILABLE' */}
+            {(wallet_available_status == 'WALLET_AVAILABLE' || localStorage.getItem('wallet_available_status')== 'WALLET_AVAILABLE') ?
               <ul>
                 {props.myWalletList &&
                   props.myWalletList?.length > 0 &&
@@ -176,17 +179,25 @@ export default function WalletHeader(props) {
                 {/*    </div>*/}
                 {/*</li>*/}
               </ul>
+            :
+              <div className='p-2 w-full flex gap-4 items-center'>
+                <img className='w-[100px!important] h-auto' src={localImgLoad('images/icons/wallet.svg')} alt='Wallet Icon' />
+                <p className='text-lg text-red-500'>We do not currently support wallets in your area. We are diligently working on it. </p>
+              </div>
+            }
+
+            {(wallet_available_status == 'WALLET_AVAILABLE' || localStorage.getItem('wallet_available_status')== 'WALLET_AVAILABLE') &&
               <div className="add-money-btn flex justify-center items-center mt-3">
                 {/* <button
-                                  onClick={() => {
-                                  if(pathname == '/my-wallet') props.setBalanceDropdown.toggle()
-                                  else navigate('/my-wallet', {replace: true})
-                                  }}
-                                  type="button"
-                                  className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                              >
-                                  Manage
-                              </button> */}
+                    onClick={() => {
+                    if(pathname == '/my-wallet') props.setBalanceDropdown.toggle()
+                    else navigate('/my-wallet', {replace: true})
+                    }}
+                    type="button"
+                    className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                >
+                    Manage
+                </button> */}
                 <Link
                   to="/my-wallet"
                   onClick={onWalletClick}
@@ -195,6 +206,7 @@ export default function WalletHeader(props) {
                   Manage
                 </Link>
               </div>
+            }
             </div>
           </div>
         </div>

src/components/Pagination/PaginatedList.jsx

@@ -1,7 +1,7 @@
-const PaginatedList = ({ onClick, prev, next, data, start, stop }) => {
+const PaginatedList = ({ onClick, prev, next, data, start, stop, borderTop=true }) => {
   if (data?.length > process.env.REACT_APP_ITEM_PER_PAGE) {
     return (
-      <div className="p-3 flex justify-center items-center min-h-[70px] space-x-2 border-t-2 w-full">
+      <div className={`p-3 flex justify-center items-center min-h-[70px] space-x-2 w-full ${borderTop ? 'border-t-2' : 'border-t-0'}`}>
         {/* Render pagination buttons */}
         {!prev && (
           <button

src/components/Partials/Layout.jsx

@@ -53,12 +53,12 @@ export default function Layout({ children }) {
               <Header sidebarHandler={() => setMobileSidebar.toggle()} logoutModalHandler={logoutModalHandler} />
             </div>
             {/* container */}
-            <div className="nft-container 2xl:space-x-8 h-full mb-12 lg:mt-[140px] mt-24 xl:mt-10 flex flex-col items-start justify-center xl:flex-row xl:justify-between gap-4">
-              <div className="flex-[80%] 2xl:flex-[85%] w-full">
+            <div className="nft-container h-full mb-12 lg:mt-[140px] mt-24 xl:mt-10 flex flex-col items-start justify-center 2xl:flex-row 2xl:justify-between gap-10">
+              <div className="w-full 2xl:w-[calc(100%-250px)]">
                 {children && children}
               </div>
 
-              <div className="nft-right-side-content flex-[20%] 2xl:flex-[15%] w-full h-full 2xl:flex justify-center 2xl:justify-end relative">
+              <div className="nft-right-side-content w-full 2xl:w-[200px] 2xl:flex justify-center 2xl:justify-end relative">
                 <RightSideBar myJobList={userJobList} />
               </div>
             </div>

src/components/Partials/MobileSideBar.jsx

@@ -21,6 +21,8 @@ export default function MobileSidebar({
   const marketData = jobLists?.result_list;
   let noOfJobs = marketData?.length <= 0 ? "0" : marketData?.length;
 
+  let walletExist = userDetails?.wallet_available_status == 'WALLET_AVAILABLE' || localStorage.getItem('wallet_available_status')== 'WALLET_AVAILABLE'
+
   return (
     <div className="w-full h-full">
       {/* logo-area */}
@@ -138,7 +140,7 @@ export default function MobileSidebar({
           </div>
         )}
 
-        {userDetails?.account_type !== "FAMILY" && (
+        {(userDetails?.account_type !== "FAMILY" && walletExist) && (
           <>
             {!userDetails?.post_jobs ? (
               <div

src/components/Partials/RightSideBar.jsx

@@ -36,6 +36,7 @@ export default function RightSideBar({ myJobList }) {
   };
 
   const { userDetails } = useSelector((state) => state?.userDetails);
+  let walletExist = userDetails?.wallet_available_status == 'WALLET_AVAILABLE' || localStorage.getItem('wallet_available_status')== 'WALLET_AVAILABLE'
 
   return (
     <>
@@ -129,25 +130,27 @@ export default function RightSideBar({ myJobList }) {
                     </p>
                   </div>
                 </div>
-                <div className="item flex space-x-3 items-center">
-                  {/* image */}
-                  <div className="w-8 h-8 rounded-full bg-sky-500/50 p-1 flex justify-center items-center">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 68 50" id="Page">
-                      <path
-                        fillRule="evenodd"
-                        d="M0 13V2a2 2 0 0 1 2-2h64a2 2 0 0 1 2 2v11H0Zm0 4v31a2 2 0 0 0 2 2h20V17H0Zm26 33h40a2 2 0 0 0 2-2V17H26v33Z"
-                        fill="#ffffff"
-                        className="color000000 svgShape"
-                      ></path>
-                    </svg>
+                { Number(process.env.REACT_APP_SHOW_USER_PAGE) == 1 &&
+                  <div className="item flex space-x-3 items-center">
+                    {/* image */}
+                    <div className="w-8 h-8 rounded-full bg-sky-500/50 p-1 flex justify-center items-center">
+                      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 68 50" id="Page">
+                        <path
+                          fillRule="evenodd"
+                          d="M0 13V2a2 2 0 0 1 2-2h64a2 2 0 0 1 2 2v11H0Zm0 4v31a2 2 0 0 0 2 2h20V17H0Zm26 33h40a2 2 0 0 0 2-2V17H26v33Z"
+                          fill="#ffffff"
+                          className="color000000 svgShape"
+                        ></path>
+                      </svg>
+                    </div>
+                    {/* name */}
+                    <div>
+                      <p className="text-thin-light-gray text-base font-medium">
+                        <NavLink to="/yourpage">My Page</NavLink>
+                      </p>
+                    </div>
                   </div>
-                  {/* name */}
-                  <div>
-                    <p className="text-thin-light-gray text-base font-medium">
-                      <NavLink to="/yourpage">My Page</NavLink>
-                    </p>
-                  </div>
-                </div>
+                }
               </>
             )}
 
@@ -278,7 +281,7 @@ export default function RightSideBar({ myJobList }) {
         </div>
 
         {/*JOB LINKS*/}
-        {userDetails?.account_type !== "FAMILY" &&
+        {(userDetails?.account_type !== "FAMILY" && walletExist) &&
           myJobList?.data?.result_list?.length > 0 && (
             <div className="top-platform mt-6 bg-white dark:bg-dark-white rounded-2xl py-8 w-full 2xl:mb-10 2xl:border-none border ">
               {/* heading */}

src/components/Partials/Sidebar.jsx

@@ -22,6 +22,8 @@ export default function Sidebar({
   const marketData = jobLists?.result_list;
   let noOfJobs = marketData?.length <= 0 ? "0" : marketData?.length;
 
+  let walletExist = userDetails?.wallet_available_status == 'WALLET_AVAILABLE' || localStorage.getItem('wallet_available_status')== 'WALLET_AVAILABLE'
+
   useEffect(() => {
     const title = document.querySelectorAll(".menu-setting-items .heading");
     if (sidebar) {
@@ -104,7 +106,7 @@ export default function Sidebar({
           }`}
         >
           <div className="heading mb-5">
-            <h1 className="title text-xl font-bold text-sky-blue">Menu</h1>
+            <h1 className={`${!sidebar && 'text-center'} title text-xl font-bold text-sky-blue`}>Menu</h1>
           </div>
           <div className="items">
             <ul className="flex flex-col space-y-6">
@@ -139,11 +141,11 @@ export default function Sidebar({
         {userDetails?.account_type !== "FAMILY" && (
           <div
             className={`menu-item transition-all duration-300 ease-in-out ${
-              sidebar ? "my-5" : ""
+              sidebar ? "mb-5" : "mb-2"
             }`}
           >
             <div className="heading mb-5">
-              <h1 className="title text-xl font-bold text-sky-blue">Family</h1>
+              <h1 className={`${!sidebar && 'text-center'} title text-xl font-bold text-sky-blue`}>Family</h1>
             </div>
             <div className="items">
               <ul className="flex flex-col space-y-6">
@@ -157,7 +159,7 @@ export default function Sidebar({
             </div>
           </div>
         )}
-        {userDetails?.account_type !== "FAMILY" && (
+        {(userDetails?.account_type !== "FAMILY" && walletExist) && (
           <>
             {!userDetails?.post_jobs ? (
               <div
@@ -204,8 +206,8 @@ export default function Sidebar({
                 }`}
               >
                 <div className="heading mb-5">
-                  <h1 className="title text-xl font-bold text-sky-blue">
-                    My Jobs
+                  <h1 className={`${!sidebar && 'text-center'} title text-xl font-bold text-sky-blue`}>
+                    Jobs
                   </h1>
                 </div>
                 <div className="items">
@@ -319,7 +321,7 @@ const ListItem = ({ sidebar, route, title, bubble, iconName, popup }) => {
         </span>
         <span
           className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
-            sidebar ? "active flex-1" : "w-0"
+            sidebar ? "active flex-1" : "hidden"
           }`}
         >
           {title && title}

src/services/UsersService.js

@@ -908,6 +908,24 @@ class usersService {
     return this.postAuxEnd("/uploads", postData);
   }
 
+   // FUNCTION FOR NEW FILE UPLOAD
+   sendFilesNew(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: apiConst.WRENCHBOARD_CONTRACT_MESSAGE,
+      ...reqData,
+    };
+
+    const formData = new FormData();
+    for (let data in postData) {
+      formData.append(data, postData[data]);
+    }
+
+    return this.postAuxEnd("/upload/contract", formData, true);
+  }
+
     // FUNCTION TO UPLOAD RESOURCE FILES
     uploadFile(reqData) {
       var postData = {

src/views/MyWalletPage.jsx

@@ -1,5 +1,19 @@
+import {useEffect} from 'react'
 import WalletRoutes from "../components/MyWallet/Wallet";
+import { useSelector } from "react-redux";
+import {useNavigate} from 'react-router-dom'
 
 export default function MyWalletPage() {
+  const {userDetails: { account_type, wallet_available_status }} = useSelector((state) => state?.userDetails);
+  const navigate = useNavigate()
+
+  useEffect(()=>{
+    let walletExist = wallet_available_status || localStorage.getItem('wallet_available_status')
+    console.log(walletExist)
+    if(account_type == 'FULL' && walletExist != 'WALLET_AVAILABLE'){
+      navigate('/', {replace: true})
+    }
+  },[])
+
   return <WalletRoutes />;
 }