From e41957ae02c27a6ebce11e02642a468fa5b9d33b Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 15 Jun 2021 21:23:16 +0530
Subject: [PATCH] fix: Campaign message is hiding the conversation view after
 opening the widget (#2428)

* Fix the widget triggered- campain collision

* fix spelling mistakes
---
 app/javascript/widget/App.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index b7d67dad8..60c02076f 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -33,6 +33,7 @@ export default {
       hideMessageBubble: false,
       widgetPosition: 'right',
       showPopoutButton: false,
+      isWebWidgetTriggered: false,
     };
   },
   computed: {
@@ -137,7 +138,9 @@ export default {
     setCampaignView() {
       const { messageCount, activeCampaign } = this;
       const isCampaignReadyToExecute =
-        !isEmptyObject(activeCampaign) && !messageCount;
+        !isEmptyObject(activeCampaign) &&
+        !messageCount &&
+        !this.isWebWidgetTriggered;
       if (this.isIFrame && isCampaignReadyToExecute) {
         this.showCampaignView = true;
         IFrameHelper.sendMessage({
@@ -162,7 +165,11 @@ export default {
     createWidgetEvents(message) {
       const { eventName } = message;
       const isWidgetTriggerEvent = eventName === 'webwidget.triggered';
-      if (isWidgetTriggerEvent && this.showUnreadView) {
+      this.isWebWidgetTriggered = true;
+      if (
+        isWidgetTriggerEvent &&
+        (this.showUnreadView || this.showCampaignView)
+      ) {
         return;
       }
       this.setUserLastSeen();