From afa95fade013b47e5c49b0a90cd07023829a6e81 Mon Sep 17 00:00:00 2001
From: Gustavo Madeira Santana <gumadeiras@gmail.com>
Date: Thu, 19 Mar 2026 00:22:53 -0400
Subject: [PATCH] Tests: align fixtures with current gateway and model types

---
 src/gateway/session-message-events.test.ts  | 2 +-
 src/gateway/sessions-history-http.test.ts   | 2 +-
 ui/src/ui/app-gateway.sessions.node.test.ts | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gateway/session-message-events.test.ts b/src/gateway/session-message-events.test.ts
index 293ebed9be3..acaff645d8b 100644
--- a/src/gateway/session-message-events.test.ts
+++ b/src/gateway/session-message-events.test.ts
@@ -167,7 +167,7 @@ describe("session.message websocket events", () => {
             }
           ).message?.__openclaw,
         ).toMatchObject({
-          id: appended.messageId,
+          id: appended.ok ? appended.messageId : undefined,
           seq: 1,
         });
       } finally {
diff --git a/src/gateway/sessions-history-http.test.ts b/src/gateway/sessions-history-http.test.ts
index a43f3953367..39ff47f679a 100644
--- a/src/gateway/sessions-history-http.test.ts
+++ b/src/gateway/sessions-history-http.test.ts
@@ -319,7 +319,7 @@ describe("session history HTTP endpoints", () => {
           }
         ).message?.__openclaw,
       ).toMatchObject({
-        id: appended.messageId,
+        id: appended.ok ? appended.messageId : undefined,
         seq: 2,
       });
 
diff --git a/ui/src/ui/app-gateway.sessions.node.test.ts b/ui/src/ui/app-gateway.sessions.node.test.ts
index 241caa203d5..80c79218666 100644
--- a/ui/src/ui/app-gateway.sessions.node.test.ts
+++ b/ui/src/ui/app-gateway.sessions.node.test.ts
@@ -57,7 +57,7 @@ function createHost() {
       token: "",
       sessionKey: "main",
       lastActiveSessionKey: "main",
-      theme: "system",
+      theme: "claw",
       themeMode: "system",
       chatFocusMode: false,
       chatShowThinking: true,
@@ -84,12 +84,12 @@ function createHost() {
     agentsLoading: false,
     agentsList: null,
     agentsError: null,
-    toolsCatalogLoading: false,
-    toolsCatalogError: null,
-    toolsCatalogResult: null,
     healthLoading: false,
     healthResult: null,
     healthError: null,
+    toolsCatalogLoading: false,
+    toolsCatalogError: null,
+    toolsCatalogResult: null,
     debugHealth: null,
     assistantName: "OpenClaw",
     assistantAvatar: null,