Merge branch 'home-banners-dashboard' of WrenchBoard/Users-Wrench into master

src/components/FamilyAcc/FamilyTable.jsx

@@ -55,7 +55,8 @@ export default function FamilyTable({
     banner,
     enable_traking,
     profile_picture,
-    imageServer
+    imageServer,
+    username
   }) => {
     // Check for valid dates
     const addedDate = added ? added.split(" ")[0] : "N/A";
@@ -87,7 +88,7 @@ export default function FamilyTable({
             </div>
             <div className="flex flex-col flex-[0.9]">
               <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                {`${firstname} ${lastname} (${age < 10 ? `0${age}` : age})`}
+                {`${firstname} ${lastname} (${username})`}
               </h1>
               <span className="text-sm text-thin-light-gray">
                 Added: <span className="text-purple ml-1">{addedDate}</span>

src/components/MyActiveJobs/ActiveJobs.jsx

@@ -286,7 +286,7 @@ function ActiveJobs(props) {
                 <path d="M19 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H19v-2z" />
               </svg>
             </button>
-            <h1 className="text-xl lg:text-2xl font-bold text-dark-gray dark:text-white tracking-wide">
+            <h1 className="text-[22px] font-bold text-dark-gray dark:text-white tracking-wide">
               {props.details?.title && props.details.title}
             </h1>
           </div>
@@ -412,7 +412,7 @@ function ActiveJobs(props) {
               </div>
               {tab == "message" ? (
                 <textarea
-                  className="p-4 w-full h-[300px] text-base text-slate-600 dark:text-white bg-white dark:bg-black border border-slate-300 outline-none"
+                  className="p-4 w-full h-[200px] text-base text-slate-600 dark:text-white bg-white dark:bg-black border border-slate-300 outline-none"
                   // rows="10"
                   style={{ resize: "none" }}
                   name="message"
@@ -538,13 +538,13 @@ function ActiveJobs(props) {
             <p className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">
               Message
             </p>
-            <button
+            {/* <button
               type="button"
               onClick={popUpHandler}
               className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer flex justify-center items-center"
             >
               View all
-            </button>
+            </button> */}
           </div>
           {props.activeJobMesList.loading ? (
             <LoadingSpinner size="16" color="sky-blue" />

src/components/MyActiveJobs/JobActions/ReviewJobAction.jsx

@@ -112,7 +112,7 @@ function ReviewJobAction({jobDetails}) {
               <tr>
                   <td>
                       <div className="flex justify-center items-center">
-                          <button  type="button" onClick={popUpHandler} className="w-[150px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                          <button  type="button" onClick={popUpHandler} className="w-[130px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
                              Reject or Accept
                           </button>
                       </div>

src/views/ManageActiveJobs.jsx

@@ -39,7 +39,7 @@ function ManageActiveJobs() {
           loading: false,
           error: false,
           data: res.data.result_list,
-          image: res.data.session_image_server
+          image: res.data.session_image_server,
         });
       })
       .catch((error) => {