Merge pull request #4703 from coralproject/fix/CORL-3203-live-updates…

…-refresh [CORL-3202] don't show the `Refresh comments` button when live updates are disabled
coralproject · Dec 3, 2024 · 10fb973 · 10fb973
2 parents d115303 + 896465d
commit 10fb973
Show file tree

Hide file tree

Showing 4 changed files with 625 additions and 719 deletions.
diff --git a/...t/src/core/client/stream/tabs/Comments/Comment/UserBanPopover/UserBanPopoverContainer.tsx b/...t/src/core/client/stream/tabs/Comments/Comment/UserBanPopover/UserBanPopoverContainer.tsx
@@ -220,6 +220,7 @@ const UserBanPopoverContainer: FunctionComponent<Props> = ({
               size="regular"
               color="stream"
               onClick={onCloseConfirm}
+              data-testid="UserBanPopover-close"
             >
               Close
             </Button>

diff --git a/...nt/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabContainer.tsx b/...nt/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabContainer.tsx
@@ -197,10 +197,10 @@ export const AllCommentsTabContainer: FunctionComponent<Props> = ({
   }, [visible, isNotFirstLoad]);
 
   useEffect(() => {
-    if (visible && isNotFirstLoad) {
+    if (visible && isNotFirstLoad && live) {
       setShowCommentRefreshButton(true);
     }
-  }, [visible, setShowCommentRefreshButton]);
+  }, [visible, setShowCommentRefreshButton, live, isNotFirstLoad]);
 
   useEffect(() => {
     if (!topOfCommentsInView && allCommentsInView) {

diff --git a/client/src/core/client/stream/test/comments/stream/moderation.spec.tsx b/client/src/core/client/stream/test/comments/stream/moderation.spec.tsx
@@ -354,7 +354,7 @@ it("spam ban user", async () => {
   const communityLink = screen.getByRole("link", { name: "Community section" });
   expect(communityLink).toBeInTheDocument();
   expect(communityLink).toHaveAttribute("href", "/admin/community");
-  const closeButton = screen.getByRole("button", { name: "Close" });
+  const closeButton = screen.getByTestId("UserBanPopover-close");
   fireEvent.click(closeButton);
 
   // spam ban comfirmation should no longer be shown after Close button clicked