From 1e2627cdfbc946c046bedd26eae10180b0527b23 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 4 Feb 2021 11:26:04 +0000
Subject: [PATCH 1/3] Fix bug making apps swap to different apps randomly

---
 .../src/components/feedback/FeedbackNavLink.svelte   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/feedback/FeedbackNavLink.svelte b/packages/builder/src/components/feedback/FeedbackNavLink.svelte
index 6cba6417d4..7800ee0dea 100644
--- a/packages/builder/src/components/feedback/FeedbackNavLink.svelte
+++ b/packages/builder/src/components/feedback/FeedbackNavLink.svelte
@@ -1,18 +1,22 @@
 <script>
   import { Popover } from "@budibase/bbui"
   import { store } from "builderStore"
+  import { onMount } from "svelte"
 
   import FeedbackIframe from "./FeedbackIframe.svelte"
   import analytics from "analytics"
 
-  const FIVE_MINUTES = 300000
+  const FIVE_MINUTES = 30000
 
   let iconContainer
   let popover
 
-  setInterval(() => {
-    $store.highlightFeedbackIcon = analytics.highlightFeedbackIcon()
-  }, FIVE_MINUTES)
+  onMount(() => {
+    const interval = setInterval(() => {
+      $store.highlightFeedbackIcon = analytics.highlightFeedbackIcon()
+    }, FIVE_MINUTES)
+    return () => clearInterval(interval)
+  })
 </script>
 
 <div class="container" bind:this={iconContainer} on:click={popover.show}>

From af5a95557af465213f8a00de12596109f6eb4986 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 4 Feb 2021 11:27:12 +0000
Subject: [PATCH 2/3] Reset back to 5 minute intervals

---
 packages/builder/src/components/feedback/FeedbackNavLink.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/feedback/FeedbackNavLink.svelte b/packages/builder/src/components/feedback/FeedbackNavLink.svelte
index 7800ee0dea..4801ef51a6 100644
--- a/packages/builder/src/components/feedback/FeedbackNavLink.svelte
+++ b/packages/builder/src/components/feedback/FeedbackNavLink.svelte
@@ -6,7 +6,7 @@
   import FeedbackIframe from "./FeedbackIframe.svelte"
   import analytics from "analytics"
 
-  const FIVE_MINUTES = 30000
+  const FIVE_MINUTES = 300000
 
   let iconContainer
   let popover

From 5a89c640bd7200eadb955e38b5af34b6013ce5cd Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 4 Feb 2021 11:29:35 +0000
Subject: [PATCH 3/3] Be even more explicit with notification icon store update
 to avoid any magic

---
 .../builder/src/components/feedback/FeedbackNavLink.svelte   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/feedback/FeedbackNavLink.svelte b/packages/builder/src/components/feedback/FeedbackNavLink.svelte
index 4801ef51a6..5b7a2faf2a 100644
--- a/packages/builder/src/components/feedback/FeedbackNavLink.svelte
+++ b/packages/builder/src/components/feedback/FeedbackNavLink.svelte
@@ -13,7 +13,10 @@
 
   onMount(() => {
     const interval = setInterval(() => {
-      $store.highlightFeedbackIcon = analytics.highlightFeedbackIcon()
+      store.update(state => {
+        state.highlightFeedbackIcon = analytics.highlightFeedbackIcon()
+        return state
+      })
     }, FIVE_MINUTES)
     return () => clearInterval(interval)
   })