Merge pull request #1622 from benwbrum/conditionalize_icom

Merging as reviewed and passing non-travis tests.
benwbrum · Feb 18, 2020 · 7b775b8 · 7b775b8
2 parents bcdc11b + 98f8c18
commit 7b775b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/views/dashboard/owner.html.slim b/app/views/dashboard/owner.html.slim
@@ -51,4 +51,5 @@
     h3 Your Activity
     =deeds_for({ :user_id => current_user.id, :limit => 10 })
 
-=render partial: 'shared/intercom'
+-unless INTERCOM_APP_ID.blank?
+  =render partial: 'shared/intercom'
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
@@ -101,9 +101,9 @@ html lang="en-US"
     =javascript_include_tag 'application'
     =yield :javascript
 
-    -if user_signed_in? && current_user.owner?
+    -if user_signed_in? && current_user.owner? && !INTERCOM_APP_ID.blank?
       =render :partial => '/shared/intercom_customer'
-    -elsif controller_name=='static'
+    -elsif controller_name=='static' && !INTERCOM_APP_ID.blank?
       =render :partial => '/shared/intercom'
 
     -unless GA_ACCOUNT.blank?