iBoss/bolt-diy
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixing merge conflicts in BaseChat.tsx

Browse Source
This commit is contained in:
Cole Medin
2024-11-09 07:56:43 -06:00
parent 936a9c0f69
commit b3fe2076a7
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -31,3 +31,4 @@ dist-ssr
_worker.bundle _worker.bundle
Modelfile Modelfile
modelfiles

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

@@ -113,7 +113,6 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
ref, ref,
) => { ) => {
const TEXTAREA_MAX_HEIGHT = chatStarted ? 400 : 200; const TEXTAREA_MAX_HEIGHT = chatStarted ? 400 : 200;
const [provider, setProvider] = useState(DEFAULT_PROVIDER);
const [apiKeys, setApiKeys] = useState<Record<string, string>>({}); const [apiKeys, setApiKeys] = useState<Record<string, string>>({});
useEffect(() => { useEffect(() => {
@@ -200,8 +199,6 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
provider={provider} provider={provider}
setProvider={setProvider} setProvider={setProvider}
providerList={providerList} providerList={providerList}
provider={provider}
setProvider={setProvider}
/> />
<APIKeyManager <APIKeyManager
provider={provider} provider={provider}