site logo size reduced and aligned

src/components/MyWallet/Popup/AddFundDollars.jsx

@@ -313,7 +313,7 @@ function AddFundDollars(props) {
         )}
 
         {tab === "new" && (
-          <div className="new-details w-full max-h-[23rem]">
+          <div className="new-details w-full max-h-[22rem]">
             <div className="w-full flex flex-col justify-between">
               <Formik
                 initialValues={initialValues}
@@ -527,9 +527,9 @@ function AddFundDollars(props) {
                         </div>
                       </div>
 
-                      <div className="md:px-8 add-fund-btn flex justify-end items-center gap-3">
+                      <div className="add-fund-btn flex justify-end items-center gap-3 mt-4">
                         <button
-                          className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center items-center border-gradient text-base rounded-full"
+                          className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center bg-[#f5a430] text-black items-center text-base rounded-full"
                           onClick={handleClose}
                         >
                           Cancel
@@ -558,9 +558,9 @@ function AddFundDollars(props) {
       </div>
 
       {tab == "previous" && (
-        <div className="md:py-8 px-[38px] add-fund-btn flex justify-end items-center gap-4 py-4">
+        <div className="md:py-8 add-fund-btn flex justify-end items-center gap-4 py-4">
           <button
-            className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center items-center border-gradient text-base rounded-full"
+            className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center bg-[#f5a430] text-black items-center text-base rounded-full"
             onClick={props.onClose}
           >
             Cancel

src/components/MyWallet/Popup/AddFundPop.jsx

@@ -138,12 +138,12 @@ function AddFundPop({
               </div>
             )}
 
-            {countryWallet == "NG" && <div className="h-[18rem]"></div>}
+            {countryWallet == "NG" && <div className="h-[19rem]"></div>}
 
             {countryWallet == "NG" && (
               <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 btn-gradient text-base rounded-full text-white"
+                  className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center items-center bg-[#f5a430] text-black text-base rounded-full"
                   onClick={onClose}
                 >
                   Cancel

src/components/MyWallet/Popup/CompleteConfirmCredit.jsx

@@ -63,7 +63,8 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
                     </h1>
                   </div>
 
-                  {data?.internal_return >= 0 ? (
+                  {data?.internal_return >= 0 &&
+                  data?.result !== "Charge failed" ? (
                     <>
                       <div className="flex items-center gap-8">
                         <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">

src/components/MyWallet/Popup/ConfirmAddFund.jsx

@@ -111,7 +111,7 @@ function ConfirmAddFund({
   });
 
   const config = {
-    public_key: process.env.REACT_APP_FLUTTERWAVE_APIKEY,
+    public_key: __confirmData?.flutterwave_key,
     tx_ref: __confirmData?.credit_reference,
     currency: "NGN",
     amount: Number(__confirmData.amount),
@@ -379,7 +379,7 @@ function ConfirmAddFund({
           <hr />
           <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"
+              className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center bg-[#f5a430] text-black items-center border-gradient text-base rounded-full"
               onClick={getBack}
             >
               Back

src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx

@@ -1,10 +1,10 @@
 import { useState } from "react";
+import { useDispatch } from "react-redux";
 import usersService from "../../../services/UsersService";
+import { tableReload } from "../../../store/TableReloads";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import ModalCom from "../../Helpers/ModalCom";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
-import { useDispatch } from "react-redux";
-import { tableReload } from "../../../store/TableReloads";
 
 function ConfirmNairaWithdraw({
   payment,
@@ -393,7 +393,7 @@ function ConfirmNairaWithdraw({
                     <button
                       type="button"
                       onClick={action}
-                      className="border-gradient text-base tracking-wide px-4 py-2 rounded-full"
+                      className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center items-center bg-[#f5a430] text-black text-base rounded-full"
                     >
                       <span className="text-gradient">Cancel</span>
                     </button>

src/components/MyWallet/Popup/CreditPopup.jsx

@@ -25,8 +25,10 @@ const CreditPopup = ({ details, onClose, situation, walletItem }) => {
         <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
           <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
             {confirmCredit?.show?.acceptConfirm?.state &&
-            (confirmCredit?.data?.internal_return < 0 ||
-              confirmCredit?.data?.status !== "successful") ? (
+            (confirmCredit?.data?.internal_return < 0 
+              // ||
+              // confirmCredit?.data?.status !== "successful"
+              ) ? (
               "Credit Unsuccessful"
             ) : (
               <>

src/components/MyWallet/Popup/NairaWithdraw.jsx

@@ -171,7 +171,7 @@ function NairaWithdraw({
         setErrorMsgs({ amount: "amount required" });
         setTimeout(() => setErrorMsgs({ amount: "" }), 3000);
         return;
-      }else      if (Number(values.amount * 100) > Number(wallet?.transfer_limit)) {
+      } else if (Number(values.amount * 100) > Number(wallet?.transfer_limit)) {
         setErrorMsgs({ amount: "Withdraw limit has been exceeded" });
         setTimeout(() => setErrorMsgs({ amount: "" }), 3000);
         return;
@@ -796,7 +796,7 @@ function NairaWithdraw({
                       <button
                         type="button"
                         onClick={action}
-                        className="border-gradient text-base tracking-wide px-4 py-2 rounded-full"
+                        className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center bg-[#f5a430] text-black items-center border-gradient text-base rounded-full"
                       >
                         <span className="text-gradient">Cancel</span>
                       </button>

src/components/Partials/Layout.jsx

@@ -62,7 +62,7 @@ export default function Layout({ children }) {
               drawer
                 ? "2xl:w-[335px] w-[280px] 2xl:pl-20 pl-10 pr-6 "
                 : "w-[70px]"
-            } bg-white dark:bg-dark-white   h-full overflow-y-scroll overflow-style-none fixed left-0 top-0 pt-8`}
+            } bg-white dark:bg-dark-white   h-full overflow-y-scroll overflow-style-none fixed left-0 top-0 pt-[30px]`}
           >
             <Sidebar
               logoutModalHandler={logoutModalHandler}

src/components/Partials/Sidebar.jsx

@@ -39,7 +39,7 @@ export default function Sidebar({
       {/* logo-area */}
       <div
         className={`w-full flex items-center transition-all duration-300 ease-in-out ${
-          sidebar ? "justify-between  mb-14" : "justify-center"
+          sidebar ? "justify-start gap-3  mb-14" : "justify-center"
         }`}
       >
         <div className={`sidebar-logo ${sidebar ? "enter" : ""}`}>

src/components/jobPopout/PendingJobsPopout.jsx

@@ -42,18 +42,18 @@ function PendingJobsPopout({ details, onClose, situation }) {
         setPendingJobLoader({ extend: true });
         apiCall.pendingJobExtend(reqData).then(res => {
           setRequestMessage({status: true, message: res.data.status})
-          dispatch(tableReload({ type: "PENDINGTABLE" }));
           setTimeout(() => {
             setPendingJobLoader({ extend: false, offer: false });
             setRequestMessage({status: false, message: ''})
             onClose();
-          }, 2700);
+            dispatch(tableReload({ type: "PENDINGTABLE" }));
+          }, 4000);
         }).catch(error => {
           setRequestMessage({status: false, message:'Try Again'})
           setTimeout(() => {
             setPendingJobLoader({ extend: false, offer: false });
             setRequestMessage({status: false, message: ''})
-          }, 2700);
+          }, 3000);
         })
       }else if(name=='offer'){ // RUNS THIS IF JOB IS SENT TO USER
         reqData = { ...pendingData };
@@ -63,13 +63,13 @@ function PendingJobsPopout({ details, onClose, situation }) {
           setTimeout(() => {
             setPendingJobLoader({ extend: false, offer: false });
             setRequestMessage({status: false, message: ''})
-          }, 2700);
+          }, 4000);
         }).catch(error => {
           setRequestMessage('Try Again')
           setTimeout(() => {
             setPendingJobLoader({ extend: false, offer: false });
             setRequestMessage({status: false, message: ''})
-          }, 2700);
+          }, 3000);
         })
       } else return
       // try {

src/index.css

@@ -303,7 +303,7 @@ input[type="text"][dir="rtl"] {
 
 .sidebar-logo.enter {
   transform: scale(1);
-  width: 100%;
+  width: 80%;
 }
 .sidebar-logo {
   transform: scale(0);

src/views/MyPendingJobsPage.jsx

@@ -7,12 +7,11 @@ export default function MyPendingJobsPage() {
   let { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
   let { pendingListTable } = useSelector((state) => state.tableReload);
 
-  console.log('TESTING', pendingListTable)
-
   const [MyJobList, setMyJobList] = useState({loading: true, data: []});
   const api = new usersService();
 
   const getMyJobList = async () => {
+    setMyJobList({loading: true, data: []});
     try {
       const res = await api.getMyPendingJobList();
       setMyJobList({loading: false, data: res.data});