From 7443c16e59ae424677be7e738362feb0be0adefa Mon Sep 17 00:00:00 2001
From: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com>
Date: Thu, 24 Mar 2022 16:50:43 +0530
Subject: [PATCH] fix: show the error message received from the server when
 sending test email fails (#11972)

---
 app/client/src/sagas/SuperUserSagas.tsx | 52 ++++++++++++-------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/app/client/src/sagas/SuperUserSagas.tsx b/app/client/src/sagas/SuperUserSagas.tsx
index 1cc67b6869..f633b22208 100644
--- a/app/client/src/sagas/SuperUserSagas.tsx
+++ b/app/client/src/sagas/SuperUserSagas.tsx
@@ -110,34 +110,32 @@ function* SendTestEmail(action: ReduxAction<SendTestEmailPayload>) {
   try {
     const response = yield call(UserApi.sendTestEmail, action.payload);
     const currentUser = yield select(getCurrentUser);
-    let actionElement;
-    if (response.data) {
-      actionElement = (
-        <>
-          <br />
-          <span onClick={() => window.open(EMAIL_SETUP_DOC, "blank")}>
-            {createMessage(TEST_EMAIL_SUCCESS_TROUBLESHOOT)}
-          </span>
-        </>
-      );
+    const isValidResponse = yield validateResponse(response);
+
+    if (isValidResponse) {
+      let actionElement;
+      if (response.data) {
+        actionElement = (
+          <>
+            <br />
+            <span onClick={() => window.open(EMAIL_SETUP_DOC, "blank")}>
+              {createMessage(TEST_EMAIL_SUCCESS_TROUBLESHOOT)}
+            </span>
+          </>
+        );
+      }
+      Toaster.show({
+        actionElement,
+        text: createMessage(
+          response.data
+            ? TEST_EMAIL_SUCCESS(currentUser?.email)
+            : TEST_EMAIL_FAILURE,
+        ),
+        hideProgressBar: true,
+        variant: response.data ? Variant.info : Variant.danger,
+      });
     }
-    Toaster.show({
-      actionElement,
-      text: createMessage(
-        response.data
-          ? TEST_EMAIL_SUCCESS(currentUser?.email)
-          : TEST_EMAIL_FAILURE,
-      ),
-      hideProgressBar: true,
-      variant: response.data ? Variant.info : Variant.danger,
-    });
-  } catch (e) {
-    Toaster.show({
-      text: e?.message || createMessage(TEST_EMAIL_FAILURE),
-      hideProgressBar: true,
-      variant: Variant.danger,
-    });
-  }
+  } catch (e) {}
 }
 
 function* InitSuperUserSaga(action: ReduxAction<User>) {