UniqAI/bolt.diy
1
0
Fork 0
mirror of https://github.com/stackblitz-labs/bolt.diy synced 2025-06-26 18:26:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: resolve conflicts

Browse Source
This commit is contained in:
KevIsDev 2025-06-02 11:39:49 +01:00
parent 9e64c2cccf
commit 33e0860468
3 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/chat/AssistantMessage.tsx
View File

@ -83,6 +83,7 @@ export const AssistantMessage = memo(
return ( return (
<div className="overflow-hidden w-full"> <div className="overflow-hidden w-full">
<>
<div className=" flex gap-2 items-center text-sm text-bolt-elements-textSecondary mb-2"> <div className=" flex gap-2 items-center text-sm text-bolt-elements-textSecondary mb-2">
{(codeContext || chatSummary) && ( {(codeContext || chatSummary) && (
<Popover side="right" align="start" trigger={<div className="i-ph:info" />}> <Popover side="right" align="start" trigger={<div className="i-ph:info" />}>
@ -153,6 +154,7 @@ export const AssistantMessage = memo(
)} )}
</div> </div>
</div> </div>
</>
<Markdown append={append} chatMode={chatMode} setChatMode={setChatMode} model={model} provider={provider} html> <Markdown append={append} chatMode={chatMode} setChatMode={setChatMode} model={model} provider={provider} html>
{content} {content}
</Markdown> </Markdown>

2
app/components/chat/BaseChat.tsx
View File

@ -370,8 +370,8 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
append={append} append={append}
chatMode={chatMode} chatMode={chatMode}
setChatMode={setChatMode} setChatMode={setChatMode}
model={model}
provider={provider} provider={provider}
model={model}
/> />
) : null; ) : null;
}} }}

4
app/components/chat/Markdown.tsx
View File

@ -151,7 +151,7 @@ export const Markdown = memo(
type: 'text', type: 'text',
text: `[Model: ${model}]\n\n[Provider: ${provider?.name}]\n\n${message}`, text: `[Model: ${model}]\n\n[Provider: ${provider?.name}]\n\n${message}`,
}, },
] as any, // Type assertion to bypass compiler check ] as any,
role: 'user', role: 'user',
}); });
console.log('Message appended:', message); console.log('Message appended:', message);
@ -164,7 +164,7 @@ export const Markdown = memo(
type: 'text', type: 'text',
text: `[Model: ${model}]\n\n[Provider: ${provider?.name}]\n\n${message}`, text: `[Model: ${model}]\n\n[Provider: ${provider?.name}]\n\n${message}`,
}, },
] as any, // Type assertion to bypass compiler check ] as any,
role: 'user', role: 'user',
}); });
} else if (type === 'link' && typeof href === 'string') { } else if (type === 'link' && typeof href === 'string') {