From a0b195882778cc5d562851b0889059166b2ff21f Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Wed, 7 Oct 2020 12:15:34 +0200
Subject: [PATCH] default to standard error message

---
 .../editor_frame/workspace_panel/workspace_panel.tsx            | 2 +-
 .../editor_frame_service/embeddable/expression_wrapper.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
index 621b154ad56bc0..2bbf183b7ae115 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
@@ -345,7 +345,7 @@ export const InnerVisualizationWrapper = ({
         reload$={autoRefreshFetch$}
         onEvent={onEvent}
         renderError={(errorMessage?: string | null, error?: ExpressionRenderError | null) => {
-          const visibleErrorMessage = getOriginalRequestErrorMessage(error) ?? errorMessage;
+          const visibleErrorMessage = getOriginalRequestErrorMessage(error) || errorMessage;
           return (
             <EuiFlexGroup style={{ maxWidth: '100%' }} direction="column" alignItems="center">
               <EuiFlexItem>
diff --git a/x-pack/plugins/lens/public/editor_frame_service/embeddable/expression_wrapper.tsx b/x-pack/plugins/lens/public/editor_frame_service/embeddable/expression_wrapper.tsx
index 135562085e72fb..4fb0630a305e79 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/embeddable/expression_wrapper.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/embeddable/expression_wrapper.tsx
@@ -59,7 +59,7 @@ export function ExpressionWrapper({
                   </EuiFlexItem>
                   <EuiFlexItem>
                     <EuiText size="s">
-                      {getOriginalRequestErrorMessage(error) ?? errorMessage}
+                      {getOriginalRequestErrorMessage(error) || errorMessage}
                     </EuiText>
                   </EuiFlexItem>
                 </EuiFlexGroup>