From bf32784cccd9670ddc4c9be75e9029bdd43ede50 Mon Sep 17 00:00:00 2001
From: Rudhra Deep Biswas <98055396+rudeUltra@users.noreply.github.com>
Date: Tue, 25 Jun 2024 12:53:52 +0530
Subject: [PATCH] added conditional checks for toast error messages (#10165)

---
 frontend/src/HomePage/Folders.jsx     |  8 ++++++-
 frontend/src/HomePage/HomePage.jsx    | 34 +++++++++++++++++++++++----
 frontend/src/_components/AppModal.jsx |  8 ++++++-
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/frontend/src/HomePage/Folders.jsx b/frontend/src/HomePage/Folders.jsx
index 9b8a1c4f92..03b3cf4541 100644
--- a/frontend/src/HomePage/Folders.jsx
+++ b/frontend/src/HomePage/Folders.jsx
@@ -138,7 +138,13 @@ export const Folders = function Folders({
         handleFolderChange({});
       })
       .catch(({ error }) => {
-        toast.error(error);
+        let errorMessage = 'Some Error Occured';
+        if (error?.error) {
+          errorMessage = error.error;
+        } else if (error?.message) {
+          errorMessage = error.message;
+        }
+        toast.error(errorMessage);
         setShowDeleteConfirmation(false);
         setDeletionStatus(false);
       });
diff --git a/frontend/src/HomePage/HomePage.jsx b/frontend/src/HomePage/HomePage.jsx
index e3dc6f41dc..e82aa96dda 100644
--- a/frontend/src/HomePage/HomePage.jsx
+++ b/frontend/src/HomePage/HomePage.jsx
@@ -239,7 +239,13 @@ class HomePageComponent extends React.Component {
       };
       event.target.value = null;
     } catch (error) {
-      toast.error(error.message);
+      let errorMessage = 'Some Error Occured';
+      if (error?.error) {
+        errorMessage = error.error;
+      } else if (error?.message) {
+        errorMessage = error.message;
+      }
+      toast.error(errorMessage);
     }
   };
 
@@ -272,7 +278,7 @@ class HomePageComponent extends React.Component {
       if (error.statusCode === 409) {
         return false;
       }
-      toast.error(error?.error || 'App import failed');
+      toast.error(error?.error || error?.message || 'App import failed');
     }
   };
 
@@ -429,7 +435,13 @@ class HomePageComponent extends React.Component {
       })
       .catch(({ error }) => {
         this.setState({ appOperations: { ...appOperations, isAdding: false } });
-        toast.error(error);
+        let errorMessage = 'Some Error Occured';
+        if (error?.error) {
+          errorMessage = error.error;
+        } else if (error?.message) {
+          errorMessage = error.message;
+        }
+        toast.error(errorMessage);
       });
   };
 
@@ -449,7 +461,13 @@ class HomePageComponent extends React.Component {
         this.fetchFolders();
       })
       .catch(({ error }) => {
-        toast.error(error);
+        let errorMessage = 'Some Error Occured';
+        if (error?.error) {
+          errorMessage = error.error;
+        } else if (error?.message) {
+          errorMessage = error.message;
+        }
+        toast.error(errorMessage);
       })
       .finally(() => {
         this.setState({
@@ -535,7 +553,13 @@ class HomePageComponent extends React.Component {
       })
       .catch(({ error }) => {
         this.setState({ appOperations: { ...appOperations, isAdding: false } });
-        toast.error(error);
+        let errorMessage = 'Some Error Occured';
+        if (error?.error) {
+          errorMessage = error.error;
+        } else if (error?.message) {
+          errorMessage = error.message;
+        }
+        toast.error(errorMessage);
       });
   };
 
diff --git a/frontend/src/_components/AppModal.jsx b/frontend/src/_components/AppModal.jsx
index c2530e44ea..98ad7cb1eb 100644
--- a/frontend/src/_components/AppModal.jsx
+++ b/frontend/src/_components/AppModal.jsx
@@ -90,7 +90,13 @@ export function AppModal({
           closeModal();
         }
       } catch (error) {
-        toast.error(e.error, {
+        let errorMessage = 'Some Error Occured';
+        if (error?.error) {
+          errorMessage = error.error;
+        } else if (error?.message) {
+          errorMessage = error.message;
+        }
+        toast.error(errorMessage, {
           position: 'top-center',
         });
       }