Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into task-layout

src/components/MyActiveJobs/ActiveJobs.jsx

@@ -3,6 +3,7 @@ import { useSelector } from "react-redux";
 import ModalCom from "../Helpers/ModalCom";
 import Layout from "../Partials/Layout";
 import { useLocation, useNavigate } from "react-router-dom";
+import ActiveJobMessage from "./ActiveJobMessage";
 
 function ActiveJobs() {
   let { userDetails } = useSelector((state) => state.userDetails);
@@ -120,6 +121,7 @@ function ActiveJobs() {
                       <span className="text-white">Send</span>
                   </button>
                 </div>
+
               </div>
               {/* end of Buttons Sections  */}
             </div>
@@ -138,11 +140,7 @@ function ActiveJobs() {
             <div className="mt-5 bg-white p-4 rounded-md shadow-md">
               <div className="">
                 <p className="text-lg font-bold text-dark-gray dark:text-black tracking-wide">Message</p>
-                <textarea
+                <ActiveJobMessage />
-                  className="p-4 w-full text-base text-slate-600 border border-slate-300 outline-none rounded-md"
-                  rows="10"
-                  style={{ resize: "none" }}
-                />
               </div>
             </div>
 

src/components/MyActiveJobs/MyActiveJobTable.jsx

@@ -96,15 +96,17 @@ export default function MyActiveJobTable({ MyJobList, className }) {
                         </td>
 
                         <td className="text-right py-4 px-2">
-                          <button
+                          <div className="flex justify-center items-center">
-                            type="button"
+                            <button
-                            onClick={() => {
+                              type="button"
-                              navigate('/manage-active-job', {state:value});
+                              onClick={() => {
-                            }}
+                                navigate('/manage-active-job', {state:value});
-                            className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                              }}
-                          >
+                              className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                            View
+                            >
-                          </button>
+                              View
+                            </button>
+                          </div>
                         </td>
                       </tr>
                     ))}