Merge branch 'pending-job-refresh' of WrenchBoard/Users-Wrench into master

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),

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/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});