feat(FN-1747): merge fusion/fn-1747

packages/dashboard/app/components/TaskCard.tsx

@@ -495,7 +495,7 @@ function TaskCardComponent({
     };
   }, [hasGitHubBadge, isInViewport, subscribeToBadge, task.id, unsubscribeFromBadge]);
 
-  const liveBadgeData = badgeUpdates.get(task.id);
+  const liveBadgeData = badgeUpdates.get(`${projectId ?? "default"}:${task.id}`);
 
   // Compute step version for diff stats refresh when steps change
   const isActiveColumn = task.column === "in-progress" || task.column === "in-review";

packages/dashboard/app/components/TaskCardBadge.tsx

@@ -45,7 +45,7 @@ function TaskCardBadgeComponent({ taskId, prInfo, issueInfo, updatedAt, isInView
     };
   }, [hasGitHubBadge, isInViewport, projectId, subscribeToBadge, taskId, unsubscribeFromBadge]);
 
-  const liveBadgeData = badgeUpdates.get(taskId);
+  const liveBadgeData = badgeUpdates.get(`${projectId ?? "default"}:${taskId}`);
   const livePrInfo = pickPreferredBadge<PrInfo>(
     liveBadgeData?.prInfo,
     liveBadgeData?.timestamp,

packages/dashboard/app/components/__tests__/TaskCard.test.tsx

@@ -2270,7 +2270,7 @@ describe("TaskCard GitHub badges", () => {
     mockUseBadgeWebSocket.mockReturnValue({
       badgeUpdates: new Map([
         [
-          "FN-099",
+          "default:FN-099",
           {
             prInfo: {
               url: "https://github.com/owner/repo/pull/42",
@@ -2369,7 +2369,7 @@ describe("TaskCard GitHub badges", () => {
     mockUseBadgeWebSocket.mockReturnValue({
       badgeUpdates: new Map([
         [
-          "FN-099",
+          "default:FN-099",
           {
             issueInfo: {
               url: "https://github.com/owner/repo/issues/123",