Merge branch 'main' into lewis/comp-delete-org-trace

Author: carhartlewis

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.27.6](https://github.com/trycompai/comp/compare/v3.27.5...v3.27.6) (2026-04-22)
+
+
+### Bug Fixes
+
+* **db:** increase prisma transaction timeout from 30s to 60s ([8d1764a](https://github.com/trycompai/comp/commit/8d1764a67e1c444028a3c853436a667cef13da13))
+
 ## [3.27.5](https://github.com/trycompai/comp/compare/v3.27.4...v3.27.5) (2026-04-21)
 
 

apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkTimeline.tsx

@@ -7,6 +7,7 @@ import {
   CircleDash,
   Time,
 } from '@trycompai/design-system/icons';
+import { useFeatureFlag } from '@trycompai/analytics';
 import { useState } from 'react';
 import {
   useTimelines,
@@ -46,8 +47,11 @@ function getTimeRemaining(endDate: string | null): string | null {
 export function FrameworkTimeline({
   frameworkInstanceId,
 }: FrameworkTimelineProps) {
+  const isTimelineEnabled = useFeatureFlag('is-timeline-enabled');
   const { timelines } = useTimelines();
 
+  if (!isTimelineEnabled) return null;
+
   const timeline = timelines.find(
     (t) => t.frameworkInstanceId === frameworkInstanceId,
   );