Merged master into job-listing-bug

src/components/Blogs/index.jsx

@@ -36,7 +36,16 @@ export default function BlogItem(props) {
                 commonHeadData={props.commonHeadData}
             />
             <div className="notification-page w-full mb-10">
-                <div className="notification-wrapper w-full bg-white p-8">
+                <div className="mb-5">
+                    <h1 className="text-26 font-bold text-dark-gray dark:text-white">
+                        <span
+                            className={`${selectTab === "today" ? "block" : "hidden"}`}
+                        >
+                        {blogdata.data?.blogdata?.[0]?.post_title}
+                        </span>
+                    </h1>
+                </div>
+                <div className="notification-wrapper w-full bg-white p-8 rounded-2xl">
                     {blogdata.loading ? 
                         <LoadingSpinner size='8' color='sky-blue' height='h-[100px]' />
                     :
@@ -44,7 +53,7 @@ export default function BlogItem(props) {
                         <div className="w-full">
                             {/* heading */}
                             <div className="sm:flex justify-between items-center mb-6">
-                                <div className="mb-5 sm:mb-0">
+                                {/* <div className="mb-5">
                                     <h1 className="text-26 font-bold text-dark-gray dark:text-white">
                                         <span
                                             className={`${selectTab === "today" ? "block" : "hidden"}`}
@@ -52,7 +61,7 @@ export default function BlogItem(props) {
                                         {blogdata.data?.blogdata?.[0]?.post_title}
                                         </span>
                                     </h1>
-                                </div>
+                                </div> */}
                                 {/* <div className="slider-btns flex space-x-4">
                                 </div> */}
                             </div>

src/components/Cards/HomeBannerOffersCard.jsx

@@ -16,7 +16,8 @@ export default function HomeBannerOffersCard(props) {
 
   return (
     <Link
-      to={link_result}
+      // to={link_result}
+      to={link_result == '/blog-page' ? `${link_result}?blog_id=${props.itemData.blog_id}` : `${link_result}`}
       className="item p-2 w-full flex items-center min-h-[340px] bg-alice-blue bg-cover bg-center"
       style={{
         backgroundImage: `url('${imageUrl}')`,

src/components/Cards/ResourceBlogCard.jsx

@@ -50,22 +50,23 @@ export default function ProductCardStyleTwo({
         </div>
         <div className="details-area">
           {/* title */}
-          <a href={datas.guid} target="_blank" className="mb-2.5" rel="noreferrer">
+          <Link to={`/blog-page?blog_id=${datas.ID}`} className="mb-2.5" rel="noreferrer">
             <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
               {datas.post_title || "dummy title..."}
             </h1>
-          </a>
+          </Link>
           <div className="flex justify-between">
             <div className="flex items-center space-x-2"></div>
             <div className="my-1">
-              <a
+              <Link
-                href={datas.guid}
+                // href={datas.guid}
-                target="_blank"
+                // target="_blank"
+                to={`/blog-page?blog_id=${datas.ID}`}
                 className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
                 rel="noreferrer"
               >
                 View
-              </a>
+              </Link>
             </div>
           </div>
         </div>

src/components/MyJobs/MyJobTable.jsx

@@ -116,7 +116,7 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
           <div className="sm:flex sm:space-x-2 sm:justify-between sm:items-center job-items">
             <div className="flex space-x-2 items-center job-items w-full">
               <div className="w-[60px] h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
-                <img src={localImgLoad(`images/taskbanners/${value.banner}`)} alt="data" className="w-full h-full rounded-full" />
+                <img src={localImgLoad(`images/taskbanners/${value.banner ? value.banner : 'default.jpg'}`)} alt="data" className="w-full h-full rounded-full" />
               </div>
               <div className="flex flex-col flex-[0.9]">
                 <h1 className="font-bold text-xl text-dark-gray dark:text-white">
@@ -205,7 +205,7 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
         <LoadingSpinner size="16" color="sky-blue" />
       ) : (
         <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
-          <table className="table-auto min-w-full text-sm text-left text-gray-500 dark:text-gray-400">
+          <table className="table-auto min-w-full text-sm text-left text-gray-500 dark:text-gray-400 min-h-[500px]">
             <tbody>
               <>
                 {MyJobList &&

src/components/MyWallet/Popup/AddFundDollars.jsx

@@ -487,7 +487,7 @@ function AddFundDollars(props) {
 
                             {/* Postal Code and State */}
                             <div className="sm:grid gap-5 grid-cols-3 my-2">
-                              <div className="field w-full mb-6 xl:mb-0 col-span-1">
+                              <div className="field w-full xl:mb-0 col-span-1">
                                 <InputCom
                                   fieldClass="px-6"
                                   spanTag="*"
@@ -521,7 +521,7 @@ function AddFundDollars(props) {
                         </div>
                       </div>
 
-                      <div className="md:px-8 md:pt-4 px-4 pt-2 add-fund-btn flex justify-end items-center gap-3">
+                      <div className="md:px-8 add-fund-btn flex justify-end items-center gap-3">
                         <button
                           className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center items-center border-gradient text-base rounded-full"
                           onClick={handleClose}

src/components/MyWallet/Popup/ConfirmAddFund.jsx

@@ -291,6 +291,17 @@ function ConfirmAddFund({
     }
   };
 
+  const getBack = () => {
+    setConfirmCredit((prev) => ({
+      ...prev,
+      show: {
+        awaitConfirm: { loader: false, state: false },
+        acceptConfirm: { loader: false, state: false },
+      },
+      data: {},
+    }));
+  }
+
   return (
     <div className="content-wrapper w-full h-[32rem]">
       <div className="w-full mb-10">
@@ -359,9 +370,9 @@ function ConfirmAddFund({
           <div className="md:p-8 p-4 add-fund-btn flex justify-end items-center py-4 gap-4">
             <button
               className="px-4 h-11 flex justify-center items-center border-gradient text-base rounded-full"
-              onClick={onClose}
+              onClick={getBack}
             >
-              Cancel
+              Back
             </button>
             {__confirmCountry === "US" && (
               <button

src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx

@@ -89,11 +89,11 @@ function ConfirmNairaWithdraw({
                 loading: false,
                 status: false,
               }),
-            1500
+            5000
           );
         }
         setRequestStatus({
-          message: "transfer successful",
+          message: "Transfer Successful!",
           loading: false,
           status: true,
         });

src/components/MyWallet/Popup/ConfirmTransfer.jsx

@@ -60,14 +60,6 @@ function ConfirmTransfer({ payment, wallet }) {
       });
   };
 
-  useEffect(() => {
-    // what happens if not state redirect user
-    if (!state) {
-      navigate("/my-wallet/transfer-fund", { replace: true });
-    } else {
-      setPageLoading(false);
-    }
-  }, []);
   return (
     <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
       {pageLoading ? (

src/components/MyWallet/Popup/NairaWithdraw.jsx

@@ -1,6 +1,5 @@
 import { Form, Formik } from "formik";
 import React, { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
 import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import ModalCom from "../../Helpers/ModalCom";
@@ -13,7 +12,7 @@ function NairaWithdraw({
   state,
   setShowConfirmNairaWithdraw,
 }) {
-  const apiCall = new usersService(); 
+  const apiCall = new usersService();
   const [tab, setTab] = useState("previous");
   let [requestStatus, setRequestStatus] = useState(false);
 
@@ -630,7 +629,9 @@ function NairaWithdraw({
                                       className="text-slate-500 text-lg"
                                       value=""
                                     >
-                                      No Options Found!
+                                      {allCountries.data?.length
+                                        ? "Select..."
+                                        : "No Options Found!"}
                                     </option>
                                   )}
                                 </select>