diff --git a/ui/component/commentsList/index.js b/ui/component/commentsList/index.js index 5ed1ce788..3ffe4faa6 100644 --- a/ui/component/commentsList/index.js +++ b/ui/component/commentsList/index.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux'; -import { makeSelectClaimIsMine, selectMyChannelClaims } from 'lbry-redux'; +import { makeSelectClaimIsMine, selectFetchingMyChannels, selectMyChannelClaims } from 'lbry-redux'; import { makeSelectTopLevelCommentsForUri, selectIsFetchingComments, @@ -16,6 +16,7 @@ const select = (state, props) => ({ claimIsMine: makeSelectClaimIsMine(props.uri)(state), isFetchingComments: selectIsFetchingComments(state), commentingEnabled: IS_WEB ? Boolean(selectUserVerifiedEmail(state)) : true, + fetchingChannels: selectFetchingMyChannels(state), }); const perform = dispatch => ({ diff --git a/ui/component/commentsList/view.jsx b/ui/component/commentsList/view.jsx index be1e67d34..15f9095c1 100644 --- a/ui/component/commentsList/view.jsx +++ b/ui/component/commentsList/view.jsx @@ -19,6 +19,7 @@ type Props = { isFetchingComments: boolean, linkedComment: any, totalComments: number, + fetchingChannels: boolean, }; function CommentList(props: Props) { @@ -32,6 +33,7 @@ function CommentList(props: Props) { isFetchingComments, linkedComment, totalComments, + fetchingChannels, } = props; const commentRef = React.useRef(); @@ -65,10 +67,10 @@ function CommentList(props: Props) { }, [fetchComments, uri]); useEffect(() => { - if (totalComments && ENABLE_COMMENT_REACTIONS) { + if (totalComments && ENABLE_COMMENT_REACTIONS && !fetchingChannels) { fetchReacts(uri); } - }, [fetchReacts, uri, totalComments, activeChannel, ENABLE_COMMENT_REACTIONS]); + }, [fetchReacts, uri, totalComments, activeChannel, fetchingChannels, ENABLE_COMMENT_REACTIONS]); useEffect(() => { if (linkedCommentId && commentRef && commentRef.current) {