Updates

components/utils/fetch/fetchApi.ts

@@ -68,17 +68,17 @@ export default async function fetchApi<
                         method: options,
                         headers: finalHeaders,
                     } as RequestInit);
-                    data = fetchData.json();
+                    data = await fetchData.json();
                     break;
 
                 default:
                     fetchData = await fetch(finalURL);
-                    data = fetchData.json();
+                    data = await fetchData.json();
                     break;
             }
         } catch (error: any) {
             console.log("FetchAPI error #1:", error.message);
-            data = null;
+            data = { success: false, msg: error.message };
         }
     } else if (typeof options === "object") {
         try {
@@ -93,6 +93,7 @@ export default async function fetchApi<
                 options.headers = _.merge(options.headers, finalHeaders);
 
                 const finalOptions: any = { ...options };
+
                 fetchData = await fetch(finalURL, finalOptions);
             } else {
                 const finalOptions = {
@@ -103,10 +104,10 @@ export default async function fetchApi<
                 fetchData = await fetch(finalURL, finalOptions);
             }
 
-            data = fetchData.json();
+            data = await fetchData.json();
         } catch (error: any) {
             console.log("FetchAPI error #2:", error.message);
-            data = null;
+            data = { success: false, msg: error.message };
         }
     } else {
         try {
@@ -114,7 +115,7 @@ export default async function fetchApi<
             data = await fetchData.json();
         } catch (error: any) {
             console.log("FetchAPI error #3:", error.message);
-            data = null;
+            data = { success: false, msg: error.message };
         }
     }