From 31a911de695d96704b2f52206b599326ad022fdd Mon Sep 17 00:00:00 2001
From: saltrafael <a657ee92-7eb9-46eb-97d2-6735799df838@aleeas.com>
Date: Wed, 1 Sep 2021 10:17:23 -0300
Subject: [PATCH] Fix notifications fetching issues

---
 ui/component/commentReactions/index.js |  3 ++-
 ui/component/commentReactions/view.jsx | 11 +++++++++++
 ui/page/notifications/view.jsx         |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ui/component/commentReactions/index.js b/ui/component/commentReactions/index.js
index eb72e7362..0bafedfca 100644
--- a/ui/component/commentReactions/index.js
+++ b/ui/component/commentReactions/index.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import Comment from './view';
-import { makeSelectClaimIsMine, makeSelectClaimForUri } from 'lbry-redux';
+import { makeSelectClaimIsMine, makeSelectClaimForUri, doResolveUri } from 'lbry-redux';
 import { doToast } from 'redux/actions/notifications';
 import { makeSelectMyReactionsForComment, makeSelectOthersReactionsForComment } from 'redux/selectors/comments';
 import { doCommentReact } from 'redux/actions/comments';
@@ -21,6 +21,7 @@ const select = (state, props) => {
 };
 
 const perform = (dispatch) => ({
+  resolve: (uri) => dispatch(doResolveUri(uri)),
   react: (commentId, type) => dispatch(doCommentReact(commentId, type)),
   doToast: (params) => dispatch(doToast(params)),
 });
diff --git a/ui/component/commentReactions/view.jsx b/ui/component/commentReactions/view.jsx
index 8086e1818..a121e35ed 100644
--- a/ui/component/commentReactions/view.jsx
+++ b/ui/component/commentReactions/view.jsx
@@ -17,9 +17,11 @@ type Props = {
   pendingCommentReacts: Array<string>,
   claimIsMine: boolean,
   activeChannelId: ?string,
+  uri: string,
   claim: ?ChannelClaim,
   doToast: ({ message: string }) => void,
   hideCreatorLike: boolean,
+  resolve: (string) => void,
 };
 
 export default function CommentReactions(props: Props) {
@@ -29,15 +31,24 @@ export default function CommentReactions(props: Props) {
     commentId,
     react,
     claimIsMine,
+    uri,
     claim,
     activeChannelId,
     doToast,
     hideCreatorLike,
+    resolve,
   } = props;
   const {
     push,
     location: { pathname },
   } = useHistory();
+
+  React.useEffect(() => {
+    if (!claim) {
+      resolve(uri);
+    }
+  }, [claim, resolve, uri]);
+
   const canCreatorReact =
     claim &&
     claimIsMine &&
diff --git a/ui/page/notifications/view.jsx b/ui/page/notifications/view.jsx
index 9cd9777b4..5fd137083 100644
--- a/ui/page/notifications/view.jsx
+++ b/ui/page/notifications/view.jsx
@@ -47,7 +47,7 @@ export default function NotificationsPage(props: Props) {
 
   // Fetch reacts
   React.useEffect(() => {
-    if (initialFetchDone && activeChannel) {
+    if ((!fetching || initialFetchDone) && activeChannel) {
       let idsForReactionFetch = [];
       list.map((notification) => {
         const { notification_rule, notification_parameters } = notification;
@@ -70,7 +70,7 @@ export default function NotificationsPage(props: Props) {
         doCommentReactList(idsForReactionFetch);
       }
     }
-  }, [initialFetchDone, doCommentReactList, list, activeChannel]);
+  }, [doCommentReactList, list, activeChannel, fetching, initialFetchDone]);
 
   React.useEffect(() => {
     if (unseenCount > 0 || unreadCount > 0) {