Merge branch 'suggested-task-page' of WrenchBoard/Users-Wrench into master

src/components/FamilyAcc/Tabs/FamilyWaitlist.jsx

@@ -66,12 +66,12 @@ const FamilyWaitlist = ({ familyData, className, accountDetails, loader }) => {
                                 </p>
                               </div>
                             </div>
-                            <div className="px-2">
+                            <div className="px-2 flex flex-col items-center justify-center">
                               <p className="text-sm font-bold text-dark-gray dark:text-white">
                                 {addedDate}
                               </p>
-                              <p className="text-sm text-dark-gray dark:text-white">
-                                Status: {value.status_text}
+                              <p className="text-xs py-1.5 w-[70px] cursor-default tracking-wide rounded-full bg-gold text-white flex justify-center items-center">
+                                {value.status_text}
                               </p>
                             </div>
                           </div>
@@ -79,7 +79,10 @@ const FamilyWaitlist = ({ familyData, className, accountDetails, loader }) => {
                         <td className="text-right py-4 px-2">
                           <button
                             onClick={() =>
-                              setPopUp({ show: true, data: {...value, selectedImage} })
+                              setPopUp({
+                                show: true,
+                                data: { ...value, selectedImage },
+                              })
                             }
                             className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                           >

src/components/FamilyPopup/SuggestTask.jsx

@@ -1,7 +1,7 @@
 import { useState } from "react";
 import { useLocation } from "react-router-dom";
 import ModalCom from "../Helpers/ModalCom";
-import {Form, Formik } from "formik";
+import { Form, Formik } from "formik";
 import InputCom from "../Helpers/Inputs/InputCom";
 import usersService from "../../services/UsersService";
 import Icons from "../Helpers/Icons";
@@ -179,7 +179,11 @@ const SuggestTask = ({ details, onClose, situation }) => {
                             { title: "Duplicate" },
                             { title: "Not Now" },
                           ].map(({ title }, idx) => (
-                            <label key={idx} htmlFor="parent-suggested">
+                            <label
+                              role="group"
+                              key={idx}
+                              htmlFor="parent-suggested"
+                            >
                               <input
                                 type="radio"
                                 name="parent-suggested"
@@ -189,6 +193,7 @@ const SuggestTask = ({ details, onClose, situation }) => {
                                 className={`transition duration-150 ease-in-out parent-suggest`}
                               />
                               <span
+                                onClick={switchNextStep}
                                 className={`ml-1 ${
                                   title == "Not Now"
                                     ? "text-red-500"