From 0468e066ff363e2fafb72e10077e7e84aa85c989 Mon Sep 17 00:00:00 2001
From: Dakshesh Jain <dakshesh.jain14@gmail.com>
Date: Wed, 16 Aug 2023 17:58:25 +0530
Subject: [PATCH] style: displaying label color on issue activity

---
 apps/app/components/core/activity.tsx | 40 +++++++++++++++++++--------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/apps/app/components/core/activity.tsx b/apps/app/components/core/activity.tsx
index 7ddf9c33c..91f22d01e 100644
--- a/apps/app/components/core/activity.tsx
+++ b/apps/app/components/core/activity.tsx
@@ -53,7 +53,11 @@ const UserLink = ({ activity }: { activity: IIssueActivity }) => {
 
 const activityDetails: {
   [key: string]: {
-    message: (activity: IIssueActivity, showIssue: boolean) => React.ReactNode;
+    message: (
+      activity: IIssueActivity,
+      showIssue: boolean,
+      backgroundColor?: string
+    ) => React.ReactNode;
     icon: React.ReactNode;
   };
 } = {
@@ -253,7 +257,7 @@ const activityDetails: {
     icon: <Icon iconName="stack" className="!text-sm" aria-hidden="true" />,
   },
   labels: {
-    message: (activity, showIssue) => {
+    message: (activity, showIssue, backgroundColor = "#000000") => {
       if (activity.old_value === "")
         return (
           <>
@@ -262,7 +266,7 @@ const activityDetails: {
               <span
                 className="h-1.5 w-1.5 rounded-full"
                 style={{
-                  backgroundColor: "#000000",
+                  backgroundColor,
                 }}
                 aria-hidden="true"
               />
@@ -532,14 +536,26 @@ export const ActivityIcon = ({ activity }: { activity: IIssueActivity }) => (
   <>{activityDetails[activity.field as keyof typeof activityDetails]?.icon}</>
 );
 
-export const ActivityMessage = ({
-  activity,
-  showIssue = false,
-}: {
+type ActivityMessageProps = {
   activity: IIssueActivity;
   showIssue?: boolean;
-}) => (
-  <>
-    {activityDetails[activity.field as keyof typeof activityDetails]?.message(activity, showIssue)}
-  </>
-);
+};
+
+import { observer } from "mobx-react-lite";
+import { useMobxStore } from "lib/mobx/store-provider";
+
+export const ActivityMessage = observer(({ activity, showIssue = false }: ActivityMessageProps) => {
+  const {
+    label: { getLabelById },
+  } = useMobxStore();
+
+  return (
+    <>
+      {activityDetails[activity.field as keyof typeof activityDetails]?.message(
+        activity,
+        showIssue,
+        activity.field === "labels" ? getLabelById(activity?.new_identifier!)?.color : undefined
+      )}
+    </>
+  );
+});