Fix batch resolve

ui/redux/actions/comments.js

@@ -65,32 +65,34 @@ export function doCommentList(
         const { items: comments, total_items, total_filtered_items, total_pages } = result;
 
         const commentChannelUrls = comments && comments.map((comment) => comment.channel_url || '');
-        const dispatchData = {
+
-          type: ACTIONS.COMMENT_LIST_COMPLETED,
+        const returnResult = () => {
-          data: {
+          dispatch({
-            comments,
+            type: ACTIONS.COMMENT_LIST_COMPLETED,
-            parentId,
+            data: {
-            totalItems: total_items,
+              comments,
-            totalFilteredItems: total_filtered_items,
+              parentId,
-            totalPages: total_pages,
+              totalItems: total_items,
-            claimId,
+              totalFilteredItems: total_filtered_items,
-            creatorClaimId,
+              totalPages: total_pages,
-            uri,
+              claimId,
-          },
+              creatorClaimId,
+              uri,
+            },
+          });
+          return result;
         };
 
         // Batch resolve comment channel urls
         if (commentChannelUrls) {
-          return dispatch(async () => await doResolveUris(commentChannelUrls, true)).then(() => {
+          const resolve = async () => await doResolveUris(commentChannelUrls, true);
-            dispatch({ ...dispatchData });
 
-            return result;
+          return resolve()
-          });
+            .then(() => dispatch(doResolveUris(commentChannelUrls, true)).then(() => returnResult()))
-        } else {
+            .catch(() => returnResult());
-          dispatch({ ...dispatchData });
-
-          return result;
         }
+
+        returnResult();
       })
       .catch((error) => {
         const { message } = error;