From bf80e27dbc156512e68c8f718c6c6d81b9c831eb Mon Sep 17 00:00:00 2001
From: Adib234 <30782825+Adib234@users.noreply.github.com>
Date: Tue, 24 Mar 2026 15:12:22 -0400
Subject: [PATCH] test(evals): fix overlapping act() deadlock in
 app-test-helper (#23666)

---
 evals/app-test-helper.ts   | 2 +-
 packages/cli/test-setup.ts | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evals/app-test-helper.ts b/evals/app-test-helper.ts
index 2bcff41924..8ea842aa38 100644
--- a/evals/app-test-helper.ts
+++ b/evals/app-test-helper.ts
@@ -79,7 +79,7 @@ export function appEvalTest(policy: EvalPolicy, evalCase: AppEvalCase) {
       }
 
       // Render the app!
-      rig.render();
+      await rig.render();
 
       // Wait for initial ready state
       await rig.waitForIdle();
diff --git a/packages/cli/test-setup.ts b/packages/cli/test-setup.ts
index 452493559a..f2e1bd4586 100644
--- a/packages/cli/test-setup.ts
+++ b/packages/cli/test-setup.ts
@@ -66,7 +66,10 @@ beforeEach(() => {
           ? stackLines.slice(lastReactFrameIndex + 1).join('\n')
           : stackLines.slice(1).join('\n');
 
-      if (relevantStack.includes('OverflowContext.tsx')) {
+      if (
+        relevantStack.includes('OverflowContext.tsx') ||
+        relevantStack.includes('useTimedMessage.ts')
+      ) {
         return;
       }