From 0815236ffb5c62b6cb8817e5c1f38b2ea26b1681 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Fri, 12 Jan 2018 14:49:34 -0600
Subject: [PATCH] change loading prop behavior for subscriptions.vue

---
 .../sidebar/components/subscriptions/sidebar_subscriptions.vue  | 2 +-
 .../sidebar/components/subscriptions/subscriptions.vue          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
index b409e34923b..3e8cc7a6630 100644
--- a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
+++ b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
@@ -40,7 +40,7 @@ export default {
 <template>
   <div class="block subscriptions">
     <subscriptions
-      :loading="store.subscribed === null"
+      :loading="store.isFetching.subscriptions"
       :subscribed="store.subscribed"
     />
   </div>
diff --git a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
index 3f21500772f..d69d100a26c 100644
--- a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
+++ b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
@@ -37,7 +37,7 @@
     },
     computed: {
       showLoadingState() {
-        return this.subscribed === null || this.loading;
+        return this.subscribed === null;
       },
       notificationIcon() {
         return this.subscribed ? ICON_ON : ICON_OFF;