From a560761a537304c54650b070d0ddc97fc0697693 Mon Sep 17 00:00:00 2001
From: Hetu Nandu <hetunandu@gmail.com>
Date: Fri, 14 Aug 2020 16:34:46 +0530
Subject: [PATCH] Fixes for Intercom check and alias paths

---
 app/client/src/pages/Editor/Explorer/hooks.ts | 2 +-
 app/client/src/pages/Editor/index.tsx         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/client/src/pages/Editor/Explorer/hooks.ts b/app/client/src/pages/Editor/Explorer/hooks.ts
index 509a4327a4..9478310dfa 100644
--- a/app/client/src/pages/Editor/Explorer/hooks.ts
+++ b/app/client/src/pages/Editor/Explorer/hooks.ts
@@ -19,7 +19,7 @@ import { Datasource } from "api/DatasourcesApi";
 import { debounce } from "lodash";
 import { WidgetProps } from "widgets/BaseWidget";
 import { evaluateDataTreeWithFunctions } from "selectors/dataTreeSelectors";
-import { ActionData } from "@appsmith/reducers/entityReducers/actionsReducer";
+import { ActionData } from "reducers/entityReducers/actionsReducer";
 import log from "loglevel";
 
 const findWidgets = (widgets: WidgetProps, keyword: string) => {
diff --git a/app/client/src/pages/Editor/index.tsx b/app/client/src/pages/Editor/index.tsx
index 971d3f15cf..49d458be55 100644
--- a/app/client/src/pages/Editor/index.tsx
+++ b/app/client/src/pages/Editor/index.tsx
@@ -98,7 +98,7 @@ class Editor extends Component<Props> {
     if (applicationId && pageId) {
       this.props.initEditor(applicationId, pageId);
     }
-    if (cloudHosting) {
+    if (cloudHosting && intercomAppID) {
       window.Intercom("boot", {
         // eslint-disable-next-line @typescript-eslint/camelcase
         app_id: intercomAppID,
@@ -110,7 +110,7 @@ class Editor extends Component<Props> {
     }
   }
   componentDidUpdate(previously: Props) {
-    if (cloudHosting) window.Intercom("update");
+    if (cloudHosting && intercomAppID) window.Intercom("update");
     if (
       previously.isPublishing &&
       !(this.props.isPublishing || this.props.errorPublishing)