From f38a15ee0d0b28fbb357a845b4fb29b2d767d17c Mon Sep 17 00:00:00 2001
From: infinite-persistence <inf.persistence@gmail.com>
Date: Fri, 24 Sep 2021 15:01:51 +0800
Subject: [PATCH] Blocklist page: fix perpetual spinner when trying to refresh
 with no channels

There's nothing to do when you don't have a channel, so hide the button and ensure redux fails gracefully.
---
 ui/page/listBlocked/view.jsx | 20 +++++++++++---------
 ui/redux/actions/comments.js |  8 ++++++++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ui/page/listBlocked/view.jsx b/ui/page/listBlocked/view.jsx
index a14f81801..8048ee9f9 100644
--- a/ui/page/listBlocked/view.jsx
+++ b/ui/page/listBlocked/view.jsx
@@ -221,15 +221,17 @@ function ListBlocked(props: Props) {
 
   function getRefreshElem() {
     return (
-      <Button
-        icon={ICONS.REFRESH}
-        button="alt"
-        label={__('Refresh')}
-        onClick={() => {
-          fetchModBlockedList();
-          fetchModAmIList();
-        }}
-      />
+      myChannelClaims && (
+        <Button
+          icon={ICONS.REFRESH}
+          button="alt"
+          label={__('Refresh')}
+          onClick={() => {
+            fetchModBlockedList();
+            fetchModAmIList();
+          }}
+        />
+      )
     );
   }
 
diff --git a/ui/redux/actions/comments.js b/ui/redux/actions/comments.js
index 488bf8e94..b47622f38 100644
--- a/ui/redux/actions/comments.js
+++ b/ui/redux/actions/comments.js
@@ -1055,6 +1055,10 @@ export function doFetchModBlockedList() {
   return async (dispatch: Dispatch, getState: GetState) => {
     const state = getState();
     const myChannels = selectMyChannelClaims(state);
+    if (!myChannels) {
+      dispatch({ type: ACTIONS.COMMENT_MODERATION_BLOCK_LIST_FAILED });
+      return;
+    }
 
     dispatch({
       type: ACTIONS.COMMENT_MODERATION_BLOCK_LIST_STARTED,
@@ -1377,6 +1381,10 @@ export function doFetchCommentModAmIList(channelClaim: ChannelClaim) {
   return async (dispatch: Dispatch, getState: GetState) => {
     const state = getState();
     const myChannels = selectMyChannelClaims(state);
+    if (!myChannels) {
+      dispatch({ type: ACTIONS.COMMENT_MODERATION_AM_I_LIST_FAILED });
+      return;
+    }
 
     dispatch({ type: ACTIONS.COMMENT_MODERATION_AM_I_LIST_STARTED });