From 518056f382799c395e58fb3fa00c1de8e95bb238 Mon Sep 17 00:00:00 2001
From: Tessa Thornton <tessathornton@gmail.com>
Date: Mon, 13 Apr 2020 13:39:17 -0400
Subject: [PATCH] [CORL-1033] don't show view conversation link if callback is
 not defined (#2934)

* don't show view conversation link if callback is not defined

* remove unnecessary callback
---
 .../components/ModerateCard/ModerateCard.tsx  | 23 +++++++++----------
 .../ModerateCard/ModerateCardContainer.tsx    | 19 ++++++++-------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/core/client/admin/components/ModerateCard/ModerateCard.tsx b/src/core/client/admin/components/ModerateCard/ModerateCard.tsx
index 3b6cb493c..117e7bf24 100644
--- a/src/core/client/admin/components/ModerateCard/ModerateCard.tsx
+++ b/src/core/client/admin/components/ModerateCard/ModerateCard.tsx
@@ -59,7 +59,7 @@ interface Props {
   onReject: () => void;
   onFeature: () => void;
   onUsernameClick: (id?: string) => void;
-  onConversationClick: (id?: string) => void;
+  onConversationClick: (() => void) | null;
   onFocusOrClick: () => void;
   mini?: boolean;
   hideUsername?: boolean;
@@ -168,9 +168,6 @@ const ModerateCard: FunctionComponent<Props> = ({
       onUsernameClick(inReplyTo.id);
     }
   }, [onUsernameClick, inReplyTo]);
-  const viewConversationClick = useCallback(() => {
-    onConversationClick();
-  }, [onConversationClick]);
   return (
     <Card
       className={cn(
@@ -231,14 +228,16 @@ const ModerateCard: FunctionComponent<Props> = ({
             >
               {commentBody}
             </CommentContent>
-            <div className={styles.viewContext}>
-              <Button iconLeft variant="text" onClick={viewConversationClick}>
-                <ButtonIcon>question_answer</ButtonIcon>
-                <Localized id="moderate-comment-viewConversation">
-                  <span>View conversation</span>
-                </Localized>
-              </Button>
-            </div>
+            {onConversationClick && (
+              <div className={styles.viewContext}>
+                <Button iconLeft variant="text" onClick={onConversationClick}>
+                  <ButtonIcon>question_answer</ButtonIcon>
+                  <Localized id="moderate-comment-viewConversation">
+                    <span>View conversation</span>
+                  </Localized>
+                </Button>
+              </div>
+            )}
             <div
               className={cn(styles.separator, {
                 [styles.ruledSeparator]: !mini,
diff --git a/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx b/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx
index 13699b7ab..e9dc4b5ca 100644
--- a/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx
+++ b/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx
@@ -162,15 +162,12 @@ const ModerateCardContainer: FunctionComponent<Props> = ({
     [usernameClicked, comment]
   );
 
-  const onConversationClicked = useCallback(
-    (id?: string) => {
-      if (!conversationClicked) {
-        return;
-      }
-      conversationClicked(id || comment.id);
-    },
-    [conversationClicked, comment]
-  );
+  const onConversationClicked = useCallback(() => {
+    if (!conversationClicked) {
+      return;
+    }
+    conversationClicked(comment.id);
+  }, [conversationClicked, comment]);
 
   const handleModerateStory = useCallback(
     (e: React.MouseEvent) => {
@@ -250,7 +247,9 @@ const ModerateCardContainer: FunctionComponent<Props> = ({
           onReject={handleReject}
           onFeature={onFeature}
           onUsernameClick={onUsernameClicked}
-          onConversationClick={onConversationClicked}
+          onConversationClick={
+            conversationClicked ? onConversationClicked : null
+          }
           selected={selected}
           selectPrev={selectPrev}
           selectNext={selectNext}