src/components/master/CreateActivity.jsx

@@ -111,14 +111,6 @@ const CreateActivity = ({ onClose }) => {
     reset();
     onClose();
   };
-
-
-
-  // for tooltip
-  useEffect(() => {
-    const tooltipTriggerList = Array.from(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
-    tooltipTriggerList.forEach((el) => new bootstrap.Tooltip(el));
-  }, []);
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
       <h6>Create Activity</h6>
@@ -205,9 +197,7 @@ const CreateActivity = ({ onClose }) => {
                       onClick={() => removeChecklistItem(index)}
                       className="btn btn-xs btn-icon btn-text-secondary"
                     >
-                      <i class="bx bxs-minus-circle text-danger"  data-bs-toggle="tooltip"
-                title="Remove Check"
-                data-bs-original-title="Remove check"></i>
+                      <i class="bx bxs-minus-circle text-danger"></i>
                     </button>
                   </td>
                 </tr>
@@ -220,9 +210,7 @@ const CreateActivity = ({ onClose }) => {
             className="btn btn-xs btn-primary mt-2"
             onClick={addChecklistItem}
           >
-            <i class="bx bx-plus-circle" data-bs-toggle="tooltip"
-                title="Add Check"
-                data-bs-original-title="Add check" ></i>
+            <i class="bx bx-plus-circle"></i>
           </button>
         </div>
 

src/components/master/EditActivity.jsx

@@ -123,13 +123,6 @@ const UpdateActivity = ({ activityData, onClose }) => {
     remove(index);
   };
 
-
-    // for tooltip
-      useEffect(() => {
-        const tooltipTriggerList = Array.from(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
-        tooltipTriggerList.forEach((el) => new bootstrap.Tooltip(el));
-      }, []);
-
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
       <h6>Update Activity</h6>
@@ -213,12 +206,9 @@ const UpdateActivity = ({ activityData, onClose }) => {
                        <button
                          type="button"
                          onClick={() => removeChecklistItem(index)}
-                       className="btn btn-xs btn-icon btn-text-secondary"
-                       
+                         className="btn btn-xs btn-icon btn-text-secondary"
                        >
-                         <i className="bx bxs-minus-circle text-danger"data-bs-toggle="tooltip"
-                title="Add Check"
-                data-bs-original-title="Add check"  ></i>
+                         <i className="bx bxs-minus-circle text-danger"></i>
                        </button>
                      </td>
                    </tr>
@@ -233,9 +223,7 @@ const UpdateActivity = ({ activityData, onClose }) => {
             className="btn btn-xs btn-primary mt-2"
             onClick={addChecklistItem}
           >
-         <i class="bx bx-plus-circle" data-bs-toggle="tooltip"
-                title="Add Check"
-                data-bs-original-title="Add check" ></i>
+        <i className="bx bx-plus-circle"></i>
           </button>
         </div>
 

src/components/master/MasterModal.jsx

@@ -19,13 +19,9 @@ const MasterModal = ({ modaldata, closeModal }) => {
       aria-labelledby="modalToggleLabel"
     >
       <div
-        className={`modal-dialog mx-sm-auto mx-1 ${
-          ["Application Role", "Edit-Application Role"].includes(
-            modaldata?.modalType
-          )
-            ? "modal-lg"
-            : "modal-md"
-        } modal-simple`}
+        className={`modal-dialog  mx-sm-auto mx-1 ${
+          modaldata?.modalType === "delete" || `Ativity` ? "modal-md" : "modal-lg"
+        } modal-simple `}
       >
         <div className="modal-content">
           <div className="modal-body p-sm-4 p-0">
@@ -56,13 +52,10 @@ const MasterModal = ({ modaldata, closeModal }) => {
               <EditJobRole data={modaldata.item} onClose={closeModal} />
             )}
             {modaldata?.modalType === "Activity" && (
-              <CreateActivity onClose={closeModal} />
-            )}
-            {modaldata?.modalType === "Edit-Activity" && (
-              <EditActivity
-                activityData={modaldata.item}
-                onClose={closeModal}
-              />
+              <CreateActivity onClose={closeModal} /> )
+            }
+            {modaldata?.modalType === 'Edit-Activity' && (
+              <EditActivity activityData={modaldata.item} onClose={closeModal} />
             )}
           </div>
         </div>

src/pages/authentication/LoginPage.jsx

@@ -88,6 +88,7 @@ const LoginPage = () => {
             <label className="form-label" htmlFor="password">
               Password
             </label>
+      
           </div>
           <div className="input-group input-group-merge">
             <input
@@ -100,22 +101,16 @@ const LoginPage = () => {
               placeholder="&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;"
               aria-describedby="password"
             />
-            <button
-              type="button"
-              className="btn border-top border-end border-bottom"
+            <span
+              className="input-group-text cursor-pointer"
               onClick={() => setHidepass(!hidepass)}
-              style={{
-                borderTopLeftRadius: 0,
-                borderBottomLeftRadius: 0,
-                borderLeft: 0,
-              }}
             >
               {hidepass ? (
-                <i className="bx bx-hide" />
+                <i className="bx bx-hide"></i>
               ) : (
-                <i className="bx bx-show" />
+                <i className="bx bx-show"></i>
               )}
-            </button>
+            </span>
           </div>
           {errors.password && (
             <div
@@ -135,14 +130,16 @@ const LoginPage = () => {
               name="rememberMe"
               {...register("rememberMe")}
             />
-            <label className="form-check-label ms-2">Remember Me</label>
+            <label className="form-check-label ms-2" >
+              Remember Me
+            </label>
           </div>
           <Link
-            aria-label="Go to Forgot Password Page"
-            to="/auth/forgot-password"
-          >
-            <span>Forgot Password?</span>
-          </Link>
+              aria-label="Go to Forgot Password Page"
+              to="/auth/forgot-password"
+            >
+              <span>Forgot Password?</span>
+            </Link>
         </div>
         <div className="mb-3">
           <button

src/pages/authentication/ResetPasswordPage.jsx

@@ -118,23 +118,16 @@ const ResetPasswordPage = () => {
               placeholder="············"
               aria-describedby="password"
             />
-            <button
-              type="button"
-              className="btn btn-outline-secondy border-top border-end border-bottom "
+            <span
+              className="input-group-text lcursor-pointer"
               onClick={() => setHidepass(!hidepass)}
-              style={{
-                borderTopLeftRadius: 0,
-                borderBottomLeftRadius: 0,
-                borderLeft: 0,
-                
-              }}
             >
               {hidepass ? (
-                <i className="bx bx-hide" />
+                <i className="bx bx-hide"></i>
               ) : (
-                <i className="bx bx-show" />
+                <i className="bx bx-show"></i>
               )}
-            </button>
+            </span>
           </div>
           {errors.password && (
             <div
@@ -161,23 +154,16 @@ const ResetPasswordPage = () => {
               placeholder="&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;"
               aria-describedby="password"
             />
-             <button
-              type="button"
-              className="btn border-top border-end border-bottom "
+            <span
+              className="input-group-text cursor-pointer"
               onClick={() => setHidepass1(!hidepass1)}
-              style={{
-                borderTopLeftRadius: 0,
-                borderBottomLeftRadius: 0,
-                borderLeft: 0,
-                
-              }}
             >
               {hidepass1 ? (
-                <i className="bx bx-hide" />
+                <i className="bx bx-hide"></i>
               ) : (
-                <i className="bx bx-show" />
+                <i className="bx bx-show"></i>
               )}
-            </button>
+            </span>
           </div>
           {errors.confirmPassword && (
             <div