From 3a5cad0c6aee33e407bf57414c09ca5f9cd2d5e4 Mon Sep 17 00:00:00 2001
From: Rudhra Deep Biswas <98055396+rudeUltra@users.noreply.github.com>
Date: Wed, 26 Jun 2024 14:47:37 +0530
Subject: [PATCH] error object fix (#10189)

---
 frontend/src/HomePage/Folders.jsx             |  8 +------
 frontend/src/HomePage/HomePage.jsx            | 24 +++----------------
 .../src/ResetPassword/ResetPasswordPage.jsx   |  2 +-
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/frontend/src/HomePage/Folders.jsx b/frontend/src/HomePage/Folders.jsx
index bd712e0460..2f21c0293f 100644
--- a/frontend/src/HomePage/Folders.jsx
+++ b/frontend/src/HomePage/Folders.jsx
@@ -138,13 +138,7 @@ export const Folders = function Folders({
         handleFolderChange({});
       })
       .catch(({ error }) => {
-        let errorMessage = 'Some Error Occured';
-        if (error?.error) {
-          errorMessage = error.error;
-        } else if (error?.message) {
-          errorMessage = error.message;
-        }
-        toast.error(errorMessage);
+        toast.error(error);
         setShowDeleteConfirmation(false);
         setDeletionStatus(false);
       });
diff --git a/frontend/src/HomePage/HomePage.jsx b/frontend/src/HomePage/HomePage.jsx
index b3d45b31f5..945987efd8 100644
--- a/frontend/src/HomePage/HomePage.jsx
+++ b/frontend/src/HomePage/HomePage.jsx
@@ -435,13 +435,7 @@ class HomePageComponent extends React.Component {
       })
       .catch(({ error }) => {
         this.setState({ appOperations: { ...appOperations, isAdding: false } });
-        let errorMessage = 'Some Error Occured';
-        if (error?.error) {
-          errorMessage = error.error;
-        } else if (error?.message) {
-          errorMessage = error.message;
-        }
-        toast.error(errorMessage);
+        toast.error(error);
       });
   };
 
@@ -461,13 +455,7 @@ class HomePageComponent extends React.Component {
         this.fetchFolders();
       })
       .catch(({ error }) => {
-        let errorMessage = 'Some Error Occured';
-        if (error?.error) {
-          errorMessage = error.error;
-        } else if (error?.message) {
-          errorMessage = error.message;
-        }
-        toast.error(errorMessage);
+        toast.error(error);
       })
       .finally(() => {
         this.setState({
@@ -553,13 +541,7 @@ class HomePageComponent extends React.Component {
       })
       .catch(({ error }) => {
         this.setState({ appOperations: { ...appOperations, isAdding: false } });
-        let errorMessage = 'Some Error Occured';
-        if (error?.error) {
-          errorMessage = error.error;
-        } else if (error?.message) {
-          errorMessage = error.message;
-        }
-        toast.error(errorMessage);
+        toast.error(error);
       });
   };
 
diff --git a/frontend/src/ResetPassword/ResetPasswordPage.jsx b/frontend/src/ResetPassword/ResetPasswordPage.jsx
index 23c2537a38..b5e0ab9846 100644
--- a/frontend/src/ResetPassword/ResetPasswordPage.jsx
+++ b/frontend/src/ResetPassword/ResetPasswordPage.jsx
@@ -129,7 +129,7 @@ class ResetPasswordComponent extends React.Component {
                           )}
                         </div>
                         <span className="tj-input-helper-text" data-cy="password-helper-text">
-                          Password must be at least 5 characters
+                          Password should be at least 5 characters
                         </span>
 
                         <span></span>