From b1dc5f3da16f1c1cb4286e694c2bd14493fa3c42 Mon Sep 17 00:00:00 2001
From: Palanikannan1437 <73993394+Palanikannan1437@users.noreply.github.com>
Date: Thu, 10 Aug 2023 01:20:40 +0530
Subject: [PATCH] added tiptap integration with user activity feeds

---
 apps/app/components/core/feeds.tsx | 38 ++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/apps/app/components/core/feeds.tsx b/apps/app/components/core/feeds.tsx
index 8144bfc97..d4781398d 100644
--- a/apps/app/components/core/feeds.tsx
+++ b/apps/app/components/core/feeds.tsx
@@ -15,6 +15,7 @@ import { Icon } from "components/ui";
 // helpers
 import { renderShortDateWithYearFormat, timeAgo } from "helpers/date-time.helper";
 import { addSpaceIfCamelCase } from "helpers/string.helper";
+import Tiptap from "components/tiptap";
 // types
 // import RemirrorRichTextEditor from "components/rich-text-editor";
 
@@ -200,7 +201,7 @@ export const Feeds: React.FC<any> = ({ activities }) => {
           } else if (activity.field === "estimate_point") {
             value = activity.new_value
               ? activity.new_value +
-                ` Point${parseInt(activity.new_value ?? "", 10) > 1 ? "s" : ""}`
+              ` Point${parseInt(activity.new_value ?? "", 10) > 1 ? "s" : ""}`
               : "None";
           }
 
@@ -250,18 +251,29 @@ export const Feeds: React.FC<any> = ({ activities }) => {
                         Commented {timeAgo(activity.created_at)}
                       </p>
                     </div>
-                    {/* <div className="issue-comments-section p-0"> */}
-                    {/*   <RemirrorRichTextEditor */}
-                    {/*     value={ */}
-                    {/*       activity.new_value && activity.new_value !== "" */}
-                    {/*         ? activity.new_value */}
-                    {/*         : activity.old_value */}
-                    {/*     } */}
-                    {/*     editable={false} */}
-                    {/*     noBorder */}
-                    {/*     customClassName="text-xs border border-custom-border-200 bg-custom-background-100" */}
-                    {/*   /> */}
-                    {/* </div> */}
+                    <div className="issue-comments-section p-0">
+                      <Tiptap
+                        value={
+                          activity.new_value && activity.new_value !== ""
+                            ? activity.new_value
+                            : activity.old_value
+                        }
+                        editable={false}
+                        noBorder
+                        customClassName="text-xs border border-custom-border-200 bg-custom-background-100"
+                      />
+                      {/**/}
+                      {/* <RemirrorRichTextEditor */}
+                      {/*   value={ */}
+                      {/*     activity.new_value && activity.new_value !== "" */}
+                      {/*       ? activity.new_value */}
+                      {/*       : activity.old_value */}
+                      {/*   } */}
+                      {/*   editable={false} */}
+                      {/*   noBorder */}
+                      {/*   customClassName="text-xs border border-custom-border-200 bg-custom-background-100" */}
+                      {/* /> */}
+                    </div>
                   </div>
                 </div>
               </div>