Merge branch 'add-job-bug' of WrenchBoard/Users-Wrench into master

src/components/AddJob/AddJob.jsx

@@ -11,7 +11,7 @@ const validationSchema = Yup.object().shape({
   country: Yup.string()
     .min(1, "Minimum 3 characters")
     .max(25, "Maximum 25 characters")
-    .required("Country is required"),
+    .required("Currency is required"),
   price: Yup.string()
     .typeError("Invalid number")
     .min(1, "Price must be greater than 0")
@@ -46,12 +46,6 @@ function AddJob({ popUpHandler, categories }) {
   const { walletDetails } = useSelector((state) => state.walletDetails);
   let dispatch = useDispatch();
 
-  let [currency, setCurrency] = useState({
-    loading: true,
-    status: false,
-    data: null,
-  }); // To Hold the array of currency getUserCurrency returns
-
   let initialValues = {
     // initial values for formik
     country: "",
@@ -69,29 +63,8 @@ function AddJob({ popUpHandler, categories }) {
     message: "",
   }); // Holds state when submit button is pressed
 
-  // FUNCTION TO GET Currency
+  const getWalletDetail = (country) => { // A FUNCTION TO GET USER BALANCE BASED ON COUNTRY SELECTED
-  const getUserCurrency = () => {
+    const walletChecker = walletDetails?.data.find(
-    setCurrency((prev) => ({ ...prev, loading: true }));
-    ApiCall.getUserWallets()
-      .then((res) => {
-        if (res.data.internal_return < 0) {
-          setCurrency({ loading: false, status: true, data: [] });
-          return;
-        }
-
-        setCurrency({
-          loading: false,
-          status: true,
-          data: res.data.result_list,
-        });
-      })
-      .catch((err) => {
-        setCurrency({ loading: false, status: false, data: [] });
-      });
-  };
-
-  const getWalletDetail = (country) => {
-    const walletChecker = walletDetails.result_list.find(
       (item) => item.country === country
     );
     return walletChecker ? walletChecker.amount : 0;
@@ -108,7 +81,8 @@ function AddJob({ popUpHandler, categories }) {
       category: values.category?.join("@"),
     };
 
-    const walletAmount = getWalletDetail(reqData.country);
+    const walletAmount = getWalletDetail(reqData.country); // GETTING USER BALANCE BASED ON COUNTRY SELECTED
+
     if (reqData.price > walletAmount) {
       setRequestStatus({
         loading: false,
@@ -159,10 +133,6 @@ function AddJob({ popUpHandler, categories }) {
     }
   };
 
-  useEffect(() => {
-    getUserCurrency();
-  }, []);
-
   return (
     <div className="add-job p-5 w-full bg-white rounded-md flex flex-col justify-between">
       <Formik
@@ -197,16 +167,16 @@ function AddJob({ popUpHandler, categories }) {
                         onChange={props.handleChange}
                         onBlur={props.handleBlur}
                       >
-                        {currency.loading ? (
+                        {walletDetails.loading ? (
                           <option className="text-slate-500 text-lg" value="">
                             Loading...
                           </option>
-                        ) : currency.data.length ? (
+                        ) : walletDetails.data.length ? (
                           <>
                             <option className="text-slate-500 text-lg" value="">
                               Select a currency
                             </option>
-                            {currency.data?.map((item, index) => (
+                            {walletDetails.data?.map((item, index) => (
                               <option
                                 key={index}
                                 className="text-slate-500 text-lg"
@@ -384,6 +354,7 @@ function AddJob({ popUpHandler, categories }) {
                       <option value="">Select Duration</option>
                       {publicArray.map(({ name, duration }, idx) => (
                         <option
+                          key={idx}
                           className="text-slate-500 text-lg"
                           value={duration}
                         >

src/middleware/AuthRoute.jsx

@@ -227,7 +227,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
       .getRecentActivitiedData()
       .then((res) => {
         //   debugger;
-        if (res.data?.internal_return < 0) {
+        if (res?.data?.internal_return < 0) {
           return;
         }
         dispatch(recentActivitiesData(res.data));