From 90655a1dd5e7f3077547f4cab7912b3dbdfe79ae Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Fri, 20 Jul 2018 13:48:31 -0400 Subject: [PATCH] stop loader timeout if not loading --- src/renderer/component/page/view.jsx | 2 ++ src/renderer/page/subscriptions/index.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/renderer/component/page/view.jsx b/src/renderer/component/page/view.jsx index ce21e27d7..c8dbca313 100644 --- a/src/renderer/component/page/view.jsx +++ b/src/renderer/component/page/view.jsx @@ -41,6 +41,8 @@ class Page extends React.PureComponent { const { loading } = this.props; if (!this.loaderTimeout && !prevProps.loading && loading) { this.beginLoadingTimeout(); + } else if (!loading && this.loaderTimeout) { + clearTimeout(this.loaderTimeout); } } diff --git a/src/renderer/page/subscriptions/index.js b/src/renderer/page/subscriptions/index.js index 7ac70adbd..9963b26e0 100644 --- a/src/renderer/page/subscriptions/index.js +++ b/src/renderer/page/subscriptions/index.js @@ -13,7 +13,7 @@ import SubscriptionsPage from './view'; const select = state => ({ loading: selectIsFetchingSubscriptions(state) || - Object.keys(selectSubscriptionsBeingFetched(state)).length, + Boolean(Object.keys(selectSubscriptionsBeingFetched(state)).length), subscriptionsBeingFetched: selectSubscriptionsBeingFetched(state), subscriptions: selectSubscriptions(state), subscriptionClaims: selectSubscriptionClaims(state), -- 2.45.3