Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve conflict

Browse Source
This commit is contained in:
Faisal Amir 2024-01-07 19:25:04 +07:00
parent a3dd868722
commit 548203c8aa
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/containers/Layout/BottomBar/index.tsx
View File

@ -1,3 +1,5 @@
import { useState } from 'react'
import { import {
Badge, Badge,
Button, Button,
@ -69,6 +71,7 @@ const BottomBar = () => {
My Models  My Models 
<ShortCut menu="E" /> <ShortCut menu="E" />
</Badge> </Badge>
{stateModel.state === 'start' && stateModel.loading && ( {stateModel.state === 'start' && stateModel.loading && (
<SystemItem <SystemItem
titleBold titleBold
@ -84,11 +87,7 @@ const BottomBar = () => {
/> />
)} )}
{!stateModel.loading && downloadedModels.length !== 0 && ( {!stateModel.loading && downloadedModels.length !== 0 && (
<SystemItem <SystemItem titleBold name={'Active model'} value={activeModel?.id} />
titleBold
name={activeModel?.id ? 'Active model' : ''}
value={activeModel?.id}
/>
)} )}
{downloadedModels.length === 0 && {downloadedModels.length === 0 &&
!stateModel.loading && !stateModel.loading &&