mirror of
https://github.com/cinnyapp/cinny.git
synced 2025-11-05 06:50:28 +03:00
clean up conflicts
This commit is contained in:
parent
b9ce2519db
commit
24b3b9cf52
2 changed files with 3 additions and 14 deletions
|
|
@ -362,7 +362,6 @@ function AddSpaceButton({ item }: { item: HierarchyItem }) {
|
|||
</FocusTrap>
|
||||
}
|
||||
>
|
||||
|
||||
{item.parentId === undefined ? (
|
||||
<Chip
|
||||
variant="SurfaceVariant"
|
||||
|
|
@ -373,9 +372,6 @@ function AddSpaceButton({ item }: { item: HierarchyItem }) {
|
|||
>
|
||||
<Text size="B300">Add Space</Text>
|
||||
</Chip>
|
||||
{addExisting && (
|
||||
<AddExistingModal space parentId={item.roomId} requestClose={() => setAddExisting(false)} />
|
||||
)}
|
||||
) : (
|
||||
<TooltipProvider
|
||||
position="Bottom"
|
||||
|
|
@ -402,6 +398,9 @@ function AddSpaceButton({ item }: { item: HierarchyItem }) {
|
|||
)}
|
||||
</TooltipProvider>
|
||||
)}
|
||||
{addExisting && (
|
||||
<AddExistingModal space parentId={item.roomId} requestClose={() => setAddExisting(false)} />
|
||||
)}
|
||||
</PopOut>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue