diff --git a/ui/desktop/src/components/BaseChat.tsx b/ui/desktop/src/components/BaseChat.tsx
index 777ba2777e54..be8728e3b5ad 100644
--- a/ui/desktop/src/components/BaseChat.tsx
+++ b/ui/desktop/src/components/BaseChat.tsx
@@ -372,31 +372,23 @@ function BaseChatContent({
{/* Custom content before messages */}
{renderBeforeMessages && renderBeforeMessages()}
- {/* Messages or RecipeActivities or Popular Topics */}
+ {/* Recipe Activities - always show when recipe is active and accepted */}
+ {recipeConfig && recipeAccepted && !suppressEmptyState && (
+
+ appendWithTracking(text)}
+ activities={
+ Array.isArray(recipeConfig.activities) ? recipeConfig.activities : null
+ }
+ title={recipeConfig.title}
+ parameterValues={recipeParameters || {}}
+ />
+
+ )}
+
+ {/* Messages or Popular Topics */}
{
- // Check if we should show splash instead of messages
- // Show splash if we have a recipe and user hasn't started using it yet, and recipe has been accepted
- loadingChat ? null : recipeConfig &&
- recipeAccepted &&
- !hasStartedUsingRecipe &&
- !suppressEmptyState ? (
- <>
- {/* Show RecipeActivities when we have a recipe config and user hasn't started using it */}
- {recipeConfig ? (
- appendWithTracking(text)}
- activities={
- Array.isArray(recipeConfig.activities) ? recipeConfig.activities : null
- }
- title={recipeConfig.title}
- parameterValues={recipeParameters || {}}
- />
- ) : showPopularTopics ? (
- /* Show PopularChatTopics when no real messages, no recipe, and showPopularTopics is true (Pair view) */
- appendWithTracking(text)} />
- ) : null}
- >
- ) : filteredMessages.length > 0 ||
+ loadingChat ? null : filteredMessages.length > 0 ||
(recipeConfig && recipeAccepted && hasStartedUsingRecipe) ? (
<>
{disableSearch ? (
@@ -476,7 +468,7 @@ function BaseChatContent({
>
- ) : showPopularTopics ? (
+ ) : !recipeConfig && showPopularTopics ? (
/* Show PopularChatTopics when no messages, no recipe, and showPopularTopics is true (Pair view) */
append(text)} />
) : null /* Show nothing when messages.length === 0 && suppressEmptyState === true */