From 5e5325ed3563c7f4af76b7e38fcb5d311cb5f319 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Tue, 2 Jun 2020 13:01:31 +0300
Subject: [PATCH] Fix error handling in Ack and Exec modals

---
 src/panel-triggers/components/AckModal.tsx        | 3 ++-
 src/panel-triggers/components/ExecScriptModal.tsx | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/panel-triggers/components/AckModal.tsx b/src/panel-triggers/components/AckModal.tsx
index af4478a..8544e54 100644
--- a/src/panel-triggers/components/AckModal.tsx
+++ b/src/panel-triggers/components/AckModal.tsx
@@ -135,8 +135,9 @@ export class AckModalUnthemed extends PureComponent<Props, State> {
     this.props.onSubmit(ackData).then(() => {
       this.dismiss();
     }).catch(err => {
+      const errorMessage = err.data?.message || err.data?.error || err.data || err.statusText || '';
       this.setState({
-        ackError: err.message || err.data,
+        ackError: errorMessage,
         loading: false,
       });
     });
diff --git a/src/panel-triggers/components/ExecScriptModal.tsx b/src/panel-triggers/components/ExecScriptModal.tsx
index 58a5e8b..e9a5f7b 100644
--- a/src/panel-triggers/components/ExecScriptModal.tsx
+++ b/src/panel-triggers/components/ExecScriptModal.tsx
@@ -93,7 +93,7 @@ export class ExecScriptModalUnthemed extends PureComponent<Props, State> {
         this.setState({ error: true, errorMessage: message, loading: false });
       }
     }).catch(err => {
-      let errorMessage = err.message || err.data || '';
+      let errorMessage = err.data?.message || err.data?.error || err.data || err.statusText || '';
       errorMessage = this.formatResult(errorMessage);
       this.setState({
         error: true,